Fixed: FS#1186 - Error in Installer r1728

tbrehm

2010-05-11 2e961201be67cc348e7da22ad7c32c87c9f3d30d

 server/plugins-available/apache2_plugin.inc.php

@@ -1,7 +1,7 @@
<?php

/*
Copyright (c) 2007, Till Brehm, projektfarm Gmbh
Copyright (c) 2007 - 2009, Till Brehm, projektfarm Gmbh
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
@@ -83,7 +83,7 @@
      
      if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
      $ssl_dir = $data["new"]["document_root"]."/ssl";
      $domain = $data["new"]["domain"];
      $domain = $data["new"]["ssl_domain"];
      $key_file = $ssl_dir.'/'.$domain.".key.org";
        $key_file2 = $ssl_dir.'/'.$domain.".key";
        $csr_file = $ssl_dir.'/'.$domain.".csr";
@@ -106,7 +106,7 @@
         $ssl_cnf = "        RANDFILE               = $rand_file

        [ req ]
        default_bits           = 1024
        default_bits           = 2048
        default_keyfile        = keyfile.pem
        distinguished_name     = req_distinguished_name
        attributes             = req_attributes
@@ -137,44 +137,56 @@
         $crt_file = escapeshellcmd($crt_file);

           if(is_file($ssl_cnf_file)){
                exec("openssl genrsa -des3 -rand $rand_file -passout pass:$ssl_password -out $key_file 1024 && openssl req -new -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -out $csr_file -days $ssl_days -config $config_file && openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file && openssl rsa -passin pass:$ssl_password -in $key_file -out $key_file2");
                exec("openssl genrsa -des3 -rand $rand_file -passout pass:$ssl_password -out $key_file 2048 && openssl req -new -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -out $csr_file -days $ssl_days -config $config_file && openssl req -x509 -passin pass:$ssl_password -passout pass:$ssl_password -key $key_file -in $csr_file -out $crt_file -days $ssl_days -config $config_file && openssl rsa -passin pass:$ssl_password -in $key_file -out $key_file2");
            $app->log("Creating SSL Cert for: $domain",LOGLEVEL_DEBUG);
           }

          exec("chmod 400 $key_file2");
          @unlink($config_file);
          @unlink($rand_file);
          $ssl_request = file_get_contents($csr_file);
          $ssl_cert = file_get_contents($crt_file);
          $ssl_request = $app->db->quote(file_get_contents($csr_file));
          $ssl_cert = $app->db->quote(file_get_contents($crt_file));
         /* Update the DB of the (local) Server */
          $app->db->query("UPDATE web_domain SET ssl_request = '$ssl_request', ssl_cert = '$ssl_cert' WHERE domain = '".$data["new"]["domain"]."'");
         $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data["new"]["domain"]."'");
         /* Update also the master-DB of the Server-Farm */
          $app->dbmaster->query("UPDATE web_domain SET ssl_request = '$ssl_request', ssl_cert = '$ssl_cert' WHERE domain = '".$data["new"]["domain"]."'");
         $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data["new"]["domain"]."'");
      }
      
      //* Save a SSL certificate to disk
      if($data["new"]["ssl_action"] == 'save') {
         $ssl_dir = $data["new"]["document_root"]."/ssl";
         $domain = $data["new"]["domain"];
         $domain = $data["new"]["ssl_domain"];
           $csr_file = $ssl_dir.'/'.$domain.".csr";
           $crt_file = $ssl_dir.'/'.$domain.".crt";
         $bundle_file = $ssl_dir.'/'.$domain.".bundle";
         file_put_contents($csr_file,$data["new"]["ssl_request"]);
         file_put_contents($crt_file,$data["new"]["ssl_cert"]);
         if(trim($data["new"]["ssl_bundle"]) != '') file_put_contents($bundle_file,$data["new"]["ssl_bundle"]);
         /* Update the DB of the (local) Server */
         $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data["new"]["domain"]."'");
         /* Update also the master-DB of the Server-Farm */
         $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data["new"]["domain"]."'");
         $app->log("Saving SSL Cert for: $domain",LOGLEVEL_DEBUG);
      }
      
      //* Delete a SSL certificate
      if($data["new"]["ssl_action"] == 'del') {
         $ssl_dir = $data["new"]["document_root"]."/ssl";
         $domain = $data["new"]["domain"];
         $domain = $data["new"]["ssl_domain"];
           $csr_file = $ssl_dir.'/'.$domain.".csr";
           $crt_file = $ssl_dir.'/'.$domain.".crt";
         $bundle_file = $ssl_dir.'/'.$domain.".bundle";
         unlink($csr_file);
         unlink($crt_file);
         unlink($bundle_file);
         /* Update the DB of the (local) Server */
          $app->db->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '' WHERE domain = '".$data["new"]["domain"]."'");
         $app->db->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data["new"]["domain"]."'");
         /* Update also the master-DB of the Server-Farm */
          $app->dbmaster->query("UPDATE web_domain SET ssl_request = '', ssl_cert = '' WHERE domain = '".$data["new"]["domain"]."'");
         $app->dbmaster->query("UPDATE web_domain SET ssl_action = '' WHERE domain = '".$data["new"]["domain"]."'");
         $app->log("Deleting SSL Cert for: $domain",LOGLEVEL_DEBUG);
      }
      
