Use 'sub' to identify whether to update an 'action' menu entry or a 'what' menu entry

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

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 15c2715924b0dd5f2f9004e762f01dc032de24bb..bcc4c3c16334030989c6cc12e64d9e7cb3085ba4 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -296,7 +296,7 @@ ORDER BY
                                                $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
                                        }
                                } else {
-                                       $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
+                                       $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
                                }
 
                                $OUT .= $title;
@@ -308,7 +308,7 @@ ORDER BY
                                                $OUT .= '</a>]';
                                        }
                                } else {
-                                       $OUT .= '</em>';
+                                       $OUT .= '</span>';
                                }
 
                                $OUT .= '</div>
@@ -316,7 +316,9 @@ ORDER BY
 
                                // Check for menu entries
                                $result_what = SQL_QUERY_ESC("SELECT
-       `what`,`title`,`descr`
+       `what`,
+       `title`,
+       `descr`
 FROM
        `{?_MYSQL_PREFIX?}_admin_menu`
 WHERE
@@ -359,7 +361,7 @@ ORDER BY
                                                                        $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
                                                                }
                                                        } else {
-                                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
+                                                               $OUT .= '<span class="bad" style="cursor:help" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
                                                        }
 
                                                        $OUT .= $title_what;
@@ -371,7 +373,7 @@ ORDER BY
                                                                        $OUT .= '</a>]';
                                                                }
                                                        } else {
-                                                               $OUT .= '</em>';
+                                                               $OUT .= '</span>';
                                                        }
                                                        $OUT .= '</div>
 </li>';
@@ -1298,7 +1300,7 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr
        $sqlValues  = array();
 
        // Add columns and values
-       foreach ($columns as $key=>$columnName) {
+       foreach ($columns as $key => $columnName) {
                // Copy entry to final arrays
                $sqlColumns[$key] = $columnName;
                $sqlValues[$key]  = postRequestElement($columnName);
@@ -1312,7 +1314,7 @@ function adminAddEntries ($tableName, $columns = array(), $filterFunctions = arr
        } // END - foreach
 
        // Build the SQL query
-       $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`, `', $sqlColumns) . "`) VALUES ('" . implode("','", $sqlValues) . "')";
+       $SQL = 'INSERT INTO `{?_MYSQL_PREFIX?}_' . $tableName[0] . '` (`' . implode('`,`', $sqlColumns) . "`) VALUES ('" . implode("','", $sqlValues) . "')";
 
        // Run the SQL query
        SQL_QUERY($SQL, __FUNCTION__, __LINE__);
@@ -1372,7 +1374,7 @@ function adminListEntries ($tableTemplate, $rowTemplate, $noEntryMessageId, $tab
        if (count($orderByColumns) > 0) {
                // Add them as well
                $SQL .= ' ORDER BY ';
-               foreach ($orderByColumns as $orderByColumn=>$array) {
+               foreach ($orderByColumns as $orderByColumn => $array) {
                        // Get keys (table/alias) and values (sorting itself)
                        $table   = trim(implode('', array_keys($array)));
                        $sorting = trim(implode('', array_keys($array)));
@@ -1406,7 +1408,7 @@ function doAdminListEntries ($SQL, $tableTemplate, $noEntryMessageId, $rowTempla
                $OUT = '';
                while ($content = SQL_FETCHARRAY($result)) {
                        // "Translate" content
-                       foreach ($callbackColumns as $columnName=>$callbackFunction) {
+                       foreach ($callbackColumns as $columnName => $callbackFunction) {
                                // Fill the callback arguments
                                $args = array($content[$columnName]);
 
@@ -1611,7 +1613,7 @@ function adminCreateUserLink ($userid) {
 // Generate a "link" for the given admin id (admin_id)
 function generateAdminLink ($adminId) {
        // No assigned admin is default
-       $adminLink = '<span class="notice">{--ADMIN_NO_ADMIN_ASSIGNED--}</span>';
+       $adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
 
        // Zero? = Not assigned
        if (bigintval($adminId) > 0) {
@@ -1630,7 +1632,7 @@ function generateAdminLink ($adminId) {
                        }
                } else {
                        // Maybe deleted?
-                       $adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
+                       $adminLink = '<div class="bad">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
                }
        } // END - if
 
@@ -1797,40 +1799,49 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
                switch (postRequestElement('ok')) {
                        case 'edit': // Edit menu
-                               if (postRequestElement('sel_what', $sel) == '') {
+                               // Shall we update a menu or sub menu?
+                               if (!isGetRequestElementSet('sub')) {
                                        // Update with 'what'=null
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`=NULL WHERE ".$AND." AND `id`=%s LIMIT 1",
                                                array(
                                                        $type,
                                                        $menu,
                                                        postRequestElement('sel_action', $sel),
                                                        $sel
-                                               ), __FILE__, __LINE__);
+                                               ), __FUNCTION__, __LINE__);
                                } else {
                                        // Update with selected 'what'
-                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                       SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `title`='%s',`action`='%s',`what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
                                                array(
                                                        $type,
                                                        $menu,
                                                        postRequestElement('sel_action', $sel),
                                                        postRequestElement('sel_what', $sel),
                                                        $sel
-                                               ), __FILE__, __LINE__);
+                                               ), __FUNCTION__, __LINE__);
                                }
                                break;
 
                        case 'delete': // Delete menu
                                SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
-                                       array($type, $sel), __FILE__, __LINE__);
+                                       array(
+                                               $type,
+                                               $sel
+                                       ), __FUNCTION__, __LINE__);
                                break;
 
                        case 'status': // Change status of menus
-                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
-                                       array($type, postRequestElement('visible', $sel), postRequestElement('locked', $sel), $sel), __FILE__, __LINE__);
+                               SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `visible`='%s',`locked`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                       array(
+                                               $type,
+                                               postRequestElement('visible', $sel),
+                                               postRequestElement('locked', $sel),
+                                               $sel
+                                       ), __FUNCTION__, __LINE__);
                                break;
 
                        default: // Unexpected action
-                               logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
+                               logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported action %s detected.", postRequestElement('ok')));
                                displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestElement('ok') . '%}');
                                break;
                } // END - switch
@@ -1855,7 +1866,7 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                        $type,
                                        getRequestElement('act'),
                                        bigintval(getRequestElement('tid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE `action`='%s' AND `sort`=%s LIMIT 1",
@@ -1863,7 +1874,7 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                        $type,
                                        getRequestElement('act'),
                                        bigintval(getRequestElement('fid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
@@ -1872,14 +1883,14 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                array(
                                        $type,
                                        bigintval(getRequestElement('tid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_%s_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`=%s LIMIT 1",
                                array(
                                        $type,
                                        bigintval(getRequestElement('fid'))
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
@@ -1891,13 +1902,13 @@ function doAdminProcessMenuWeightning ($type, $AND) {
                                        $type,
                                        bigintval(getRequestElement('tid')),
                                        bigintval($fid)
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s_menu` SET `sort`=%s WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(
                                        $type,
                                        bigintval(getRequestElement('fid')),
                                        bigintval($tid)
-                               ), __FILE__, __LINE__);
+                               ), __FUNCTION__, __LINE__);
                } // END - if
        } // END - if
 }