Heavy rewrite:

[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 e629c9365925357b71655e2861b714b236ad939d..bca3aa16b7c86250c881b6a314e5283238e1b75c 100644 (file)
--- a/inc/modules/admin/what-memedit.php
+++ b/inc/modules/admin/what-memedit.php
@@ -40,7 +40,7 @@
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);

-}
+} // END - if

 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);
 
 // Add description as navigation point
 ADD_DESCR('admin', __FILE__);


@@ -51,7 +51,7 @@ $AND = "(`what` = '' OR `what` IS NULL)"; $SUB = '';
 if (REQUEST_ISSET_GET('sub')) {
        $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", REQUEST_GET('sub'));
        $SUB = REQUEST_GET('sub');
 if (REQUEST_ISSET_GET('sub')) {
        $AND = sprintf("`action`='%s' AND `what` IS NOT NULL", REQUEST_GET('sub'));
        $SUB = REQUEST_GET('sub');

-}
+} // END - if

 
 // Get count of (maybe) selected menu points
 $chk = 0;
 
 // Get count of (maybe) selected menu points
 $chk = 0;


@@ -66,30 +66,33 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
        foreach (REQUEST_POST('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
        foreach (REQUEST_POST('sel') as $sel => $confirm) {
                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__);
+                       $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...
                                list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($menu, $act, $wht, $descr) = SQL_FETCHROW($result);

-                               SQL_FREERESULT($result);

                                $content = array(
                                        'cnt'    => $cnt,
                                        'sel'    => $sel,
                                        'menu'   => $menu,
                                        'sw'     => $SW,
                                $content = array(
                                        'cnt'    => $cnt,
                                        'sel'    => $sel,
                                        'menu'   => $menu,
                                        'sw'     => $SW,

-                                       'act'    => ADMIN_MAKE_MENU_SELECTION('member', "act", "sel_act[".$sel."]", $act),
+                                       '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
                                // Load template

-                               $OUT .= LOAD_TEMPLATE("admin_mmenu_edit_row", true, $content);
+                               $OUT .= LOAD_TEMPLATE('admin_mmenu_edit_row', true, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );
                        } else {
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );

-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+
+                               // Load template
+                               $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);

                        }
                        }

+                       SQL_FREERESULT($result);

                        $SW = 3 - $SW;
                }
        }
                        $SW = 3 - $SW;
                }
        }


@@ -97,7 +100,7 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
        define('__CNT_VALUE', $cnt);
 
        // Load template
        define('__CNT_VALUE', $cnt);
 
        // Load template

-       LOAD_TEMPLATE("admin_mmenu_edit");
+       LOAD_TEMPLATE('admin_mmenu_edit');

 } elseif ((REQUEST_ISSET_POST('del')) && ($chk > 0) && (!IS_DEMO())) {
        // Del menu entries with or without confirmation
        define('__SUB_VALUE', $SUB);
 } elseif ((REQUEST_ISSET_POST('del')) && ($chk > 0) && (!IS_DEMO())) {
        // Del menu entries with or without confirmation
        define('__SUB_VALUE', $SUB);


@@ -106,34 +109,38 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
        foreach (REQUEST_POST('sel') as $sel => $confirm) {
                if ($confirm == 1) {
                        $cnt++;
        foreach (REQUEST_POST('sel') as $sel => $confirm) {
                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__);
+                       $result = SQL_QUERY_ESC("SELECT `title` 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...
                                list($title) = SQL_FETCHROW($result);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($title) = SQL_FETCHROW($result);

-                               SQL_FREERESULT($result);

                                $content = array(
                                        'cnt'   => $cnt,
                                        'sel'   => $sel,
                                        'title' => $title
                                );
                                $content = array(
                                        'cnt'   => $cnt,
                                        'sel'   => $sel,
                                        'title' => $title
                                );

-                               $OUT .= LOAD_TEMPLATE("admin_mmenu_delete_row", true, $content);
+
+                               // Load template
+                               $OUT .= LOAD_TEMPLATE('admin_mmenu_delete_row', true, $content);

                        } else {
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );
                        } else {
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );

-                               $OUT .= LOAD_TEMPLATE("admin_menu_404_row", true, $content);
+
+                               // Load template
+                               $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);

                        }
                        }

-               }
-       }
+                       SQL_FREERESULT($result);
+               } // END - if
+       } // END - foreach

        define('__MENU_ROWS', $OUT);
        define('__CNT_VALUE', $cnt);
 
        // Load template
        define('__MENU_ROWS', $OUT);
        define('__CNT_VALUE', $cnt);
 
        // Load template

