New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/modules/admin/what-repair_amnu.php b/inc/modules/admin/what-repair_amnu.php
index 3137d7f2da06929517bf6947b0eaddac367e3418..86c4f765b83517366883ba805fe8eb4ca942410f 100644 (file)
--- a/inc/modules/admin/what-repair_amnu.php
+++ b/inc/modules/admin/what-repair_amnu.php
@@ -47,7 +47,7 @@ ADD_DESCR('admin', __FILE__);
 
 $ACTIONS = array();
 
-// First fix all main menus (what="")...
+// First fix all main menus (what = '')...
 $result_fix = SQL_QUERY("SELECT id, action FROM `{!_MYSQL_PREFIX!}_admin_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)) {
@@ -55,7 +55,7 @@ while ($content = SQL_FETCHARRAY($result_fix)) {
        $ACTIONS[] = $content['action'];
 
        // Fix weight
-       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",
+       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
                array($cnt, $content['id']), __FILE__, __LINE__);
        $REP += SQL_AFFECTEDROWS();
 
@@ -68,12 +68,12 @@ SQL_QUERY("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET `sort`='999' WHERE `action`
 
 // Now sort every each menu
 foreach ($ACTIONS as $act) {
-       $result_fix = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
+       $result_fix = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`",
                array($act), __FILE__, __LINE__);
        $cnt = 1;
        while ($content = SQL_FETCHARRAY($result_fix)) {
                // Fix weight
-               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE id=%s LIMIT 1",
+               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admin_menu` SET sort=%s WHERE `id`=%s LIMIT 1",
                        array($cnt, $content['id']), __FILE__, __LINE__);
                $REP += SQL_AFFECTEDROWS();
 
@@ -83,7 +83,7 @@ foreach ($ACTIONS as $act) {
 }
 
 // @TODO This causes the whole (!) menu cache being rebuilded
-CACHE_PURGE_ADMIN_MENU();
+cachePurgeAdminMenu();
 
 // Repair finished
 if ($REP > 0) {