@@ -204,7 +216,7 @@
         $new_parent_domain_id = intval($data["new"]["parent_domain_id"]);
         
         // If the parent_domain_id has been chenged, we will have to update the old site as well.
         if($data["new"]["parent_domain_id"] != $data["old"]["parent_domain_id"]) {
         if($this->action == 'update' && $data["new"]["parent_domain_id"] != $data["old"]["parent_domain_id"]) {
            $tmp = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ".$old_parent_domain_id." AND active = 'y'");
            $data["new"] = $tmp;
            $data["old"] = $tmp;
@@ -219,10 +231,17 @@
         $this->action = 'update';
      }
      
		
      // load the server configuration options
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
		
      //* Check if this is a chrooted setup
      if($web_config['website_basedir'] != '' && @is_file($web_config['website_basedir'].'/etc/passwd')) {
         $apache_chrooted = true;
         $app->log("Info: Apache is chrooted.",LOGLEVEL_DEBUG);
      } else {
         $apache_chrooted = false;
      }
      
      if($data["new"]["document_root"] == '') {
         $app->log("document_root not set",LOGLEVEL_WARN);
@@ -250,7 +269,7 @@
               // Remove trailing slash
               if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
               // create the symlinks, if not exist
               if(!is_link($tmp_symlink)) {
               if(is_link($tmp_symlink)) {
                  exec("rm -f ".escapeshellcmd($tmp_symlink));
                  $app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);
               }
@@ -271,12 +290,18 @@
         exec('mv '.$data["old"]["document_root"].' '.$new_dir);
         $app->log("Moving site to new document root: ".'mv '.$data["old"]["document_root"].' '.$new_dir,LOGLEVEL_DEBUG);
         
         //* Change the owner of the website files to the new website owner
         exec('chown --recursive --from='.escapeshellcmd($data["old"]["system_user"]).':'.escapeshellcmd($data['old']['system_group']).' '.escapeshellcmd($data["new"]["system_user"]).':'.escapeshellcmd($data['new']['system_group']).' '.$new_dir);
			
         //* Change the home directory and group of the website user
         $command = 'usermod';
         $command .= ' --home '.escapeshellcmd($data["new"]["document_root"]);
         $command .= ' --gid '.escapeshellcmd($data['new']['system_group']);
         $command .= ' '.escapeshellcmd($data["new"]["system_user"]);
         exec($command);
			
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
			
         
      }
      
@@ -332,8 +357,8 @@
               $tmp_symlink = str_replace("[website_domain]",$data["old"]["domain"],$tmp_symlink);
               // Remove trailing slash
               if(substr($tmp_symlink, -1, 1) == '/') $tmp_symlink = substr($tmp_symlink, 0, -1);
               // create the symlinks, if not exist
               if(!is_link($tmp_symlink)) {
               // remove the symlinks, if not exist
               if(is_link($tmp_symlink)) {
                  exec("rm -f ".escapeshellcmd($tmp_symlink));
                  $app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);
               }
@@ -396,7 +421,24 @@
            }
         }
         exec("chmod -R a+r ".escapeshellcmd($data["new"]["document_root"])."/web/");
      }
		
      //** Copy the error documents on update when the error document checkbox has been activated and was deactivated before
      } elseif ($this->action == 'update' && $data["new"]["type"] == 'vhost' && $data["old"]["errordocs"] == 0 && $data["new"]["errordocs"] == 1) {
			
         $error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
         if (file_exists("/usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2))){
            exec("cp /usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
         }
         else {
            if (file_exists("/usr/local/ispconfig/server/conf-custom/error/400.html")){
               exec("cp /usr/local/ispconfig/server/conf-custom/error/*.html ".$error_page_path);
            }
            else {
               exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
            }
         }
         exec("chmod -R a+r ".$error_page_path);
      }  // end copy error docs
      
      // Create group and user, if not exist
      $app->uses("system");
@@ -404,12 +446,14 @@
      $groupname = escapeshellcmd($data["new"]["system_group"]);
      if($data["new"]["system_group"] != '' && !$app->system->is_group($data["new"]["system_group"])) {
         exec("groupadd $groupname");
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." groupadd $groupname");
         $app->log("Adding the group: $groupname",LOGLEVEL_DEBUG);
      }
      
      $username = escapeshellcmd($data["new"]["system_user"]);
      if($data["new"]["system_user"] != '' && !$app->system->is_user($data["new"]["system_user"])) {
         exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname $username -s /bin/false");
         exec("useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname -G sshusers $username -s /bin/false");
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." "."useradd -d ".escapeshellcmd($data["new"]["document_root"])." -g $groupname -G sshusers $username -s /bin/false");
         $app->log("Adding the user: $username",LOGLEVEL_DEBUG);
      }
      
