Some more rewrites and fix for countPostSelection()

diff --git a/inc/modules/admin/what-adminedit.php b/inc/modules/admin/what-adminedit.php
index cf97dffe96d73f7041fb640dd5287ef580748fdf..ff42b89782d79cc27e01897d93bf36005557e859 100644 (file)
--- a/inc/modules/admin/what-adminedit.php
+++ b/inc/modules/admin/what-adminedit.php
@@ -51,16 +51,12 @@ 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
        // @TODO Kill all constants in this file
        $content['sub'] = $SUB;
-       $content['chk'] = $chk;
+       $content['chk'] = countPostSelection();
        $cnt = '0'; $SW = 2;
        foreach (postRequestElement('sel') as $sel => $confirm) {
                if ($confirm == 1) {
@@ -106,10 +102,10 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
 
        // Load template
        loadTemplate('admin_amenu_edit_form', false, $content);
-} elseif ((isPostRequestElementSet('del')) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Prepare misc content
        $content['sub'] = $SUB;
-       $content['chk'] = $chk;
+       $content['chk'] = countPostSelection();
 
        // Del menu entries with or without confirmation
        $SW = 2; $cnt = '0'; $OUT = '';

diff --git a/inc/modules/admin/what-del_holiday.php b/inc/modules/admin/what-del_holiday.php
index a61324a4f528d0dfc6f6262dfe7dd81e7fb78a74..ab80774af057e67f541758f86c2ebfd0a40a01ab 100644 (file)
--- a/inc/modules/admin/what-del_holiday.php
+++ b/inc/modules/admin/what-del_holiday.php
@@ -44,12 +44,8 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addMenuDescription('admin', __FILE__);
 
-// Check for selected holidays
-$SUM = '0';
-if (isPostRequestElementSet('sel')) $SUM = countPostSelection();
-
 // Shall I delete selected holidays???
-if ($SUM > 0) {
+if (countPostSelection() > 0) {
        // Delete multiple holiday requests (for list_holiday)
        $cnt = '0';
        foreach (postRequestElement('sel') as $id => $sel) {

diff --git a/inc/modules/admin/what-guestedit.php b/inc/modules/admin/what-guestedit.php
index 566696a9d7637fbe96310d8d137159e8ec716198..b31c8c5288e7c159dc8195f0c3bfd022da7f952e 100644 (file)
--- a/inc/modules/admin/what-guestedit.php
+++ b/inc/modules/admin/what-guestedit.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();
 
        $cnt = '0'; $OUT = ''; $SW = 2;
        foreach (postRequestElement('sel') as $sel => $confirm) {
@@ -104,10 +100,10 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
 
        // Load template
        loadTemplate('admin_gmenu_edit_form', false, $content);
-} elseif ((isPostRequestElementSet('del')) && (!isDemoModeActive())) {
+} elseif ((isPostRequestElementSet('del')) && (countPostSelection() > 0) && (!isDemoModeActive())) {
        // Del menu entries with or without confirmation
        $content['sub'] = $SUB;
-       $content['chk'] = $chk;
+       $content['chk'] = countPostSelection();
 
        $cnt = '0';
        $OUT = '';
@@ -186,10 +182,10 @@ if ((isPostRequestElementSet('edit')) && ($chk > 0) && (!isDemoModeActive())) {
                        loadTemplate('admin_menu_unknown_okay', false, postRequestElement('ok'));
                        break;
        } // END - switch
-} 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();
 
        // Load template
        $SW = 2; $cnt = '0'; $OUT = '';

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) {

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index bc7e7714636bc0c6131ca21d9e8e5bc244fe8fe5..cd1eddf236e914c1e55ca1d592837e7b78aa9081 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -428,8 +428,15 @@ function removeFile ($FQFN) {
 }
 
 // Wrapper for $_POST['sel']
-function countPostSelection () {
-       return countSelection(postRequestElement('sel'));
+function countPostSelection ($element = 'sel') {
+       // Is it set?
+       if (isPostRequestElementSet($element)) {
+               // Return counted elements
+               return countSelection(postRequestElement($element));
+       } else {
+               // Return zero if not found
+               return 0;
+       }
 }
 
 // Checks wether the config-local.php is loaded