Fixed: FS#2417 - Custom awstats_index.php.master

tbrehm · tbrehm · commit a464e1f42fd7 · 2012-10-03T09:49:21.000Z
diff --git a/server/cron_daily.php b/server/cron_daily.php
@@ -39,7 +39,7 @@
 
 
 // Load required base-classes
-$app->uses('ini_parser,file,services,getconf');
+$app->uses('ini_parser,file,services,getconf,system');
 
 
 #######################################################################################################
@@ -238,7 +238,13 @@ function setConfigVar( $filename, $varName, $varValue ) {
 		exec($command);
 		if(is_file($rec['document_root'].'/'.$web_folder.'/stats/index.html')) unlink($rec['document_root'].'/'.$web_folder.'/stats/index.html');
 		rename($rec['document_root'].'/'.$web_folder.'/stats/awstats.'.$domain.'.html',$rec['document_root'].'/'.$web_folder.'/stats/awsindex.html');
-		if(!is_file($rec['document_root']."/".$web_folder."/stats/index.php")) copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+		if(!is_file($rec['document_root']."/".$web_folder."/stats/index.php")) {
+			if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
+				copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+			} else {
+				copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$rec['document_root']."/".$web_folder."/stats/index.php");
+			}
+		}
 
 		$app->log('Created awstats statistics with command: '.$command,LOGLEVEL_DEBUG);
 	} else {
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -2271,7 +2271,11 @@ private function awstats_update ($data,$web_config) {
 		}
 		
 		if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");
-		$app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+		if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
+			$app->system->copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+		} else {
+			$app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+		}
 	}
 	
 	//* Delete the awstats configuration file
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -1792,7 +1792,11 @@ private function awstats_update ($data,$web_config) {
 		}
 		
 		if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");
-		$app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+		if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {
+			$app->system->copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+		} else {
+			$app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");
+		}
 	}
 	
 	//* Delete the awstats configuration file

Original file line number	Diff line number	Diff line change
`@@ -2271,7 +2271,11 @@ private function awstats_update ($data,$web_config) {`
`2271`	`2271`	`}`
`2272`	`2272`
`2273`	`2273`	`if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");`
`2274`		`- $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");`
	`2274`	`+ if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {`
	`2275`	`+ $app->system->copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");`
	`2276`	`+ } else {`
	`2277`	`+ $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");`
	`2278`	`+ }`
`2275`	`2279`	`}`
`2276`	`2280`
`2277`	`2281`	`//* Delete the awstats configuration file`
Original file line number	Diff line number	Diff line change
`@@ -1792,7 +1792,11 @@ private function awstats_update ($data,$web_config) {`
`1792`	`1792`	`}`
`1793`	`1793`
`1794`	`1794`	`if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html");`
`1795`		`- $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");`
	`1795`	`+ if(file_exists("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master")) {`
	`1796`	`+ $app->system->copy("/usr/local/ispconfig/server/conf-custom/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");`
	`1797`	`+ } else {`
	`1798`	`+ $app->system->copy("/usr/local/ispconfig/server/conf/awstats_index.php.master",$data['new']['document_root']."/" . $web_folder . "/stats/index.php");`
	`1799`	`+ }`
`1796`	`1800`	`}`
`1797`	`1801`
`1798`	`1802`	`//* Delete the awstats configuration file`