Merge branch '6147-awstats-links' into 'develop'

Marius Burkard · Marius Burkard · commit 2a958a7a27c1 · 2021-05-25T07:26:36.000Z
Resolve "AWstats links"

Closes #6147

See merge request ispconfig/ispconfig3!1470
diff --git a/server/conf/awstats_index.php.master b/server/conf/awstats_index.php.master
@@ -43,23 +43,17 @@ if ($handle = opendir('.'))
 arsort($awprev);
 
 $options = "";
-foreach ($awprev as $key => $value)
-{
-
-	if(file_exists($value.'/awsindex.html') && file_exists($value.'/goaindex.html')) {
-		$awstatsindex = 'awsindex.html';
-	} elseif(file_exists($value.'/awsindex.html') && !file_exists($value.'/goaindex.html')) {
-                $awstatsindex = 'awsindex.html';
-	} else {
-		$awstatsindex = 'goaindex.html';
-	}
-
+foreach ($awprev as $key => $value) {
+        // Define name for the index file
+        $awstatsindex = 'awsindex.html';
+        if(!file_exists($value.'/awsindex.html') && file_exists($value.'/goaindex.html')) {
+                $awstatsindex = 'goaindex.html';
+        }
+        // Set name for first entry in month list
 	if($key == $current) $options .= "<option selected=\"selected\" value=\"{$awstatsindex}\">{$value}</option>\n";
 	else $options .= "<option value=\"{$value}/{$awstatsindex}\">{$value}</option>\n";
 }
 
-$awstatsindex = 'awsindex.html';
-
 $html = "<!DOCTYPE html>\n<html>\n<head>\n<title>Stats</title>\n";
 $html .= "<style>\nhtml,body {margin:0px;padding:0px;width:100%;height:100%;background-color: #ccc;}\n";
 $html .= "#header\n{\nwidth:100%;margin:0px auto;\nheight:20px;\nposition:fixed;\npadding:4px;\ntext-align:center;\n}\n";
@@ -68,7 +62,7 @@ $html .= $script;
 $html .= "<div id=\"header\">{$yearmonth_text}\n";
 $html .= "<select name=\"awdate\" onchange=\"load_content(this.value)\">\n";
 $html .= $options;
-$html .= "</select>\n</div>\n<iframe src=\"{$awstatsindex}\" id=\"content\"></iframe>\n";
+$html .= "</select>\n</div>\n<iframe src=\"awsindex.html\" id=\"content\"></iframe>\n";
 $html .= "</body></html>";
 echo $html;
 ?>
