Fixed moving of site when the client is changed.

tbrehm

2009-02-14 d053cb07eeb77c0252e23a28de0c834f8442897d

 server/plugins-available/apache2_plugin.inc.php

@@ -233,6 +233,44 @@
         return 0;
      }
      
      if($this->action == 'update' && $data["new"]["document_root"] != $data["old"]["document_root"]) {
			
         // Get the old client ID
         $old_client = $app->dbmaster->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["old"]["sys_groupid"]));
         $old_client_id = intval($old_client["client_id"]);
         unset($old_client);
			
         // Remove the old symlinks
         $tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);
         if(is_array($tmp_symlinks_array)) {
            foreach($tmp_symlinks_array as $tmp_symlink) {
               $tmp_symlink = str_replace("[client_id]",$old_client_id,$tmp_symlink);
               $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)) {
                  exec("rm -f ".escapeshellcmd($tmp_symlink));
                  $app->log("Removed Symlink: rm -f ".$tmp_symlink,LOGLEVEL_DEBUG);
               }
            }
         }
			
         $tmp_docroot = explode('/',$data["new"]["document_root"]);
         unset($tmp_docroot[count($tmp_docroot)-1]);
         $new_dir = implode('/',$tmp_docroot);
			
         $tmp_docroot = explode('/',$data["old"]["document_root"]);
         unset($tmp_docroot[count($tmp_docroot)-1]);
         $old_dir = implode('/',$tmp_docroot);
			
         exec('rm -rf '.$data["new"]["document_root"]);
         if(!is_dir($new_dir)) exec('mkdir -p '.$new_dir);
         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);
			
      }
		
      //print_r($data);
      
      // Check if the directories are there and create them if nescessary.
@@ -721,9 +759,24 @@
   function server_ip($event_name,$data) {
      global $app, $conf;
      
      // Here we write the name virtualhost directives
      // NameVirtualHost IP:80
      // NameVirtualHost IP:443
      // load the server configuration options
      $app->uses("getconf");
      $web_config = $app->getconf->get_server_config($conf["server_id"], 'web');
		
      $app->load('tpl');
		
      $tpl = new tpl();
      $tpl->newTemplate("apache_ispconfig.conf.master");
      $records = $app->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
		
      if(count($records) > 0) {
         $tpl->setLoop('ip_adresses',$records);
      }
		
      $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/ispconfig.conf');
      file_put_contents($vhost_file,$tpl->grab());
      $app->log("Writing the conf file: ispconfig.conf",LOGLEVEL_DEBUG);
      unset($tpl);
      
   }