fixed utf8 by adding appropriate files directive to htaccess

ms217 · ms217 · commit a1391774335b · 2020-09-01T11:19:10.000+02:00
diff --git a/server/conf/goaccess_index.php.master b/server/conf/goaccess_index.php.master
@@ -1,5 +1,4 @@
 <?php
-header('Content-type: text/html; charset=utf-8');
 $yearmonth_text = "Jump to previous stats: ";
 $script = "<script>function load_content(url){var iframe = document.getElementById(\"content\");iframe.src = url;}</script>\n";
 
@@ -61,7 +60,7 @@ foreach ($goaprev as $key => $value)
 $goaccessindex = 'goaindex.html';
 
 $html = "<!DOCTYPE html>\n<html>\n<head>\n<title>Stats</title>\n";
-$html .= "<meta charset="UTF-8">\n";
+$html .= "<meta charset=\"UTF-8\">\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";
 $html .= "iframe {width:100%;height:95%;margin:0px;margin-top:40px;border:0px;padding:0px;}\n</style>\n</head>\n<body>\n";
diff --git a/server/lib/classes/cron.d/150-goaccess.inc.php b/server/lib/classes/cron.d/150-goaccess.inc.php
@@ -191,8 +191,7 @@ public function onRunJob() {
 					 * For versions prior 1.4 you need GoAccess with B+Tree support compiled!
 					 */
 
-
-			                $sql_user = "SELECT client_id FROM sys_group WHERE groupid = ?";
+					$sql_user = "SELECT client_id FROM sys_group WHERE groupid = ?";
 					$rec_user = $app->db->queryOneRecord($sql_user, $rec['sys_groupid']);
 					$lang_query = "SELECT country,language FROM client WHERE client_id = ?";
 					$lang_user = $app->db->queryOneRecord($lang_query, $rec_user['client_id']);
@@ -204,16 +203,16 @@ public function onRunJob() {
 							$cust_lang = 'en_UK.UTF-8';
 							break;
 						case 'br':
-							$cust_lang = 'pt_BR.UTF-8';
+							$cust_lang = 'pt_PT.UTF-8';
 							break;
 						case 'ca':
-							$cust_lang = 'en_CA.UTF-8';
+							$cust_lang = 'en_US.UTF-8';
 							break;
 						case 'ja':
 							$cust_lang = 'ja_JP.UTF-8';
 							break;
 						case 'ar':
-							$cust_lang = 'es_AR.UTF-8';
+							$cust_lang = 'es_ES.UTF-8';
 							break;
 						case 'el':
 							$cust_lang = 'el_GR.UTF-8';
@@ -229,7 +228,6 @@ public function onRunJob() {
 							break;
 					}
 
-					echo $cust_lang ."\n\n";
 					if(version_compare($goaccess_version,1.4) >= 0) {
 						$app->system->exec_safe("LANG=? goaccess -f ? --config-file ? --restore --persist --db-path=? --output=?", $cust_lang, $logfile, $goaccess_conf, $goa_db_dir, $output_html);
 					} else {
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1893,7 +1893,7 @@ function update($event_name, $data) {
 
 		if($data['new']['stats_type'] != '') {
 			if(!is_dir($data['new']['document_root'].'/' . $web_folder . '/stats')) $app->system->mkdir($data['new']['document_root'].'/' . $web_folder . '/stats');
-			$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user\nDirectoryIndex index.html index.php\nHeader unset Content-Security-Policy";
+			$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$data['new']['document_root']."/web/stats/.htpasswd_stats\nrequire valid-user\nDirectoryIndex index.html index.php\nHeader unset Content-Security-Policy\n<Files \"goaindex.html\">\nAddDefaultCharset UTF-8\n</Files>\n";
 			$app->system->file_put_contents($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', $ht_file);
 			$app->system->chmod($data['new']['document_root'].'/' . $web_folder . '/stats/.htaccess', 0755);
 			unset($ht_file);
