Bugfix: Web folder protection did not work on web deletion Bugfix: $app->sy...

mcramer

2012-08-22 58053eae9b6a9c8865ef9375e54038fdafe91e84

Bugfix: Web folder protection did not work on web deletion
Bugfix: $app->system->unlink function had wrong parameter name, no files were deleted ever

 server/lib/classes/system.inc.php

@@ -699,7 +699,7 @@
        }
    }
    
    function unlink($file) {
    function unlink($filename) {
        if(file_exists($filename)) {
            return unlink($filename);
        }

 server/plugins-available/apache2_plugin.inc.php

@@ -1452,7 +1452,7 @@
        $app->uses('system');
        $web_config = $app->getconf->get_server_config($conf['server_id'], 'web');
        
        $app->system->web_folder_protection($data['new']['document_root'],false);
        $app->system->web_folder_protection($data['old']['document_root'],false);

        //* Check if this is a chrooted setup
        if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {