More fixes for installation and extension registration

[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 e3204cb0d03bf77500a30ddc38263864abded766..3805b7734dce44e817784d0c4548e69d34ce0d31 100644 (file)
--- a/inc/modules/admin/what-overview.php
+++ b/inc/modules/admin/what-overview.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
- * MXChange v0.2.1                                    Start: 09/05/2003 *
- * ===============                              Last change: 07/13/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 09/05/2003 *
+ * ===================                          Last change: 07/13/2004 *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-overview.php                                *
@@ -17,7 +17,7 @@
  * 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 *
@@ -37,15 +37,20 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!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
-// In Opera browsers the menu is being displayed double: ADD_DESCR('admin', __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)
+ // Load include file 'overview-inc' (old standard overview page)
 loadIncludeOnce('inc/modules/admin/overview-inc.php');
 
 $jobsDone = true;
@@ -53,20 +58,20 @@ $taskExt = false; // Default is that 'task' is not installed
 
 // When the admin is logging in check several things first (new jobs to complete and so on)
 if (getAction() == 'login') {
-       if (EXT_IS_ACTIVE('task')) {
+       if ((isExtensionActive('task')) && (function_exists('outputAdvancedOverview'))) {
                // When task extension is registered output advanced overview page
-               $jobsDone = OUTPUT_ADVANCED_OVERVIEW($result_tasks); // This function is provided by the extension 'task'
+               $jobsDone = outputAdvancedOverview($result_tasks); // This function is provided by the extension 'task'
                $taskExt = true;
        } else {
                // Output standart overview (provided by overview-inc.php)
-               $jobsDone = OUTPUT_STANDARD_OVERVIEW($result_tasks);
+               $jobsDone = outputStandardOverview($result_tasks);
        }
 } // 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
-       LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MENU_IS_EMPTY'), getAction()));
+       loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MENU_IS_EMPTY', getAction()));
 } elseif ($jobsDone === true) {
        // Generate overview of all main menus
        if ((is_array($GLOBALS['menu']['description'])) && (count($GLOBALS['menu']['description']) > 0)) {
@@ -79,21 +84,21 @@ if (!ifAdminMenuHasEntries(getAction())) {
                        );
 
                        // 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 (!$taskExt) {
-       if (EXT_IS_ACTIVE('task')) {
+} elseif ($taskExt === false) {
+       if (isExtensionActive('task')) {
                // Output warning message
-               LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('EXTENSION_WARNING_EXT_INACTIVE'), 'task'));
+               loadTemplate('admin_settings_saved', false, getMaskedMessage('EXTENSION_WARNING_EXT_INACTIVE', 'task'));
        }
 
        // List selected tasks on overview when task management is not active
-       OUTPUT_SELECTED_TASKS(REQUEST_POST_ARRAY(), $result_tasks);
+       outputSeletectedTasks(postRequestArray(), $result_tasks);
 }
 
-//
+// [EOF]
 ?>