-       LOAD_TEMPLATE("admin_mmenu_delete");
-} elseif ((REQUEST_ISSET_POST(('status'))) && ($chk > 0) && (!IS_DEMO())) {
+       LOAD_TEMPLATE('admin_mmenu_delete');
+} elseif ((REQUEST_ISSET_POST('status')) && ($chk > 0) && (!IS_DEMO())) {

        // Change status (visible / locked)
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);
        // Change status (visible / locked)
        define('__SUB_VALUE', $SUB);
        define('__CHK_VALUE', $chk);


@@ -142,7 +149,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",
                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);
                        if (SQL_NUMROWS($result) == 1) {
                                // Entry found so we load the stuff...
                                list($menu, $vis, $locked) = SQL_FETCHROW($result);


@@ -158,22 +165,23 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
 
                                // Load template
                                $OUT .= LOAD_TEMPLATE('admin_menu_status_row', true, $content);
 
                                // Load template
                                $OUT .= LOAD_TEMPLATE('admin_menu_status_row', true, $content);

-                       }
-                       else
-                       {
+                       } else {

                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );
                                // Entry not found?
                                $content = array(
                                        'sw'  => $SW,
                                        'sel' => $sel
                                );

+
+                               // Load template

                                $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
                        }
                        $SW = 3 - $SW;
                                $OUT .= LOAD_TEMPLATE('admin_menu_404_row', true, $content);
                        }
                        $SW = 3 - $SW;

-               }
-       }
+               } // END - if
+       } // END - foreach

        define('__MENU_ROWS', $OUT);
        define('__CNT_VALUE', $cnt);
        define('__MENU_ROWS', $OUT);
        define('__CNT_VALUE', $cnt);

-       //
+
+       // Load template

        LOAD_TEMPLATE('admin_mmenu_status');
 } elseif ((isFormSent()) && (!IS_DEMO())) {
        // An act is done...
        LOAD_TEMPLATE('admin_mmenu_status');
 } elseif ((isFormSent()) && (!IS_DEMO())) {
        // An act is done...


@@ -181,72 +189,74 @@ if ((REQUEST_ISSET_POST('edit')) && ($chk > 0) && (!IS_DEMO())) {
                $AND = "(`what` = '' OR `what` IS NULL)";
                $sel = bigintval($sel);
                if (!empty($SUB)) $AND = "`action`='".$SUB."'";
                $AND = "(`what` = '' OR `what` IS NULL)";
                $sel = bigintval($sel);
                if (!empty($SUB)) $AND = "`action`='".$SUB."'";

-               switch (REQUEST_POST('ok'))
-               {
+               switch (REQUEST_POST('ok')) {

                        case 'edit': // Edit menu
                        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__);
+                               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;
 
                        case 'del': // Delete menu
                                break;
 
                        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__);
+                               SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE ".$AND." AND `id`=%s LIMIT 1",
+                                       array($sel), __FILE__, __LINE__);

                                break;
 
                        case 'status': // Change status of menus
                                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",
-                               array(REQUEST_POST('visible', $sel), REQUEST_POST('locked', $sel), $sel), __FILE__, __LINE__);
+                               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;

-               }
+               } // END - switch

                break;
                break;

-       }
+       } // END - foreach

 
        // Load template
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {
 
        // Load template
        LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {

-       if ((REQUEST_ISSET_GET(('act'))) && (REQUEST_ISSET_GET(('tid'))) && (REQUEST_ISSET_GET(('fid')))) {
+       if ((REQUEST_ISSET_GET('act')) && (REQUEST_ISSET_GET('tid')) && (REQUEST_ISSET_GET('fid'))) {

                // Init
                $tid = ''; $fid = '';
 
                // Get IDs
                // Init
                $tid = ''; $fid = '';
 
                // Get IDs

-               if (REQUEST_ISSET_GET(('w'))) {
+               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",
                        // 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",
                        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",
                        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",
                        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",
                        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",
                        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
        }
 
        if (!empty($SUB)) {
                // Edit sub menus
                } // END - -fi
        }
 
        if (!empty($SUB)) {
                // 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
        } 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__);

        }
 
        }
 

+       // Get total menu entries

        $max = SQL_NUMROWS($result);
        $max = SQL_NUMROWS($result);

+
+       // Some are there?

        if ($max > 0) {
                // Set sub value
                // @TODO Rewrite this constant
        if ($max > 0) {
                // Set sub value
                // @TODO Rewrite this constant