@@ -425,17 +469,78 @@
         exec("setquota -T -u $username 604800 604800 -a &> /dev/null");
      }
      
		
      if($this->action == 'insert') {
         // Chown and chmod the directories below the document root
         exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
		
         // The document root itself has to be owned by root
         exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]));
         $this->_exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
         // The document root itself has to be owned by root in normal level and by the web owner in security level 20
         if($web_config['security_level'] == 20) {
            $this->_exec("chown $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
         } else {
            $this->_exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]));
         }
      }
      
      // make temp direcory writable for the apache user and the website user
      exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
		
		
      //* If the security level is set to high
      if($web_config['security_level'] == 20) {
			
         $this->_exec("chmod 751 ".escapeshellcmd($data["new"]["document_root"]."/"));
         $this->_exec("chmod 751 ".escapeshellcmd($data["new"]["document_root"])."/*");
         $this->_exec("chmod 710 ".escapeshellcmd($data["new"]["document_root"]."/web"));
			
         // make temp direcory writable for the apache user and the website user
         $this->_exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
			
         $command = 'usermod';
         $command .= ' --groups sshusers';
         $command .= ' '.escapeshellcmd($data["new"]["system_user"]);
         $this->_exec($command);
			
         //* if we have a chrooted apache enviroment
         if($apache_chrooted) {
            $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
				
            //* add the apache user to the client group in the chroot enviroment
            $tmp_groupfile = $app->system->server_conf["group_datei"];
            $app->system->server_conf["group_datei"] = $web_config['website_basedir'].'/etc/group';
            $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
            $app->system->server_conf["group_datei"] = $tmp_groupfile;
            unset($tmp_groupfile);
         }
			
         //* add the apache user to the client group
         $app->system->add_user_to_group($groupname, escapeshellcmd($web_config['user']));
			
         $this->_exec("chown $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
			
         /*
         * Workaround for jailkit: If jailkit is enabled for the site, the 
         * website root has to be owned by the root user and we have to chmod it to 755 then
         */
			
         //* Check if there is a jailkit user for this site
         $tmp = $app->db->queryOneRecord("SELECT count(shell_user_id) as number FROM shell_user WHERE parent_domain_id = ".$data["new"]["domain_id"]." AND chroot = 'jailkit'");
         if($tmp['number'] > 0) {
            $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/"));
            $this->_exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]."/"));
         }
         unset($tmp);
			
      // If the security Level is set to medium
      } else {
		
         $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/"));
         $this->_exec("chmod 755 ".escapeshellcmd($data["new"]["document_root"]."/*"));
         $this->_exec("chown root:root ".escapeshellcmd($data["new"]["document_root"]."/"));
		
         // make temp direcory writable for the apache user and the website user
         $this->_exec("chmod 777 ".escapeshellcmd($data["new"]["document_root"]."/tmp"));
      }
		
      // Change the owner of the error log to the owner of the website
      if(!@is_file($data["new"]["document_root"]."/log/error.log")) exec('touch '.escapeshellcmd($data["new"]["document_root"])."/log/error.log");
      $this->_exec("chown $username:$groupname ".escapeshellcmd($data["new"]["document_root"])."/log/error.log");
      
      
      // Create the vhost config file
