projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
A lot has been rewritten, ext-teams added, ext-forced continued:
[mailer.git] / inc / modules / admin / what-adminedit.php
diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index e2db9fd343a4ca0f2344325707fee75cb913e66d..32d08b012bf61baebccd427feaaa48cd50158ff9 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -60,32 +60,32 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $count++;
-                       $result = SQL_QUERY_ESC("SELECT `title`, `action`, `what`, `descr` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `title`,`action`,`what`,`descr` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
                                array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
-                               $data = SQL_FETCHARRAY($result);
+                               $content = SQL_FETCHARRAY($result);
 
                                // Prepare data for the row template
-                               $data = array(
-                                       'action' => adminAddMenuSelectionBox('admin', 'action', 'sel_action[' . $sel . ']', $data['action']),
-                                       'what'   => adminAddMenuSelectionBox('admin', 'what'  , 'sel_what['   . $sel . ']', $data['what']),
+                               $content = array(
+                                       'action' => adminAddMenuSelectionBox('admin', 'action', 'sel_action[' . $sel . ']', $content['action']),
+                                       'what'   => adminAddMenuSelectionBox('admin', 'what'  , 'sel_what['   . $sel . ']', $content['what']),
                                        'sel'    => $sel,
-                                       'menu'   => $data['title'],
-                                       'descr'  => $data['descr'],
-                                       'cnt'    => $count,
+                                       'menu'   => $content['title'],
+                                       'descr'  => $content['descr'],
+                                       'count'  => $count,
                                );
 
                                // Load row template
-                               $OUT .= loadTemplate('admin_edit_admin_menu_row', true, $data);
+                               $OUT .= loadTemplate('admin_edit_admin_menu_row', true, $content);
                        } else {
                                // Entry not found?
-                               $data = array(
+                               $content = array(
                                        'sel' => $sel
                                );
 
                                // Load row template
-                               $OUT .= loadTemplate('admin_menu_404_row', true, $data);
+                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
                        }
 
                        // Free result and switch color
@@ -94,7 +94,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        } // END - foreach
 
        $content['rows'] = $OUT;
-       $content['cnt'] = $count;
+       $content['count'] = $count;
 
        // Load template
        loadTemplate('admin_edit_admin_menu_form', false, $content);
@@ -112,27 +112,27 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
-                               $data = SQL_FETCHARRAY($result);
+                               $content = SQL_FETCHARRAY($result);
 
                                // Prepare data for the row template
-                               $data = array(
-                                       'menu' => $data['title'],
-                                       'cnt'  => $count,
-                                       'sel'  => $sel,
+                               $content = array(
+                                       'menu'  => $content['title'],
+                                       'count' => $count,
+                                       'sel'   => $sel,
                                );
-                               $OUT .= loadTemplate('admin_delete_admin_menu_row', true, $data);
+                               $OUT .= loadTemplate('admin_delete_admin_menu_row', true, $content);
                        } else {
                                // Entry not found?
-                               $data = array(
+                               $content = array(
                                        'sel' => $sel
                                );
-                               $OUT .= loadTemplate('admin_menu_404_row', true, $data);
+                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
                        }
                        SQL_FREERESULT($result);
                } // END - if
        } // END - switch
        $content['rows'] = $OUT;
-       $content['cnt'] = $count;
+       $content['count'] = $count;
 
        // Load template
        loadTemplate('admin_delete_admin_menu', false, $content);
@@ -181,15 +181,15 @@ LIMIT 1",
 
                default: // Unexpected action
                        logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                       displayMessage(getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+                       displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
                        break;
-       }
+       } // END - switch
 } else {
        // Handle weightning
-       doAdminProcessMenuWeightning('guest');
+       doAdminProcessMenuWeightning('admin', $AND);
 
        // Run SQL
-       $result = SQL_QUERY("SELECT id, action, what, title, sort FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$AND." ORDER BY `sort` ASC", __FILE__, __LINE__);
 
        // Do we have entries?
        if (!SQL_HASZERONUMS($result)) {
@@ -197,31 +197,32 @@ LIMIT 1",
                $content['sub'] = $SUB;
 
                // Init variables
-               $OUT = ''; $count = '0';
+               $OUT = '';
+               $count = '0';
 
                // Process all entries
-               while ($data = SQL_FETCHARRAY($result)) {
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Count this entry
                        $count++;
 
                        // Init navigation variable
-                       $data['navi'] = '';
-                       if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($SUB)))) {
+                       $content['navi'] = '';
+                       if (($content['sort'] == '0') || (($content['sort'] == 1) && (!empty($SUB)))) {
                                // Is highest position
-                               $data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
+                               $content['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']+1) . '&amp;fid=' . $content['sort'] . '%}">{--LOWER--}</a>';
                        } elseif ($count == SQL_NUMROWS($result)) {
                                // Is lowest position
-                               $data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>';
-                       } elseif ($data['sort'] > 0) {
+                               $content['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']-1) . '&amp;fid=' . $content['sort'] . '%}">{--HIGHER--}</a>';
+                       } elseif ($content['sort'] > 0) {
                                // Anything else between highest and lowest
-                               $data['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']-1) . '&amp;fid=' . $data['sort'] . '%}">{--HIGHER--}</a>/<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $data['action'] . '&amp;w=' . $data['what'] . '&amp;tid=' . ($data['sort']+1) . '&amp;fid=' . $data['sort'] . '%}">{--LOWER--}</a>';
+                               $content['navi'] = '<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']-1) . '&amp;fid=' . $content['sort'] . '%}">{--HIGHER--}</a>|<a href="{%url=modules.php?module=admin&amp;what=adminedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']+1) . '&amp;fid=' . $content['sort'] . '%}">{--LOWER--}</a>';
                        }
 
-                       // Add more data to $data
-                       $data['mode'] = 'admin';
+                       // Add more data to $content
+                       $content['mode'] = 'admin';
 
                        // Load row template and switch colors
-                       $OUT .= loadTemplate('admin_menu_overview_row', true, $data);
+                       $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
                } // END - switch
 
                // Remember all rows
Mailer-Project repository