- Fixed FS#2399.

ftimme

2012-09-04 5c71e91158b78e9dbfa81625d4063ac23bbcb4aa

 server/plugins-available/apache2_plugin.inc.php

@@ -1470,13 +1470,9 @@
            if($subdomain_host == '') $subdomain_host = 'web'.$data['old']['domain_id'];
            $web_folder = $data['old']['web_folder'];
            $log_folder .= '/' . $subdomain_host;
         $parent_web_document_root = $tmp['document_root'];
         $app->system->web_folder_protection($parent_web_document_root,false);
            unset($tmp);
        } else {
         $app->system->web_folder_protection($data['old']['document_root'],false);
      }
		
        
      exec('umount '.escapeshellarg($data['old']['document_root'].'/'.$log_folder));
      
      //* remove mountpoint from fstab
@@ -1521,7 +1517,7 @@
                $docroot = escapeshellcmd($data['old']['document_root']);
                if($docroot != '' && !stristr($docroot,'..')) {
                    if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot);
                    elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder;
                    elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder);
                }
         
                //remove the php fastgi starter script if available
@@ -2303,8 +2299,8 @@
            foreach($ini_settings as $ini_setting){
                  list($key, $value) = explode('=', $ini_setting);
                  if($value){
                     $value = escapeshellcmd(trim($value));
                     $key = escapeshellcmd(trim($key));
                     $value = trim($value);
                     $key = trim($key);
                     switch (strtolower($value)) {
                        case '0':
                           // PHP-FPM might complain about invalid boolean value if you use 0