@@ -446,11 +551,16 @@
      
      $vhost_data = $data["new"];
      $vhost_data["web_document_root"] = $data["new"]["document_root"]."/web";
      $vhost_data["web_document_root_www"] = "/var/www/".$data["new"]["domain"]."/web";
      $vhost_data["web_document_root_www"] = $web_config["website_basedir"]."/".$data["new"]["domain"]."/web";
      $vhost_data["web_basedir"] = $web_config["website_basedir"];
      $vhost_data["security_level"] = $web_config["security_level"];
      $vhost_data["allow_override"] = ($data["new"]["allow_override"] == '')?'All':$data["new"]["allow_override"];
      $vhost_data["php_open_basedir"] = ($data["new"]["php_open_basedir"] == '')?$data["new"]["document_root"]:$data["new"]["php_open_basedir"];
      $vhost_data["ssl_domain"] = $data["new"]["ssl_domain"];
      
      // Check if a SSL cert exists
      $ssl_dir = $data["new"]["document_root"]."/ssl";
      $domain = $data["new"]["domain"];
      $domain = $data["new"]["ssl_domain"];
        $key_file = $ssl_dir.'/'.$domain.".key";
        $crt_file = $ssl_dir.'/'.$domain.".crt";
      $bundle_file = $ssl_dir.'/'.$domain.".bundle";
@@ -471,14 +581,19 @@
      // Rewrite rules
      $rewrite_rules = array();
      if($data["new"]["redirect_type"] != '') {
         if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/';
         if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') {
            $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/';
         }
			
         $rewrite_rules[] = array(   'rewrite_domain'    => $data["new"]["domain"],
                              'rewrite_type'       => $data["new"]["redirect_type"],
                              'rewrite_type'       => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                              'rewrite_target'    => $data["new"]["redirect_path"]);
            
            switch($data["new"]["subdomain"]) {
            case 'www':
             $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$data["new"]["domain"],
                                  'rewrite_type'       => $data["new"]["redirect_type"],
                                  'rewrite_type'       => ($data["new"]["redirect_type"] == 'no')?'':'['.$data["new"]["redirect_type"].']',
                                  'rewrite_target'    => $data["new"]["redirect_path"]);
                break;
            case '*':
