Merge remote-tracking branch 'upstream/master'

scripts/jobs/cron_autoresponder.php

@@ -226,6 +226,7 @@ if($db->num_rows($result) > 0)
 
 				$_mailerror = false;
 				try {
+					$mail->CharSet = "UTF-8";
 					$mail->SetFrom($to, $to);
 					$mail->AddReplyTo($to, $to);
 					$mail->Subject = $row['subject'];

scripts/jobs/cron_lighttp.htaccess.php

@@ -47,7 +47,7 @@ else
 
 function read_directory($dir1 = null, $min_depth = 25, $htaccessfh = null)
 {
-	global $htaccessfh;
+	global $htaccessfh, $theme;
 
 	if(!is_string($dir1))
 	{
@@ -95,7 +95,7 @@ function read_directory($dir1 = null, $min_depth = 25, $htaccessfh = null)
 
 function parseHtaccess($file = null)
 {
-	global $debugHandler, $htaccessfh;
+	global $debugHandler, $htaccessfh, $theme;
 	$htacc = @file_get_contents($file);
 
 	if($htacc != "")

scripts/jobs/cron_traffic.inc.functions.php

@@ -19,7 +19,7 @@
 
 function awstatsDoSingleDomain($domain, $outputdir)
 {
-	global $cronlog, $settings;
+	global $cronlog, $settings, $theme;
 	$returnval = 0;
 
 	$domainconfig = makeCorrectFile($settings['system']['awstats_conf'].'/awstats.' . $domain . '.conf');
@@ -104,7 +104,7 @@ function awstatsDoSingleDomain($domain, $outputdir)
 
 function callAwstatsGetTraffic($customerid, $outputdir, $usersdomainlist)
 {
-	global $settings, $db, $cronlog;
+	global $settings, $db, $cronlog, $theme;
 	$returnval = 0;
 
 	foreach($usersdomainlist as $domainid => $singledomain)
@@ -156,7 +156,7 @@ function callAwstatsGetTraffic($customerid, $outputdir, $usersdomainlist)
 
 function callWebalizerGetTraffic($logfile, $outputdir, $caption, $usersdomainlist)
 {
-	global $settings, $cronlog;
+	global $settings, $cronlog, $theme;
 	$returnval = 0;
 
 	if(file_exists($settings['system']['logfiles_directory'] . $logfile . '-access.log'))
@@ -305,7 +305,7 @@ function callWebalizerGetTraffic($logfile, $outputdir, $caption, $usersdomainlis
 
 function safeSQLLogfile($domains, $loginname)
 {
-	global $db, $settings;
+	global $db, $settings, $theme;
 	$sql = "SELECT * FROM access_log ";
 	$where = "WHERE virtual_host = ";
 

scripts/jobs/cron_usage_report.php

@@ -24,6 +24,8 @@ $yesterday = time() - (60 * 60 * 24);
  * Initialize the mailingsystem
  */
 $mail = new PHPMailer(true);
+
+$mail->CharSet = "UTF-8";
 $mail->SetFrom($settings['panel']['adminmail'], 'Froxlor Administrator');
 
 // Warn the customers at xx% traffic-usage