Fixes for auto-activation of extensions while registration phase

[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 0fb06cffbd0d2fed4307260273a9db7d151e9007..49f8473f0f1b3547916b880ad64ab1fbd44b6015 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -54,11 +54,11 @@ if (isGetRequestParameterSet('sub')) {
 } // END - if
 
 // List all menu points and make them editable
-if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+if ((isFormSent('edit')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Edit menu entries
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
-       $SW = 2; $cnt = '0'; $OUT = '';
+       $cnt = '0'; $OUT = '';
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
@@ -71,17 +71,15 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                        'cnt'    => $cnt,
                                        'sel'    => $sel,
                                        'menu'   => $data['title'],
-                                       'sw'     => $SW,
                                        'act'    => adminAddMenuSelectionBox('member', 'act' , 'sel_act['  . $sel . ']', $data['action']),
                                        'what'   => adminAddMenuSelectionBox('member', 'what', 'sel_what[' . $sel . ']', $data['what']),
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_mmenu_edit_row', true, $data);
+                               $OUT .= loadTemplate('admin_edit_member_menu_row', true, $data);
                        } else {
                                // Entry not found?
                                $data = array(
-                                       'sw'  => $SW,
                                        'sel' => $sel
                                );
 
@@ -89,19 +87,20 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                $OUT .= loadTemplate('admin_menu_404_row', true, $data);
                        }
                        SQL_FREERESULT($result);
-                       $SW = 3 - $SW;
-               }
-       }
+               } // END - if
+       } // END - foreach
+
+       // Add row content and current counter
        $content['rows'] = $OUT;
        $content['cnt'] = $cnt;
 
        // Load template
-       loadTemplate('admin_mmenu_edit', false, $content);
-} elseif ((isPostRequestParameterSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+       loadTemplate('admin_edit_member_menu', false, $content);
+} elseif ((isFormSent('del')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
-       $SW = 2; $cnt = '0'; $OUT = '';
+       $cnt = '0'; $OUT = '';
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
@@ -117,11 +116,10 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                );
 
                                // Load template
-                               $OUT .= loadTemplate('admin_mmenu_delete_row', true, $content);
+                               $OUT .= loadTemplate('admin_del_member_menu_row', true, $content);
                        } else {
                                // Entry not found?
                                $content = array(
-                                       'sw'  => $SW,
                                        'sel' => $sel
                                );
 
@@ -135,12 +133,12 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
        $content['cnt'] = $cnt;
 
        // Load template
-       loadTemplate('admin_mmenu_delete', false, $content);
-} elseif ((isPostRequestParameterSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
+       loadTemplate('admin_del_member_menu', false, $content);
+} elseif ((isPostRequestParameterSet('status')) && (ifPostContainsSelections()) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $SUB;
        $content['chk'] = countPostSelection();
-       $SW = 2; $cnt = '0'; $OUT = '';
+       $cnt = '0'; $OUT = '';
        foreach (postRequestParameter('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
@@ -153,7 +151,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                        'cnt'     => $cnt,
                                        'menu'    => $data['title'],
                                        'sel'     => $sel,
-                                       'sw'      => $SW,
                                        'visible' => addSelectionBox('yn', $data['visible'], 'visible', $sel),
                                        'locked'  => addSelectionBox('yn', $data['locked'] , 'locked' , $sel),
                                );
@@ -163,7 +160,6 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                        } else {
                                // Entry not found?
                                $data = array(
-                                       'sw'  => $SW,
                                        'sel' => $sel
                                );
 
@@ -171,20 +167,22 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                                $OUT .= loadTemplate('admin_menu_404_row', true, $data);
                        }
                        SQL_FREERESULT($result);
-                       $SW = 3 - $SW;
                } // END - if
        } // END - foreach
        $content['rows'] = $OUT;
        $content['cnt'] = $cnt;
 
        // Load template
-       loadTemplate('admin_mmenu_status', false, $content);
+       loadTemplate('admin_member_menu_status', false, $content);
 } elseif ((isFormSent()) && (!isDemoModeActive())) {
        // An act is done...
        foreach (postRequestParameter('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";
+
                $sel = bigintval($sel);
-               if (!empty($SUB)) $AND = "`action`='".$SUB."'";
+
+               if (!empty($SUB)) $AND = "`action`='" . $SUB . "'";
+
                switch (postRequestParameter('ok')) {
                        case 'edit': // Edit menu
                                SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_member_menu` SET `title`='%s', `action`='%s', `what`='%s' WHERE ".$AND." AND `id`=%s LIMIT 1",
@@ -209,7 +207,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
        } // END - foreach
 
        // Load template
-       loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
 } else {
        if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
                // Init
@@ -254,14 +252,14 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
        }
 
        // Get total menu entries
-       $max = SQL_NUMROWS($result);
+       $numMenus = SQL_NUMROWS($result);
 
        // Some are there?
-       if ($max > 0) {
+       if ($numMenus > 0) {
                // Set sub value
                $content['sub'] = $SUB;
 
-               $SW = 2; $cnt = '0'; $OUT = '';
+               $cnt = '0'; $OUT = '';
                while ($data = SQL_FETCHARRAY($result)) {
                        // Init navigation
                        $data['navi'] = '';
@@ -269,7 +267,7 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                        if (($data['sort'] == '0') || (($data['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>';
-                       } elseif ($cnt == $max) {
+                       } elseif ($cnt == $numMenus) {
                                // 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) {
@@ -283,12 +281,10 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                        if (empty($data['title']))  $data['title']  = '&nbsp;';
 
                        // Add more entries
-                       $data['sw']   = $SW;
                        $data['mode'] = 'mem';
 
                        // Load row template and switch color
                        $OUT .= loadTemplate('admin_menu_overview_row', true, $data);
-                       $SW = 3 - $SW;
                } // END - while
 
                // Free memory
@@ -298,10 +294,10 @@ if ((isPostRequestParameterSet('edit')) && (countPostSelection() > 0) && (!isDem
                $content['rows'] = $OUT;
 
                // Load main template
-               loadTemplate('admin_mmenu_overview', false, $content);
+               loadTemplate('admin_member_menu_overview', false, $content);
        } else {
                // Menu entries are missing... (???)
-               loadTemplate('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));
+               loadTemplate('admin_settings_saved', false, '{--ADMIN_NO_MENUS_FOUND--}');
        }
 }