Added missing error messages to the dns wizard. Improved language file load...

tbrehm

2009-05-27 44d2a76d4611e27d348e1c8ed89ff0675f2d262f

 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,
@@ -204,7 +204,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;
@@ -218,7 +218,6 @@
         $data["old"] = $tmp;
         $this->action = 'update';
      }
		
      
      // load the server configuration options
      $app->uses("getconf");
@@ -271,12 +270,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);
			
			
			
         
      }
      
@@ -396,7 +401,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");
@@ -561,11 +583,13 @@
         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");
@@ -672,6 +696,7 @@
      
      //* Create .htaccess and .htpasswd file for website statistics
      if(!is_file($data["new"]["document_root"].'/web/stats/.htaccess')) {
         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\n<limit GET PUT POST>\nrequire valid-user\n</limit>";
         file_put_contents($data["new"]["document_root"].'/web/stats/.htaccess',$ht_file);
         chmod($data["new"]["document_root"].'/web/stats/.htaccess',0664);