@@ -492,37 +607,42 @@
      
      // get alias domains (co-domains and subdomains)
      $aliases = $app->db->queryAllRecords("SELECT * FROM web_domain WHERE parent_domain_id = ".$data["new"]["domain_id"]." AND active = 'y'");
        switch($data["new"]["subdomain"]) {
        $server_alias = array();
      switch($data["new"]["subdomain"]) {
        case 'www':
            $server_alias .= 'www.'.$data["new"]["domain"].' ';
            $server_alias[] .= 'www.'.$data["new"]["domain"].' ';
            break;
        case '*':
            $server_alias .= '*.'.$data["new"]["domain"].' ';    
            $server_alias[] .= '*.'.$data["new"]["domain"].' ';    
            break;
        }
      if(is_array($aliases)) {
         foreach($aliases as $alias) {
                switch($alias["subdomain"]) {
                case 'www':
                    $server_alias .= 'www.'.$alias["domain"].' '.$alias["domain"].' ';
                    $server_alias[] .= 'www.'.$alias["domain"].' '.$alias["domain"].' ';
                    break;
                case '*':
                    $server_alias .= '*.'.$alias["domain"].' '.$alias["domain"].' ';    
                    $server_alias[] .= '*.'.$alias["domain"].' '.$alias["domain"].' ';    
                    break;
                default:
                    $server_alias .= $alias["domain"].' ';            
                    $server_alias[] .= $alias["domain"].' ';            
                    break;
                }
            $app->log("Add server alias: $alias[domain]",LOGLEVEL_DEBUG);
            // Rewriting
            if($alias["redirect_type"] != '') {
               if(substr($data["new"]["redirect_path"],-1) != '/') $data["new"]["redirect_path"] .= '/';
               if($data["new"]["redirect_type"] == 'no' && substr($data["new"]["redirect_path"],0,4) != 'http') {
                  $data["new"]["redirect_path"] = $data["new"]["document_root"]."/web".realpath($data["new"]["redirect_path"]).'/';
               }
               $rewrite_rules[] = array(   'rewrite_domain'    => $alias["domain"],
                                    'rewrite_type'       => $alias["redirect_type"],
                                    'rewrite_type'       => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                    'rewrite_target'    => $alias["redirect_path"]);
                    switch($alias["subdomain"]) {
                    case 'www':
                     $rewrite_rules[] = array(   'rewrite_domain'    => 'www.'.$alias["domain"],
                                          'rewrite_type'       => $alias["redirect_type"],
                                          'rewrite_type'       => ($alias["redirect_type"] == 'no')?'':'['.$alias["redirect_type"].']',
                                          'rewrite_target'    => $alias["redirect_path"]);
                        break;
                    case '*':
@@ -535,7 +655,24 @@
            }
         }
      }
      $tpl->setVar('alias',trim($server_alias));
		
      //* If we have some alias records
      if(count($server_alias) > 0) {
         $server_alias_str = '';
         $n = 0;
			
         // begin a new ServerAlias line after 30 alias domains
         foreach($server_alias as $tmp_alias) {
            if($n % 30 == 0) $server_alias_str .= "\n    ServerAlias ";
            $server_alias_str .= $tmp_alias;
         }
         unset($tmp_alias);
			
         $tpl->setVar('alias',trim($server_alias_str));
      } else {
         $tpl->setVar('alias','');
      }
		
      if(count($rewrite_rules) > 0) {
         $tpl->setVar('rewrite_enabled',1);
      } else {
@@ -560,20 +697,26 @@
         if (!is_dir($fastcgi_starter_path))
         {
            exec("mkdir -p ".escapeshellcmd($fastcgi_starter_path));
            exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." ".escapeshellcmd($fastcgi_starter_path));
            //exec("chown ".$data["new"]["system_user"].":".$data["new"]["system_group"]." ".escapeshellcmd($fastcgi_starter_path));
            
            
            $app->log("Creating fastcgi starter script directory: $fastcgi_starter_path",LOGLEVEL_DEBUG);
         }
         
         exec("chown -R ".$data["new"]["system_user"].":".$data["new"]["system_group"]." ".escapeshellcmd($fastcgi_starter_path));
			
         $fcgi_tpl = new tpl();
         $fcgi_tpl->newTemplate("php-fcgi-starter.master");
            
         $fcgi_tpl->setVar('php_ini_path',$fastcgi_config["fastcgi_phpini_path"]);
         $fcgi_tpl->setVar('document_root',$data["new"]["document_root"]);
         $fcgi_tpl->setVar('php_fcgi_children',$fastcgi_config["fastcgi_children"]);
         $fcgi_tpl->setVar('php_fcgi_max_requests',$fastcgi_config["fastcgi_max_requests"]);
         $fcgi_tpl->setVar('php_fcgi_bin',$fastcgi_config["fastcgi_bin"]);
         $fcgi_tpl->setVar('php_ini_path',escapeshellcmd($fastcgi_config["fastcgi_phpini_path"]));
         $fcgi_tpl->setVar('document_root',escapeshellcmd($data["new"]["document_root"]));
         $fcgi_tpl->setVar('php_fcgi_children',escapeshellcmd($fastcgi_config["fastcgi_children"]));
         $fcgi_tpl->setVar('php_fcgi_max_requests',escapeshellcmd($fastcgi_config["fastcgi_max_requests"]));
         $fcgi_tpl->setVar('php_fcgi_bin',escapeshellcmd($fastcgi_config["fastcgi_bin"]));
         $fcgi_tpl->setVar('security_level',intval($web_config["security_level"]));
			
         $php_open_basedir = ($data["new"]["php_open_basedir"] == '')?$data["new"]["document_root"]:$data["new"]["php_open_basedir"];
         $fcgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir));
            
         $fcgi_starter_script = escapeshellcmd($fastcgi_starter_path.$fastcgi_config["fastcgi_starter_script"]);
         file_put_contents($fcgi_starter_script,$fcgi_tpl->grab());
