mcramer
2012-08-27 5a539802d8cbb781279c20dd6c557f82e91b3fa9
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