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

- adding overview for admin_cronjobs (planned for 1.0);

Browse Source 
- added 'isactive' for cronjobs so the admin can deactivate them (planned for 1.0);
- re-adding 'panel_diskspace' and 'panel_diskspace_admins' to install/froxlor.sql;
- show only 'logout' and 'froxlor update' in menulist when files have been updated and db is not up to date;
- bugixing success.tpl (closing <a>-tag);
This commit is contained in:
Michael Kaufmann (d00p)
2010-01-27 09:19:19 +00:00
parent 883963d2e2
commit f0379e26cc
13 changed files with 211 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/init.php
View File

@@ -322,8 +322,48 @@ if(isset($userinfo['loginname'])
if(AREA == 'admin' || AREA == 'customer')
{
$navigation_data = loadConfigArrayDir('./lib/navigation/');
$navigation = buildNavigation($navigation_data[AREA], $userinfo);
if(hasUpdates($version))
{
/*
* if froxlor-files have been updated
* but not yet configured by the admin
* we only show logout and the update-page
*/
$navigation_data = array (
'admin' => array (
'index' => array (
'url' => 'admin_index.php',
'label' => $lng['admin']['overview'],
'elements' => array (
array (
'label' => $lng['menue']['main']['username'],
),
array (
'url' => 'admin_index.php?action=logout',
'label' => $lng['login']['logout'],
),
),
),
'server' => array (
'label' => $lng['admin']['server'],
'required_resources' => 'change_serversettings',
'elements' => array (
array (
'url' => 'admin_updates.php?page=overview',
'label' => $lng['update']['update'],
'required_resources' => 'change_serversettings',
),
),
),
),
);
$navigation = buildNavigation($navigation_data['admin'], $userinfo);
}
else
{
$navigation_data = loadConfigArrayDir('./lib/navigation/');
$navigation = buildNavigation($navigation_data[AREA], $userinfo);
}
unset($navigation_data);
}