hopefully the last language migrations needed

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>

admin_templates.php

@@ -29,6 +29,7 @@ require __DIR__ . '/lib/init.php';
 use Froxlor\Database\Database;
 use Froxlor\FileDir;
 use Froxlor\FroxlorLogger;
+use Froxlor\Language;
 use Froxlor\PhpHelper;
 use Froxlor\Settings;
 use Froxlor\UI\HTML;
@@ -259,20 +260,14 @@ if ($action == '') {
 			Response::standardError('templatelanguagecombodefined');
 		}
 
-		$lng_bak = $lng;
+		// set target language
-		foreach ($langs['English'] as $key => $value) {
+		Language::setLanguage($language);
-			include_once FileDir::makeSecurePath($value['file']);
-		}
-		if ($language != 'English') {
-			foreach ($langs[$language] as $key => $value) {
-				include FileDir::makeSecurePath($value['file']);
-			}
-		}
 
 		$subject = lng('mails.' . $template . '.subject');
 		$body = str_replace('\n', "\n", lng('mails.' . $template . '.mailbody'));
 
-		$lng = $lng_bak;
+		// re set language to user
+		Language::setLanguage(CurrentUser::getField('def_language'));
 
 		$template_add_data = include_once dirname(__FILE__) . '/lib/formfields/admin/templates/formfield.template_add.php';
 

lib/Froxlor/Cli/ConfigServices.php

@@ -54,8 +54,6 @@ final class ConfigServices extends CliCommand
 
 	protected function execute(InputInterface $input, OutputInterface $output)
 	{
-		global $lng;
-
 		$result = self::SUCCESS;
 
 		$result = $this->validateRequirements($input, $output);

lib/Froxlor/Cron/Traffic/ReportsCron.php

@@ -151,8 +151,6 @@ class ReportsCron extends FroxlorCron
 					Database::pexecute($upd_stmt, [
 						'customerid' => $row['customerid']
 					]);
-
-					unset($lng);
 				}
 			}
 
@@ -184,29 +182,8 @@ class ReportsCron extends FroxlorCron
 						'MAX_PERCENT' => Settings::Get('system.report_trafficmax')
 					];
 
-					$lngfile_stmt = Database::prepare("
+					// set target user language
-						SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
+					Language::setLanguage($row['def_language']);
-						WHERE `language` = :deflang
-					");
-					$lngfile = Database::pexecute_first($lngfile_stmt, [
-						'deflang' => $row['def_language']
-					]);
-
-					if ($lngfile !== null) {
-						$langfile = $lngfile['file'];
-					} else {
-						$lngfile = Database::pexecute_first($lngfile_stmt, [
-							'deflang' => Settings::Get('panel.standardlanguage')
-						]);
-						$langfile = $lngfile['file'];
-					}
-
-					// include english language file (fallback)
-					include FileDir::makeCorrectFile(Froxlor::getInstallDir() . '/lng/english.lng.php');
-					// include admin/customer language file
-					if ($lngfile != 'lng/english.lng.php') {
-						include FileDir::makeCorrectFile(Froxlor::getInstallDir() . '/' . $langfile);
-					}
 
 					// Get mail templates from database; the ones from 'admin' are fetched for fallback
 					$result2_stmt = Database::prepare("
@@ -334,8 +311,6 @@ class ReportsCron extends FroxlorCron
 					}
 
 					$mail->ClearAddresses();
-
-					unset($lng);
 				}
 			}
 		} // trafficmax > 0
@@ -390,29 +365,8 @@ class ReportsCron extends FroxlorCron
 						'MAX_PERCENT' => Settings::Get('system.report_webmax')
 					];
 
-					$lngfile_stmt = Database::prepare("
+					// set target user language
-						SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
+					Language::setLanguage($row['def_language']);
-						WHERE `language` = :deflang
-					");
-					$lngfile = Database::pexecute_first($lngfile_stmt, [
-						'deflang' => $row['def_language']
-					]);
-
-					if ($lngfile !== null) {
-						$langfile = $lngfile['file'];
-					} else {
-						$lngfile = Database::pexecute_first($lngfile_stmt, [
-							'deflang' => Settings::Get('panel.standardlanguage')
-						]);
-						$langfile = $lngfile['file'] ?? 'lng/english.lng.php';
-					}
-
-					// include english language file (fallback)
-					include FileDir::makeCorrectFile(Froxlor::getInstallDir() . '/lng/english.lng.php');
-					// include admin/customer language file
-					if ($lngfile != 'lng/english.lng.php') {
-						include FileDir::makeCorrectFile(Froxlor::getInstallDir() . '/' . $langfile);
-					}
 
 					// Get mail templates from database; the ones from 'admin' are fetched for fallback
 					$result2_stmt = Database::prepare("
@@ -463,8 +417,6 @@ class ReportsCron extends FroxlorCron
 					Database::pexecute($upd_stmt, [
 						'customerid' => $row['customerid']
 					]);
-
-					unset($lng);
 				}
 			}
 
@@ -487,29 +439,8 @@ class ReportsCron extends FroxlorCron
 						'MAX_PERCENT' => Settings::Get('system.report_webmax')
 					];
 
-					$lngfile_stmt = Database::prepare("
+					// set target user language
-						SELECT `file` FROM `" . TABLE_PANEL_LANGUAGE . "`
+					Language::setLanguage($row['def_language']);
-						WHERE `language` = :deflang
-					");
-					$lngfile = Database::pexecute_first($lngfile_stmt, [
-						'deflang' => $row['def_language']
-					]);
-
-					if ($lngfile !== null) {
-						$langfile = $lngfile['file'];
-					} else {
-						$lngfile = Database::pexecute_first($lngfile_stmt, [
-							'deflang' => Settings::Get('panel.standardlanguage')
-						]);
-						$langfile = $lngfile['file'];
-					}
-
-					// include english language file (fallback)
-					include FileDir::makeCorrectFile(Froxlor::getInstallDir() . '/lng/english.lng.php');
-					// include admin/customer language file
-					if ($lngfile != 'lng/english.lng.php') {
-						include FileDir::makeCorrectFile(Froxlor::getInstallDir() . '/' . $langfile);
-					}
 
 					// Get mail templates from database; the ones from 'admin' are fetched for fallback
 					$result2_stmt = Database::prepare("