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

cant stop migrating to new Settings class, refs #1325

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-12-15 15:21:30 +01:00
parent 7f565c305c
commit 352749c798
11 changed files with 43 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/navigation/00.froxlor.main.php
View File

@@ -37,7 +37,7 @@ return array (
array (
'url' => 'customer_index.php?page=change_theme',
'label' => $lng['menue']['main']['changetheme'],
'show_element' => (getSetting('panel', 'allow_theme_change_customer') == true)
'show_element' => (Settings::Get('panel.allow_theme_change_customer') == true)
),
array (
'url' => 'customer_index.php?action=logout',
@@ -60,11 +60,11 @@ return array (
'required_resources' => 'emails'
),
array (
'url' => getSetting('panel', 'webmail_url'),
'url' => Setting::Get('panel.webmail_url'),
'new_window' => true,
'label' => $lng['menue']['email']['webmail'],
'required_resources' => 'emails_used',
'show_element' => ( getSetting('panel', 'webmail_url') != '' ),
'show_element' => ( Settings::Get('panel.webmail_url') != '' ),
),
),
),
@@ -78,11 +78,11 @@ return array (
'required_resources' => 'mysqls',
),
array (
'url' => getSetting('panel', 'phpmyadmin_url'),
'url' => Settings::Get('panel.phpmyadmin_url'),
'new_window' => true,
'label' => $lng['menue']['mysql']['phpmyadmin'],
'required_resources' => 'mysqls_used',
'show_element' => ( getSetting('panel', 'phpmyadmin_url') != '' ),
'show_element' => ( Settings::Get('panel.phpmyadmin_url') != '' ),
),
),
),
@@ -105,10 +105,10 @@ return array (
'label' => $lng['menue']['ftp']['accounts'],
),
array (
'url' => getSetting('panel', 'webftp_url'),
'url' => Settings::Get('panel.webftp_url'),
'new_window' => true,
'label' => $lng['menue']['ftp']['webftp'],
'show_element' => ( getSetting('panel', 'webftp_url') != '' ),
'show_element' => ( Settings::Get('panel.webftp_url') != '' ),
),
),
),
@@ -156,7 +156,7 @@ return array (
array (
'url' => 'admin_index.php?page=change_theme',
'label' => $lng['menue']['main']['changetheme'],
'show_element' => (getSetting('panel', 'allow_theme_change_admin') == true)
'show_element' => (Setting::Get('panel.allow_theme_change_admin') == true)
),
array (
'url' => 'admin_index.php?action=logout',
@@ -238,9 +238,9 @@ return array (
array (
'url' => 'admin_phpsettings.php?page=overview',
'label' => $lng['menue']['phpsettings']['maintitle'],
'show_element' => (
getSetting('system', 'mod_fcgid') == true ||
getSetting('phpfpm', 'enabled') == true
'show_element' => (
Settings::Get('system.mod_fcgid') == true ||
Settings::Get('phpfpm.enabled') == true
),
),
),
@@ -256,7 +256,7 @@ return array (
'url' => 'admin_logger.php?page=log',
'label' => $lng['menue']['logger']['logger'],
'required_resources' => 'change_serversettings',
'show_element' => ( getSetting('logger', 'enabled') == true ),
'show_element' => ( Settings::Get('logger.enabled') == true ),
),
array (
'url' => 'admin_message.php?page=message',

6
lib/navigation/10.tickets.php
View File

@@ -22,7 +22,7 @@ return array (
'tickets' => array (
'url' => 'customer_tickets.php',
'label' => $lng['menue']['ticket']['ticket'],
'show_element' => ( getSetting('ticket', 'enabled') == true ),
'show_element' => ( Settings::Get('ticket.enabled') == true ),
'elements' => array (
array (
'url' => 'customer_tickets.php?page=tickets',
@@ -34,7 +34,7 @@ return array (
'admin' => array (
'tickets' => array (
'label' => $lng['admin']['ticketsystem'],
'show_element' => ( getSetting('ticket', 'enabled') == true ),
'show_element' => ( Settings::Get('ticket.enabled') == true ),
'elements' => array (
array (
'url' => 'admin_tickets.php?page=tickets',
@@ -52,4 +52,4 @@ return array (
),
),
);
?>
?>