From e1dc0d3c99217504de2ac8467156274786efc0bd Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Thu, 9 Oct 2014 16:01:11 +0200 Subject: Big load of changes - Added callback functionality for taskmanager tasks. You can launch a task and define a callback function to be run when the task finished. This requires activating the cronjob - Added cron functionality: Add cronjob that calls the cron api every 5 minutes to use it. (See cron.inc.php) - Added eventlog - Added missing translations - Merged main-menu-login and main-menu-logout --- index.php | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) (limited to 'index.php') diff --git a/index.php b/index.php index 919c4620..2f507e2c 100644 --- a/index.php +++ b/index.php @@ -114,21 +114,13 @@ if (AJAX) { Page::preprocess(); // Generate Main menu -//$menu = new Menu;// TODO: Merge both templates again - having 99% copy&paste sucks... -if (User::getName() === false) { - Render::addTemplate('main-menu-login', array( - 'url' => urlencode($_SERVER['REQUEST_URI']), - 'langs' => Dictionary::getLanguages(true), - 'dbupdate' => Database::needSchemaUpdate() - )); -} else { - Render::addTemplate('main-menu-logout', array( - 'url' => urlencode($_SERVER['REQUEST_URI']), - 'langs' => Dictionary::getLanguages(true), - 'dbupdate' => Database::needSchemaUpdate(), - 'user' => User::getName() - )); -} +Render::addTemplate('main-menu', array( + 'url' => urlencode($_SERVER['REQUEST_URI']), + 'langs' => Dictionary::getLanguages(true), + 'dbupdate' => Database::needSchemaUpdate(), + 'user' => User::getName(), + 'warning' => User::getName() && User::getLastSeenEvent() < Property::getLastWarningId() +)); Message::renderList(); -- cgit v1.2.3-55-g7522