Even more rewrites/fixes from EL branch (please report any broken part after you...

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

diff --git a/inc/modules/admin/what-repair_gmnu.php b/inc/modules/admin/what-repair_gmnu.php
index 1b468759c51364d3e02812dbe361d9b457aab669..63a9f4413ce8cc675bed9770b46e1fb78871be41 100644 (file)
--- a/inc/modules/admin/what-repair_gmnu.php
+++ b/inc/modules/admin/what-repair_gmnu.php
@@ -1,7 +1,7 @@
 <?php
 /************************************************************************
 <?php
 /************************************************************************

- * MXChange v0.2.1                                    Start: 02/25/2004 *
- * ================                             Last change: 02/25/2004 *
+ * Mailer v0.2.1-FINAL                                Start: 02/25/2004 *
+ * ===================                          Last change: 02/25/2004 *

  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-repair_gmenu.php                            *
  *                                                                      *
  * -------------------------------------------------------------------- *
  * File              : what-repair_gmenu.php                            *


@@ -17,7 +17,8 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * 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                           *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team                    *

  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *


@@ -37,41 +38,44 @@
  ************************************************************************/
 
 // Some security stuff...
  ************************************************************************/
 
 // 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();

 }
 
 // Add description as navigation point
 }
 
 // Add description as navigation point

-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);

 
 $ACTIONS = array();
 // First fix all main menus (what = '')...
 
 $ACTIONS = array();
 // First fix all main menus (what = '')...

-$result_fix = SQL_QUERY("SELECT id, action FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);
-$cnt = 0; $REP = 0;
+$result_fix = SQL_QUERY("SELECT id, action FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE (`what`='' OR `what` IS NULL) AND action != 'logout' ORDER BY `sort` ASC", __FILE__, __LINE__);
+$cnt = '0'; $REP = '0';

 while ($content = SQL_FETCHARRAY($result_fix)) {
        // Store act value for later usage in sorting sub menus
        $ACTIONS[] = $content['action'];
 
        // Fix weight
 while ($content = SQL_FETCHARRAY($result_fix)) {
        // Store act value for later usage in sorting sub menus
        $ACTIONS[] = $content['action'];
 
        // Fix weight

-       $result_sort = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort='".$cnt."' WHERE `id`='".$content['id']."' LIMIT 1", __FILE__, __LINE__);
+       $result_sort = SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET `sort`='%s WHERE `id`=%s' LIMIT 1",
+               array($cnt, $content['id']), __FILE__, __LINE__);
+
+       // Get updated rows

        $REP += SQL_AFFECTEDROWS();
 
        // Count one up
        $cnt++;
        $REP += SQL_AFFECTEDROWS();
 
        // Count one up
        $cnt++;

-}
+} // END - while
+

 // Set logout weight to 999
 // Set logout weight to 999

-$result_sort = SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort='999' WHERE `action`='logout' AND (`what`='' OR `what` IS NULL) LIMIT 1", __FILE__, __LINE__);
+$result_sort = SQL_QUERY("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET sort='999' WHERE `action`='logout' AND (`what`='' OR `what` IS NULL) LIMIT 1", __FILE__, __LINE__);

 
 // Now sort every each menu
 
 // Now sort every each menu

-foreach ($ACTIONS as $act) {
-       $result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
-               array($act), __FILE__, __LINE__);
+foreach ($ACTIONS as $action) {
+       $result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_guest_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
+               array($action), __FILE__, __LINE__);

        $cnt = 1;
        while ($content = SQL_FETCHARRAY($result_fix)) {
                // Fix weight
        $cnt = 1;
        while ($content = SQL_FETCHARRAY($result_fix)) {
                // Fix weight

-               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_guest_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
-                       array($cnt, $content['id']), __FILE__, __LINE__);
+               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_guest_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
+               array($cnt, $content['id']), __FILE__, __LINE__);

                $REP += SQL_AFFECTEDROWS();
 
                // Count one up
                $REP += SQL_AFFECTEDROWS();
 
                // Count one up


@@ -81,13 +85,13 @@ foreach ($ACTIONS as $act) {
 
 // Repair finished
 if ($REP > 0) {
 
 // Repair finished
 if ($REP > 0) {

-       $message = sprintf(getMessage('ADMIN_REPAIR_ENTRIES_FIXED'), $REP);
+       $message = getMaskedMessage('ADMIN_REPAIR_ENTRIES_FIXED', $REP);

 } else {
        $message = getMessage('ADMIN_REPAIR_NOTHING_FIXED');
 }
 
 // Output message
 } else {
        $message = getMessage('ADMIN_REPAIR_NOTHING_FIXED');
 }
 
 // Output message

-LOAD_TEMPLATE('admin_settings_saved', false, $message);
+loadTemplate('admin_settings_saved', false, $message);

 
 //
 ?>
 
 //
 ?>