Revert "refactor global array"

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

View File

@@ -35,6 +35,8 @@ class Domain
*/
public static function getRedirectCodes($add_desc = true)
{
global $lng;
$sql = "SELECT * FROM `" . TABLE_PANEL_REDIRECTCODES . "` WHERE `enabled` = '1' ORDER BY `id` ASC";
$result_stmt = Database::query($sql);
@@ -42,7 +44,7 @@ class Domain
while ($rc = $result_stmt->fetch(\PDO::FETCH_ASSOC)) {
$codes[$rc['id']] = $rc['code'];
if ($add_desc) {
$codes[$rc['id']] .= ' (' . \Froxlor\I18N\Lang::getAll()['redirect_desc'][$rc['desc']] . ')';
$codes[$rc['id']] .= ' (' . $lng['redirect_desc'][$rc['desc']] . ')';
}
}
@@ -330,4 +332,4 @@ class Domain
}
return '';
}
}
}

View File

@@ -73,8 +73,9 @@ class IpAddr
public static function getSslIpPortCombinations()
{
global $lng;
return array(
'' => \Froxlor\I18N\Lang::getAll()['panel']['none_value']
'' => $lng['panel']['none_value']
) + self::getIpPortCombinations(true);
}
}
}