Merge branch 'patch-2' into 'develop'

keep and use "Lang" directive in awstats config files

Closes #3668

See merge request ispconfig/ispconfig3!1139

Author: Marius Burkard

server/lib/classes/cron.d/150-awstats.inc.php

@@ -86,7 +86,14 @@ public function onRunJob() {
 			$awstats_conf_dir = $web_config['awstats_conf_dir'];
 			$awstats_website_conf_file = $web_config['awstats_conf_dir'].'/awstats.'.$domain.'.conf';
 
-			if(is_file($awstats_website_conf_file)) unlink($awstats_website_conf_file);
+			$existing_awstats_conf_array = array();
+			if(is_file($awstats_website_conf_file)) {
+				$existing_awstats_conf = file($awstats_website_conf_file);
+				foreach ($existing_awstats_conf as $line) {
+					if(preg_match("/Lang=/",$line)) $existing_awstats_conf_array['Lang'] = implode('',parse_ini_string($line));
+				}
+				unlink($awstats_website_conf_file);
+			}
 
 			$sql = "SELECT domain FROM web_domain WHERE (type = 'alias' OR type = 'subdomain') AND parent_domain_id = ?";
 			$aliases = $app->db->queryAllRecords($sql, $rec['domain_id']);
@@ -108,6 +115,8 @@ public function onRunJob() {
         LogFile="/var/log/ispconfig/httpd/'.$domain.'/yesterday-access.log"
         SiteDomain="'.$domain.'"
         HostAliases="www.'.$domain.' localhost 127.0.0.1'.$aliasdomain.'"';
+				if (array_key_exists('Lang',$existing_awstats_conf_array)) $awstats_conf_file_content .='
+		Lang="'.$existing_awstats_conf_array['Lang'].'"';
 				if (isset($include_file)) {
 					file_put_contents($awstats_website_conf_file, $awstats_conf_file_content);
 				} else {
@@ -134,7 +143,7 @@ public function onRunJob() {
 				}
 			}
 
-			$command = escapeshellcmd($awstats_buildstaticpages_pl) . ' -month=' . escapeshellarg($awmonth) . ' -year=' . escapeshellarg($awyear) . ' -update -config=' . escapeshellarg($domain) . ' -lang=' . escapeshellarg($conf['language']) . ' -dir=' . escapeshellarg($statsdir) . ' -awstatsprog=' . escapeshellarg($awstats_pl);
+			$command = escapeshellcmd($awstats_buildstaticpages_pl) . ' -month=' . escapeshellarg($awmonth) . ' -year=' . escapeshellarg($awyear) . ' -update -config=' . escapeshellarg($domain) . ' -dir=' . escapeshellarg($statsdir) . ' -awstatsprog=' . escapeshellarg($awstats_pl);
 
 			if (date("d") == 2) {
 				$awmonth = date("m")-1;