Possible fix for #125, applied fixes from profi-concept's branch

[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 dcf88df56d36cc25421b7e3ad187e2d83dd78943..e629c9365925357b71655e2861b714b236ad939d 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -67,7 +67,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                if ($confirm == 1) {
                        $cnt++;
                        $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__);
+                       array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
@@ -78,7 +78,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                                        'menu'   => $menu,
                                        'sw'     => $SW,
                                        'act'    => ADMIN_MAKE_MENU_SELECTION('member', "act", "sel_act[".$sel."]", $act),
-                                       'what'   => ADMIN_MAKE_MENU_SELECTION('member', "what", "sel_what[".$sel."]", $wht),
+                                       'what'   => ADMIN_MAKE_MENU_SELECTION('member', 'what', 'sel_what[' . $sel . ']', $wht),
                                );
                                // Load template
                                $OUT .= LOAD_TEMPLATE("admin_mmenu_edit_row", true, $content);
@@ -107,7 +107,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                if ($confirm == 1) {
                        $cnt++;
                        $result = SQL_QUERY_ESC("SELECT title FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval($sel)), __FILE__, __LINE__);
+                       array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($title) = SQL_FETCHROW($result);
@@ -142,7 +142,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                if ($confirm == 1) {
                        $cnt++;
                        $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__);
+                       array(bigintval($sel)), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($menu, $vis, $locked) = SQL_FETCHROW($result);
@@ -152,21 +152,21 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                                        'menu'    => $menu,
                                        'sel'     => $sel,
                                        'sw'      => $SW,
-                                       'visible' => ADD_SELECTION('yn', $vis   , "visible", $sel),
-                                       'locked'  => ADD_SELECTION('yn', $locked, "locked" , $sel),
+                                       'visible' => ADD_SELECTION('yn', $vis   , 'visible', $sel),
+                                       'locked'  => ADD_SELECTION('yn', $locked, 'locked' , $sel),
                                );
 
                                // Load template
-                               $OUT .= LOAD_TEMPLATE("admin_menu_status_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_menu_status_row', true, $content);
                        }
-                        else
+                       else
                        {
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );
-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
                        }
                        $SW = 3 - $SW;
                }
@@ -174,8 +174,8 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
        define('__MENU_ROWS', $OUT);
        define('__CNT_VALUE', $cnt);
        //
-       LOAD_TEMPLATE("admin_mmenu_status");
-} elseif ((IS_FORM_SENT()) && (!IS_DEMO())) {
+       LOAD_TEMPLATE('admin_mmenu_status');
+} elseif ((isFormSent()) && (!IS_DEMO())) {
        // An act is done...
        foreach (REQUEST_POST('sel') as $sel => $menu) {
                $AND = "(`what` = '' OR `what` IS NULL)";
@@ -183,20 +183,20 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                if (!empty($SUB)) $AND = "`action`='".$SUB."'";
                switch (REQUEST_POST('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",
+                       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",
                                array($menu, REQUEST_POST('sel_act', $sel), REQUEST_POST('sel_what', $sel), $sel), __FILE__, __LINE__);
-                       break;
+                               break;
 
-               case 'del': // Delete menu
-                       SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
+                       case 'del': // Delete menu
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND id=%s LIMIT 1",
                                array($sel), __FILE__, __LINE__);
-                       break;
+                               break;
 
-               case 'status': // Change status of menus
-                       SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
+                       case 'status': // Change status of menus
+                               SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `visible`='%s', `locked`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
                                array(REQUEST_POST('visible', $sel), REQUEST_POST('locked', $sel), $sel), __FILE__, __LINE__);
-                       break;
+                               break;
                }
                break;
        }
@@ -212,29 +212,29 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                if (REQUEST_ISSET_GET(('w'))) {
                        // Sub menus selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                               array(bigintval(REQUEST_GET('act')), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('act')), bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `sort`='%s' LIMIT 1",
-                               array(bigintval(REQUEST_GET('act')), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('act')), bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                } else {
                        // Main menu selected
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                               array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('tid'))), __FILE__, __LINE__);
                        list($tid) = SQL_FETCHROW($result);
                        $result = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) AND `sort`='%s' LIMIT 1",
-                               array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('fid'))), __FILE__, __LINE__);
                        list($fid) = SQL_FETCHROW($result);
                }
 
                if ((!empty($tid)) && (!empty($fid))) {
                        // Sort menu
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('tid')), bigintval($fid)), __FILE__, __LINE__);
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_member_menu` SET `sort`='%s' WHERE ".$AND." AND id=%s LIMIT 1",
-                               array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
+                       array(bigintval(REQUEST_GET('fid')), bigintval($tid)), __FILE__, __LINE__);
                } // END - -fi
        }
 
@@ -269,16 +269,16 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                        }
 
                        // Fix empty values for Firefox
-                       if (empty($content['action'])) $content['action'] = " ";
-                       if (empty($content['what']))   $content['what']   = " ";
-                       if (empty($content['title']))  $content['title']  = " ";
+                       if (empty($content['action'])) $content['action'] = ' ';
+                       if (empty($content['what']))   $content['what']   = ' ';
+                       if (empty($content['title']))  $content['title']  = ' ';
 
                        // Add more entries
                        $content['sw']   = $SW;
-                       $content['mode'] = "mem";
+                       $content['mode'] = 'mem';
 
                        // Load row template and switch color
-                       $OUT .= LOAD_TEMPLATE("admin_menu_overview_row", true, $content);
+                       $OUT .= LOAD_TEMPLATE('admin_menu_overview_row', true, $content);
                        $SW = 3 - $SW;
                }
 
@@ -289,7 +289,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                define('__MENU_ROWS', $OUT);
 
                // Load main template
-               LOAD_TEMPLATE("admin_mmenu_overview");
+               LOAD_TEMPLATE('admin_mmenu_overview');
        } else {
                // Menu entries are missing... (???)
                LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_NO_MENUS_FOUND'));