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-memedit.php
diff --git a/inc/modules/admin/what-memedit.php b/inc/modules/admin/what-memedit.php
index ff882da23e1d39230575fe1a50535f5393949dae..34dc56c0c8d50d6c62195880eac16ffe0ba91f38 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -60,29 +60,29 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $count++;
-                       $result = SQL_QUERY_ESC("SELECT `title`, `action`, `what` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `title`,`action`,`what` FROM `{?_MYSQL_PREFIX?}_member_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);
-                               $data = array(
-                                       'cnt'    => $count,
+                               $content = SQL_FETCHARRAY($result);
+                               $content = array(
+                                       'count'  => $count,
                                        'sel'    => $sel,
-                                       'menu'   => $data['title'],
-                                       'action' => adminAddMenuSelectionBox('member', 'action', 'sel_action[' . $sel . ']', $data['action']),
-                                       'what'   => adminAddMenuSelectionBox('member', 'what'  , 'sel_what[' . $sel . ']', $data['what']),
+                                       'menu'   => $content['title'],
+                                       'action' => adminAddMenuSelectionBox('member', 'action', 'sel_action[' . $sel . ']', $content['action']),
+                                       'what'   => adminAddMenuSelectionBox('member', 'what'  , 'sel_what[' . $sel . ']', $content['what']),
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_edit_member_menu_row', true, $data);
+                               $OUT .= loadTemplate('admin_edit_member_menu_row', true, $content);
                        } else {
                                // Entry not found?
-                               $data = array(
+                               $content = array(
                                        'sel' => $sel
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_menu_404_row', true, $data);
+                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
                        }
                        SQL_FREERESULT($result);
                } // END - if
@@ -90,7 +90,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
 
        // Add row content and current counter
        $content['rows'] = $OUT;
-       $content['cnt'] = $count;
+       $content['count'] = $count;
 
        // Load template
        loadTemplate('admin_edit_member_menu', false, $content);
@@ -108,7 +108,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                                // Entry found so we load the stuff...
                                list($title) = SQL_FETCHROW($result);
                                $content = array(
-                                       'cnt'   => $count,
+                                       'count' => $count,
                                        'sel'   => $sel,
                                        'title' => $title
                                );
@@ -128,7 +128,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                } // END - if
        } // END - foreach
        $content['rows'] = $OUT;
-       $content['cnt'] = $count;
+       $content['count'] = $count;
 
        // Load template
        loadTemplate('admin_delete_member_menu', false, $content);
@@ -140,35 +140,35 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $count++;
-                       $result = SQL_QUERY_ESC("SELECT `title`, `visible`, `locked` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                       $result = SQL_QUERY_ESC("SELECT `title`,`visible`,`locked` FROM `{?_MYSQL_PREFIX?}_member_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);
-                               $data = array(
-                                       'cnt'     => $count,
-                                       'menu'    => $data['title'],
+                               $content = SQL_FETCHARRAY($result);
+                               $content = array(
+                                       'count'   => $count,
+                                       'menu'    => $content['title'],
                                        'sel'     => $sel,
-                                       'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
-                                       'locked'  => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
+                                       'visible' => addSelectionBox('yn', $content['visible'], 'visible', $sel),
+                                       'locked'  => addSelectionBox('yn', $content['locked'] , 'locked' , $sel),
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_menu_status_row', true, $data);
+                               $OUT .= loadTemplate('admin_menu_status_row', true, $content);
                        } else {
                                // Entry not found?
-                               $data = array(
+                               $content = array(
                                        'sel' => $sel
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_menu_404_row', true, $data);
+                               $OUT .= loadTemplate('admin_menu_404_row', true, $content);
                        }
                        SQL_FREERESULT($result);
                } // END - if
        } // END - foreach
        $content['rows'] = $OUT;
-       $content['cnt'] = $count;
+       $content['count'] = $count;
 
        // Load template
        loadTemplate('admin_member_menu_status', false, $content);
@@ -177,14 +177,14 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
        adminProcessMenuEditForm('member', $subMenu);
 } else {
        // Handle weightning
-       doAdminProcessMenuWeightning('guest');
+       doAdminProcessMenuWeightning('member', $AND);
 
        if (!empty($subMenu)) {
                // Edit sub menus
-               $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE ".$AND." AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort` ASC", __FILE__, __LINE__);
        } else {
                // Edit main menus
-               $result = SQL_QUERY("SELECT `id`, `action`, `what`, `title`, `sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result = SQL_QUERY("SELECT `id`,`action`,`what`,`title`,`sort` FROM `{?_MYSQL_PREFIX?}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort` ASC", __FILE__, __LINE__);
        }
 
        // Some are there?
@@ -193,31 +193,26 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                $content['sub'] = $subMenu;
 
                $count = '0'; $OUT = '';
-               while ($data = SQL_FETCHARRAY($result)) {
+               while ($content = SQL_FETCHARRAY($result)) {
                        // Init navigation
-                       $data['navi'] = '';
+                       $content['navi'] = '';
                        $count++;
-                       if (($data['sort'] == '0') || (($data['sort'] == 1) && (!empty($subMenu)))) {
+                       if (($content['sort'] == '0') || (($content['sort'] == 1) && (!empty($subMenu)))) {
                                // 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=memedit&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=memedit&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=memedit&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=memedit&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=memedit&amp;sub=' . $content['sub'] . '&amp;act=' . $content['action'] . '&amp;w=' . $content['what'] . '&amp;tid=' . ($content['sort']+1) . '&amp;fid=' . $content['sort'] . '%}">{--LOWER--}</a>';
                        }
 
-                       // Fix empty values for Firefox
-                       if (empty($data['action'])) $data['action'] = '&nbsp;';
-                       if (empty($data['what']))   $data['what']   = '&nbsp;';
-                       if (empty($data['title']))  $data['title']  = '&nbsp;';
-
                        // Add more entries
-                       $data['mode'] = 'mem';
+                       $content['mode'] = 'mem';
 
                        // Load row template and switch color
-                       $OUT .= loadTemplate('admin_menu_overview_row', true, $data);
+                       $OUT .= loadTemplate('admin_menu_overview_row', true, $content);
                } // END - while
 
                // Free memory
@@ -230,7 +225,7 @@ if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive()
                loadTemplate('admin_member_menu_overview', false, $content);
        } else {
                // Menu entries are missing... (???)
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
+               displayMessage('{--ADMIN_NO_MENUS_FOUND--}');
        }
 }
 
Mailer-Project repository