@@ -602,7 +745,7 @@
      {
         //$cgi_config = $app->getconf->get_server_config($conf["server_id"], 'cgi');

         $cgi_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/[system_user]/";
         $cgi_config["cgi_starter_path"] = $web_config["website_basedir"]."/php-cgi-scripts/[system_user]/";
         $cgi_config["cgi_starter_script"] = "php-cgi-starter";
         $cgi_config["cgi_bin"] = "/usr/bin/php-cgi";

@@ -621,10 +764,14 @@
         $cgi_tpl->newTemplate("php-cgi-starter.master");

         // This works, because php "rewrites" a symlink to the physical path
         $cgi_tpl->setVar('open_basedir', $data["new"]["document_root"]); 
         $php_open_basedir = ($data["new"]["php_open_basedir"] == '')?$data["new"]["document_root"]:$data["new"]["php_open_basedir"];
         $cgi_tpl->setVar('open_basedir', escapeshellcmd($php_open_basedir)); 
         $cgi_tpl->setVar('document_root', escapeshellcmd($data["new"]["document_root"]));
			
         // This will NOT work!
         //$cgi_tpl->setVar('open_basedir', "/var/www/" . $data["new"]["domain"]);
         $cgi_tpl->setVar('php_cgi_bin',$cgi_config["cgi_bin"]);
         $cgi_tpl->setVar('security_level',$web_config["security_level"]);

         $cgi_starter_script = escapeshellcmd($cgi_starter_path.$cgi_config["cgi_starter_script"]);
         file_put_contents($cgi_starter_script,$cgi_tpl->grab());
@@ -669,8 +816,34 @@
         $app->log("Removing File $vhost_file",LOGLEVEL_DEBUG);
      }
      
      // request a httpd reload when all records have been processed
      $app->services->restartServiceDelayed('httpd','reload');
      //* Create .htaccess and .htpasswd file for website statistics
      if(!is_file($data["new"]["document_root"].'/web/stats/.htaccess') or $data["old"]["document_root"] != $data["new"]["document_root"]) {
         if(!is_dir($data["new"]["document_root"].'/web/stats')) mkdir($data["new"]["document_root"].'/web/stats');
         $ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data["new"]["document_root"]."/.htpasswd_stats\nrequire valid-user";
         file_put_contents($data["new"]["document_root"].'/web/stats/.htaccess',$ht_file);
         chmod($data["new"]["document_root"].'/web/stats/.htaccess',0755);
         unset($ht_file);
      }
		
      if(!is_file($data["new"]["document_root"].'/.htpasswd_stats') || $data["new"]["stats_password"] != $data["old"]["stats_password"]) {
         if(trim($data["new"]["stats_password"]) != '') {
            $htp_file = 'admin:'.trim($data["new"]["stats_password"]);
            file_put_contents($data["new"]["document_root"].'/.htpasswd_stats',$htp_file);
            chmod($data["new"]["document_root"].'/.htpasswd_stats',0755);
            unset($htp_file);
         }
      }
		
		
      if($apache_chrooted) {
         $app->services->restartServiceDelayed('httpd','restart');
      } else {
         // request a httpd reload when all records have been processed
         $app->services->restartServiceDelayed('httpd','reload');
      }
		
      //* Unset action to clean it for next processed vhost.
      $this->action = '';
      
   }
   
@@ -681,6 +854,12 @@
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
      
      //* Check if this is a chrooted setup
      if($web_config['website_basedir'] != '' && @is_file($web_config['/var/www'].'/etc/passwd')) {
         $apache_chrooted = true;
      } else {
         $apache_chrooted = false;
      }
      
      if($data["old"]["type"] != "vhost" && $data["old"]["parent_domain_id"] > 0) {
         //* This is a alias domain or subdomain, so we have to update the website instead
@@ -721,7 +900,7 @@
         if ($data["old"]["php"] == "cgi")
         {
            // TODO: fetch the date from the server-settings
            $web_config["cgi_starter_path"] = "/var/www/php-cgi-scripts/[system_user]/";
            $web_config["cgi_starter_path"] = $web_config["website_basedir"]."/php-cgi-scripts/[system_user]/";

            $cgi_starter_path = str_replace("[system_user]",$data["old"]["system_user"],$web_config["cgi_starter_path"]);
            if (is_dir($cgi_starter_path))
@@ -761,6 +940,8 @@
         $command = 'userdel';
         $command .= ' '.$data["old"]["system_user"];         
         exec($command);
         if($apache_chrooted) $this->_exec("chroot ".escapeshellcmd($web_config['website_basedir'])." ".$command);
			
      }
   }
   
@@ -789,6 +970,13 @@
      
   }
   
   //* Wrapper for exec function for easier debugging
   private function _exec($command) {
      global $app;
      $app->log("exec: ".$command,LOGLEVEL_DEBUG);
      exec($command);
   }
	

} // end class