Some more rewrites and fix for countPostSelection()

[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 4bdeedc178eaf1299d408d18d07641d747a5d0d9..72ae2f4ddb34f516818b207b66f7537117165672 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -52,15 +52,11 @@ if (isGetRequestElementSet('sub')) {
        $SUB = getRequestElement('sub');
 } // END - if
 
-// Get count of (maybe) selected menu points
-$chk = '0';
-if (isPostRequestElementSet('sel')) $chk = countPostSelection();
-
 // List all menu points and make them editable
-if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
+if ((isPostRequestElementSet('edit')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Edit menu entries
        $content['sub'] = $SUB;
-       $content['chk'] = $chk;
+       $content['chk'] = countPostSelection();
        $SW = 2; $cnt = '0'; $OUT = '';
        foreach (postRequestElement('sel') as $sel => $confirm) {
                if ($confirm == 1) {
@@ -100,10 +96,10 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
 
        // Load template
        loadTemplate('admin_mmenu_edit', false, $content);
-} elseif ((isPostRequestElementSet('del')) && ($chk > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;
-       $content['chk'] = $chk;
+       $content['chk'] = countPostSelection();
        $SW = 2; $cnt = '0'; $OUT = '';
        foreach (postRequestElement('sel') as $sel => $confirm) {
                if ($confirm == 1) {
@@ -139,10 +135,10 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
 
        // Load template
        loadTemplate('admin_mmenu_delete', false, $content);
-} elseif ((isPostRequestElementSet('status')) && ($chk > 0) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('status')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Change status (visible / locked)
        $content['sub'] = $SUB;
-       $content['chk'] = $chk;
+       $content['chk'] = countPostSelection();
        $SW = 2; $cnt = '0'; $OUT = '';
        foreach (postRequestElement('sel') as $sel => $confirm) {
                if ($confirm == 1) {