maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

Revert "refactor global array"

Browse Source 
This reverts commit 370ccbdb74.
This commit is contained in:
Michael Kaufmann
2018-12-22 08:15:31 +01:00
parent c800e89414
commit 7e39a7bc60
220 changed files with 2244 additions and 2227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/Froxlor/System/Cronjob.php
View File

@@ -188,18 +188,20 @@ class Cronjob
public static function getCronjobsLastRun()
{
global $lng;
$query = "SELECT `lastrun`, `desc_lng_key` FROM `" . TABLE_PANEL_CRONRUNS . "` WHERE `isactive` = '1' ORDER BY `cronfile` ASC";
$result = Database::query($query);
$cronjobs_last_run = '';
while ($row = $result->fetch(\PDO::FETCH_ASSOC)) {
$lastrun = \Froxlor\I18N\Lang::getAll()['cronjobs']['notyetrun'];
$lastrun = $lng['cronjobs']['notyetrun'];
if ($row['lastrun'] > 0) {
$lastrun = date('d.m.Y H:i:s', $row['lastrun']);
}
$text = \Froxlor\I18N\Lang::getAll()['crondesc'][$row['desc_lng_key']];
$text = $lng['crondesc'][$row['desc_lng_key']];
$value = $lastrun;
eval("\$cronjobs_last_run .= \"" . \Froxlor\UI\Template::getTemplate("index/overview_item") . "\";");
@@ -224,6 +226,8 @@ class Cronjob
public static function getOutstandingTasks()
{
global $lng;
$query = "SELECT * FROM `" . TABLE_PANEL_TASKS . "` ORDER BY `type` ASC";
$result = Database::query($query);
@@ -237,49 +241,49 @@ class Cronjob
// rebuilding webserver-configuration
if ($row['type'] == '1') {
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['rebuild_webserverconfig'];
$task_desc = $lng['tasks']['rebuild_webserverconfig'];
} // adding new user/
elseif ($row['type'] == '2') {
$loginname = '';
if (is_array($row['data'])) {
$loginname = $row['data']['loginname'];
}
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['adding_customer'];
$task_desc = $lng['tasks']['adding_customer'];
$task_desc = str_replace('%loginname%', $loginname, $task_desc);
} // rebuilding bind-configuration
elseif ($row['type'] == '4') {
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['rebuild_bindconfig'];
$task_desc = $lng['tasks']['rebuild_bindconfig'];
} // creating ftp-user directory
elseif ($row['type'] == '5') {
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['creating_ftpdir'];
$task_desc = $lng['tasks']['creating_ftpdir'];
} // deleting user-files
elseif ($row['type'] == '6') {
$loginname = '';
if (is_array($row['data'])) {
$loginname = $row['data']['loginname'];
}
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['deleting_customerfiles'];
$task_desc = $lng['tasks']['deleting_customerfiles'];
$task_desc = str_replace('%loginname%', $loginname, $task_desc);
} // deleting email-account
elseif ($row['type'] == '7') {
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['remove_emailacc_files'];
$task_desc = $lng['tasks']['remove_emailacc_files'];
} // deleting ftp-account
elseif ($row['type'] == '8') {
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['remove_ftpacc_files'];
$task_desc = $lng['tasks']['remove_ftpacc_files'];
} // Set FS - quota
elseif ($row['type'] == '10') {
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['diskspace_set_quota'];
$task_desc = $lng['tasks']['diskspace_set_quota'];
} // deleting user-files
elseif ($row['type'] == '20') {
$loginname = '';
if (is_array($row['data'])) {
$loginname = $row['data']['loginname'];
}
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['backup_customerfiles'];
$task_desc = $lng['tasks']['backup_customerfiles'];
$task_desc = str_replace('%loginname%', $loginname, $task_desc);
} // re-generating of cron.d-file
elseif ($row['type'] == '99') {
$task_desc = \Froxlor\I18N\Lang::getAll()['tasks']['regenerating_crond'];
$task_desc = $lng['tasks']['regenerating_crond'];
} // unknown
else {
$task_desc = "ERROR: Unknown task type '" . $row['type'] . "'";
@@ -291,13 +295,13 @@ class Cronjob
}
if (trim($tasks) == '') {
$value .= '<li>' . \Froxlor\I18N\Lang::getAll()['tasks']['noneoutstanding'] . '</li>';
$value .= '<li>' . $lng['tasks']['noneoutstanding'] . '</li>';
} else {
$value .= $tasks;
}
$value .= '</ul>';
$text = \Froxlor\I18N\Lang::getAll()['tasks']['outstanding_tasks'];
$text = $lng['tasks']['outstanding_tasks'];
eval("\$outstanding_tasks = \"" . \Froxlor\UI\Template::getTemplate("index/overview_item") . "\";");
return $outstanding_tasks;
@@ -342,4 +346,4 @@ class Cronjob
die($message);
}
}
}

4
lib/Froxlor/System/Crypt.php
View File

@@ -116,9 +116,11 @@ class Crypt
*/
public static function getAvailablePasswordHashes()
{
global $lng;
// get available pwd-hases
$available_pwdhashes = array(
0 => \Froxlor\I18N\Lang::getAll()['serversettings']['systemdefault']
0 => $lng['serversettings']['systemdefault']
);
if (defined('CRYPT_MD5') && CRYPT_MD5 == 1) {
$available_pwdhashes[1] = 'MD5';