Installation improved, first login:

[mailer.git] / inc / modules / admin / what-overview.php

diff --git a/inc/modules/admin/what-overview.php b/inc/modules/admin/what-overview.php
index 44991b3b282478b053528b2c039ffb7f2cee3380..6f9fee94ba63d28871ac80fb3acae492131332ec 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -10,9 +10,14 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Einfache Task-Liste oder Menuebeschreibungen     *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -32,58 +37,68 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
-       require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+       die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR("admin", basename(__FILE__));
+// In Opera browsers the menu is being displayed double: addMenuDescription('admin', __FILE__);
+
+// Is sql_patches not yet installed?
+if (!isExtensionInstalled('sql_patches')) {
+       // Output warning
+       loadTemplate('admin_settings_saved', false, getMessage('ADMIN_WARNING_SQL_PATCHES_MISSING'));
+} // END - if
 
-// Otherwise load include file 'overview-inc' (old standard overview page)
-require_once(PATH."inc/modules/admin/overview-inc.php");
+ // Load include file 'overview-inc' (old standard overview page)
+loadIncludeOnce('inc/modules/admin/overview-inc.php');
+
+$jobsDone = true;
+$taskExt = false; // Default is that 'task' is not installed
 
-$JOBS_DONE = true;
 // When the admin is logging in check several things first (new jobs to complete and so on)
-if ($GLOBALS['action'] == "login")
-{
-       if ((EXT_IS_ACTIVE("task")) && (function_exists('OUTPUT_ADVANCED_OVERVIEW')))
-       {
+if (getAction() == 'login') {
+       if (isExtensionActive('task')) {
                // When task extension is registered output advanced overview page
-               $JOBS_DONE = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
-       }
-        else
-       {
+               $jobsDone = outputAdvancedOverview($result_tasks); // This function is provided by the extension 'task'
+               $taskExt = true;
+       } else {
                // Output standart overview (provided by overview-inc.php)
-               $JOBS_DONE = OUTPUT_STANDARD_OVERVIEW($result_tasks);
+               $jobsDone = outputStandardOverview($result_tasks);
        }
-}
-// Do we have new jobs or not?
-if ($JOBS_DONE)
-{
+} // END - if
+
+// Are we in 'welcome' page and are there jobs to be done?
+if (!ifAdminMenuHasEntries(getAction())) {
+       // This menu is empty and so no content is displayed
+       loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), getAction()));
+} elseif ($jobsDone === true) {
        // Generate overview of all main menus
-       global $menuDesription, $FATAL;
-       if ((is_array($menuDesription)) && (sizeof($menuDesription) > 0)) {
-               $OUT = "";
-               foreach ($menuDesription as $key=>$value)
-               {
+       if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
+               $OUT = '';
+               foreach ($GLOBALS['menu']['description'] as $key => $value) {
                        // Prepare content
                        $content = array(
-                               'title' => $menuTitle[$key],
+                               'title' => $GLOBALS['menu']['title'][$key],
                                'text'  => $value
                        );
 
                        // Load row template
-                       $OUT .= LOAD_TEMPLATE("admin_menu_hints_row", true, $content);
-               }
+                       $OUT .= loadTemplate('admin_menu_hints_row', true, $content);
+               } // END - foreach
 
                // Load base template
-               LOAD_TEMPLATE("admin_menu_hints", false, $OUT);
+               loadTemplate('admin_menu_hints', false, $OUT);
        }
-} elseif (!EXT_IS_ACTIVE("task")) {
+} elseif ($taskExt === false) {
+       if (isExtensionActive('task')) {
+               // Output warning message
+               loadTemplate('admin_settings_saved', false, sprintf(getMessage('EXTENSION_WARNING_EXT_INACTIVE'), 'task'));
+       }
+
        // List selected tasks on overview when task management is not active
-       OUTPUT_SELECTED_TASKS($_POST, $result_tasks);
+       outputSeletectedTasks(postRequestArray(), $result_tasks);
 }
 
-//
+// [EOF]
 ?>