'what' files should be loaded only once

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

diff --git a/inc/modules/admin/what-config_home.php b/inc/modules/admin/what-config_home.php
index f1bdde572eaeb3480043baf5111f8bd14db33535..aecc2ca5f64f25b1c43c1c89bb295c1b3b5b6eee 100644 (file)
--- a/inc/modules/admin/what-config_home.php
+++ b/inc/modules/admin/what-config_home.php
@@ -6,20 +6,18 @@
  * -------------------------------------------------------------------- *
  * File              : what-config_home.php                             *
  * -------------------------------------------------------------------- *
- * Short description : Set "home" page                                  *
+ * Short description : Set 'home' page                                  *
  * -------------------------------------------------------------------- *
- * Kurzbeschreibung  : "Home"-Seite festlegen                           *
+ * Kurzbeschreibung  : 'home'-Seite festlegen                           *
  * -------------------------------------------------------------------- *
  * $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 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009, 2010 by Mailer Developer Team                    *
- * For more information visit: http://www.mxchange.org                  *
+ * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -40,14 +38,16 @@
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!isAdmin())) {
        die();
-}
+} // END - if
 
 // Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
 
 // Init 'sub' value
 $sub = '';
-if (isGetRequestParameterSet('sub')) $sub = getRequestParameter('sub');
+if (isGetRequestElementSet('sub')) {
+       $sub = getRequestElement('sub');
+} // END - if
 
 switch ($sub) {
        case 'settings': // Settings related to the index page
@@ -56,42 +56,51 @@ switch ($sub) {
                        adminSaveSettingsFromPostData();
 
                        // Display continue link
-                       loadTemplate('admin_settings_saved', false, '<a href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}">{--ADMIN_CONTINUE_TO_CONFIG--}</a>');
+                       displayMessage('<a href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=settings%}">{--ADMIN_CONTINUE_TO_CONFIG--}</a>');
                } else {
                        // Prepare data for the template
                        $content = array_fill(-1, 60, '');
                        $content[getConfig('index_delay')] = ' selected="selected"';
 
                        // Generate selection
-                       $content['cookie_selection'] = createTimeSelections(getConfig('index_cookie'), 'index_cookie', 'YMWD');
+                       $content['cookie_selection'] = createConfigurationTimeSelections('index_cookie', 'YMWD');
 
                        // Output form
-                       loadTemplate('admin_config_home_settings', false, $content);
+                       loadTemplate('admin_config_home', false, $content);
                }
                break;
 
        case 'target': // Set which what-file will be placed in home-page (only modules.php?module=index)
-               if (isGetRequestParameterSet(('home'))) {
+               if (isGetRequestElementSet('home')) {
                        // Set new home
-                       updateConfiguration('index_home', getRequestParameter(('home')));
+                       updateConfiguration('index_home', getRequestElement('home'));
                } // END - if
 
                // Load all what menu points
-               $result = SQL_QUERY("SELECT id, what, title
-FROM `{?_MYSQL_PREFIX?}_guest_menu`
-WHERE `action`='main' AND `what` != '' AND `what` IS NOT NULL AND `locked`='N'
-ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT
+       `id`,
+       `what`,
+       `title`
+FROM
+       `{?_MYSQL_PREFIX?}_guest_menu`
+WHERE
+       `action`='main' AND
+       `what` != '' AND
+       `what` IS NOT NULL AND
+       `locked`='N'
+ORDER BY
+       `sort` ASC", __FILE__, __LINE__);
 
                // Init variables
                $OUT = '';
 
                // Process all entries
                while ($content = SQL_FETCHARRAY($result)) {
-                       // Link for setting 'what' as new "home"
+                       // Link for setting 'what' as new 'home'
                        $newHomeLink = '<a href="{%url=modules.php?module=admin&amp;what=config_home&amp;sub=target&amp;home=' . $content['what'] . '%}">{--_IS_NEW_HOME--}</a>';
 
                        // Is this current home?
-                       if ($content['what'] == getConfig('index_home')) {
+                       if ($content['what'] == getIndexHome()) {
                                // Is current home
                                $newHomeLink      = '<div class="admin_mark">{--_IS_CURRENT_HOME--}</div>';
                                $content['title'] = '<div class="admin_mark">' . $content['title'] . '</div>';
@@ -101,14 +110,14 @@ ORDER BY `sort` ASC", __FILE__, __LINE__);
                        $content['link'] = $newHomeLink;
 
                        // Load row template
-                       $OUT .= loadTemplate('admin_config_home_row', true, $content);
+                       $OUT .= loadTemplate('admin_list_home_row', true, $content);
                } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Load template
-               loadTemplate('admin_config_home', false, $OUT);
+               loadTemplate('admin_list_home', false, $OUT);
                break;
 
        default: // Output selection table