Merge branch 'master_fixes' into 'master'

Marius Cramer

2014-02-26 bdc27bfea618952447ef7facab838df5741f1ec3

 Merge branch 'master_fixes' into 'master'

Bugfix with Folder-Rights

Since chown and chgrp doesn't work recursively -> use parameters of mkdirpath instead

 server/plugins-available/apache2_plugin.inc.php

@@ -2110,9 +2110,7 @@

        //* Create the folder path, if it does not exist
        if(!is_dir($folder_path)) {
            $app->system->mkdirpath($folder_path);
            $app->system->chown($folder_path, $website['system_user']);
            $app->system->chgrp($folder_path, $website['system_group']);
            $app->system->mkdirpath($folder_path, 0755, $website['system_user'], $website['system_group']);
        }

        //* Create empty .htpasswd file, if it does not exist

 server/plugins-available/nginx_plugin.inc.php

@@ -2043,9 +2043,7 @@

        //* Create the folder path, if it does not exist
        if(!is_dir($folder_path)) {
            $app->system->mkdirpath($folder_path);
            $app->system->chown($folder_path, $website['system_user']);
            $app->system->chgrp($folder_path, $website['system_group']);
            $app->system->mkdirpath($folder_path, 0755, $website['system_user'], $website['system_group']);
        }

        //* Create empty .htpasswd file, if it does not exist