Commit a464e1f4 authored by tbrehm's avatar tbrehm

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

parent 7799e8af
...@@ -39,7 +39,7 @@ $conf['server_id'] = intval($conf['server_id']); ...@@ -39,7 +39,7 @@ $conf['server_id'] = intval($conf['server_id']);
// Load required base-classes // Load required base-classes
$app->uses('ini_parser,file,services,getconf'); $app->uses('ini_parser,file,services,getconf,system');
####################################################################################################### #######################################################################################################
...@@ -238,7 +238,13 @@ HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"'; ...@@ -238,7 +238,13 @@ HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';
exec($command); exec($command);
if(is_file($rec['document_root'].'/'.$web_folder.'/stats/index.html')) unlink($rec['document_root'].'/'.$web_folder.'/stats/index.html'); 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'); 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); $app->log('Created awstats statistics with command: '.$command,LOGLEVEL_DEBUG);
} else { } else {
......
...@@ -2271,7 +2271,11 @@ class apache2_plugin { ...@@ -2271,7 +2271,11 @@ class apache2_plugin {
} }
if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html"); 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 //* Delete the awstats configuration file
......
...@@ -1792,7 +1792,11 @@ class nginx_plugin { ...@@ -1792,7 +1792,11 @@ class nginx_plugin {
} }
if(is_file($data['new']['document_root']."/" . $web_folder . "/stats/index.html")) $app->system->unlink($data['new']['document_root']."/" . $web_folder . "/stats/index.html"); 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 //* Delete the awstats configuration file
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment