From fbf7d5aa7319e31ec2a629e2081a2596ff659de7 Mon Sep 17 00:00:00 2001
From: fantu <fantu@ispconfig3>
Date: Fri, 25 Apr 2008 07:34:16 -0400
Subject: [PATCH] Add other italian text files
---
server/plugins-available/apache2_plugin.inc.php | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 2a634c8..5fb3648 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -216,14 +216,44 @@
if(!is_dir($data["new"]["document_root"]."/ssl")) exec("mkdir -p ".$data["new"]["document_root"]."/ssl");
if(!is_dir($data["new"]["document_root"]."/cgi-bin")) exec("mkdir -p ".$data["new"]["document_root"]."/cgi-bin");
+ // Remove the symlink for the site, if site is renamed
+ if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
+ if(is_dir('/var/log/ispconfig/httpd/'.$data["old"]["domain"])) exec('rm -rf /var/log/ispconfig/httpd/'.$data["old"]["domain"]);
+ if(is_link($data["old"]["document_root"]."/log")) unlink($data["old"]["document_root"]."/log");
+ }
+
// Create the symlink for the logfiles
if(!is_dir('/var/log/ispconfig/httpd/'.$data["new"]["domain"])) exec('mkdir -p /var/log/ispconfig/httpd/'.$data["new"]["domain"]);
- if(!is_link($data["new"]["document_root"]."/log")) exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
+ if(!is_link($data["new"]["document_root"]."/log")) {
+ exec("ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log");
+ $app->log("Creating Symlink: ln -s /var/log/ispconfig/httpd/".$data["new"]["domain"]." ".$data["new"]["document_root"]."/log",LOGLEVEL_DEBUG);
+ }
- // Create the symlinks for the sites
+
+ // Get the client ID
$client = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE sys_group.groupid = ".intval($data["new"]["sys_groupid"]));
$client_id = intval($client["client_id"]);
unset($client);
+
+ // Remove old symlinks, if site is renamed
+ if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
+ $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]",$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);
+ }
+ }
+ }
+ }
+
+ // Create the symlinks for the sites
$tmp_symlinks_array = explode(':',$web_config["website_symlinks"]);
if(is_array($tmp_symlinks_array)) {
foreach($tmp_symlinks_array as $tmp_symlink) {
@@ -239,13 +269,16 @@
}
}
+
if($this->action == 'insert') {
// Copy the error pages
$error_page_path = escapeshellcmd($data["new"]["document_root"])."/web/error/";
exec("cp /usr/local/ispconfig/server/conf/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
+ exec("chmod -R +r ".$error_page_path);
// copy the standard index page
exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
+ exec("chmod +r ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
}
// Create group and user, if not exist
@@ -279,6 +312,7 @@
// Chown and chmod the directories
exec("chown -R $username:$groupname ".escapeshellcmd($data["new"]["document_root"]));
+
// Create the vhost config file
$app->load('tpl');
@@ -358,6 +392,16 @@
$app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
}
+ // remove old symlink and vhost file, if domain name of the site has changed
+ if($this->action == 'update' && $data["old"]["domain"] != '' && $data["new"]["domain"] != $data["old"]["domain"]) {
+ $vhost_symlink = escapeshellcmd($web_config["vhost_conf_enabled_dir"].'/'.$data["old"]["domain"].'.vhost');
+ unlink($vhost_symlink);
+ $app->log("Removing symlink: $vhost_symlink => $vhost_file",LOGLEVEL_DEBUG);
+ $vhost_file = escapeshellcmd($web_config["vhost_conf_dir"].'/'.$data["old"]["domain"].'.vhost');
+ unlink($vhost_file);
+ $app->log("Removing File $vhost_file",LOGLEVEL_DEBUG);
+ }
+
// request a httpd reload when all records have been processed
$app->services->restartServiceDelayed('httpd','reload');
--
Gitblit v1.9.1