Some rewrites, TODOs handled:

[mailer.git] / inc / modules / admin / what-mem_add.php

diff --git a/inc/modules/admin/what-mem_add.php b/inc/modules/admin/what-mem_add.php
index e612e1d1096be876096679ca8a980afa68744826..5004189a9e7b979ae2312366b749fe2b27e0062e 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -11,7 +11,12 @@
  * Kurzbeschreibung  : Fuegen Sie einen weiteren Menuepunkt zum Mit-    *
  *                     Mitgliedsmenue hinzu                             *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $Date::                                                            $ *
+ * $Tag:: 0.2.1-FINAL                                                 $ *
+ * $Author::                                                          $ *
+ * Needs to be in all Files and every File needs "svn propset           *
+ * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -34,27 +39,28 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Add desciption as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Check if the admin has entered title and what-php file name...
-if ((!REQUEST_ISSET_POST(('title'))) && (IS_FORM_SENT())) {
+if ((!REQUEST_ISSET_POST('title')) && (isFormSent())) {
        REQUEST_UNSET_POST('ok');
 } // END - if
 
-if (!IS_FORM_SENT()) {
+if (!isFormSent()) {
        // Create arrays
        $menus = array(); $titles = array(); $below = array();
 
        // Get all available main menus
-       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`",
-               __FILE__, __LINE__);
+       $result = SQL_QUERY("SELECT action, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`",
+       __FILE__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
                // Read menu structure
+               // @TODO Cant this be rewritten?
                while ($content = SQL_FETCHARRAY($result)) {
                        // Menu actions
                        $menus[] = $content['action'];
@@ -64,14 +70,14 @@ if (!IS_FORM_SENT()) {
 
                        // Below this menu point should the new be added so we simply increase the sort value by 1 :-)
                        $below[] = $content['sort'] + 1;
-               }
+               } // END - if
 
                // Free memory
                SQL_FREERESULT($result);
 
                // Remove double eintries
                // @TODO This can be somehow rewritten to a function
-               $prev = ""; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
+               $prev = ''; $dmy = $menus; $dmy2 = $titles; $dmy3 = $below;
                foreach ($menus as $key => $value) {
                        if ($value == $prev) {
                                // Remove entries
@@ -89,7 +95,7 @@ if (!IS_FORM_SENT()) {
                // Load sub menus :)
                foreach ($menus as $key_main => $value_main) {
                        $result = SQL_QUERY_ESC("SELECT what, title, sort FROM `{!_MYSQL_PREFIX!}_member_menu` WHERE `action`='%s' AND `what` != '' ORDER BY `sort`",
-                               array($value_main), __FILE__, __LINE__);
+                       array($value_main), __FILE__, __LINE__);
                        if (SQL_NUMROWS($result) > 0) {
                                // Initialize arrays
                                $menus[$value_main] = array();
@@ -113,7 +119,7 @@ if (!IS_FORM_SENT()) {
 
                                // Remove double eintries
                                // @TODO This can be somehow rewritten to a function
-                               $prev = ""; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
+                               $prev = ''; $dmy = $menus[$value_main]; $dmy2 = $titles[$value_main]; $dmy3 = $below[$value_main];
                                foreach ($menus[$value_main] as $key => $value) {
                                        if ($value == $prev) {
                                                unset($dmy[$key]);
@@ -140,7 +146,7 @@ if (!IS_FORM_SENT()) {
                                $OUT .= "      <option value=\"".$m2."\">".$titles[$key][$key2];
                                foreach ($menus as $k => $v) {
                                        if (($v == $key) && (!is_array($v))) {
-                                               $OUT .= " (".$titles[$k].")";
+                                               $OUT .= " (" . $titles[$k] . ')';
                                        }
                                }
                                $OUT .= "</option>\n";
@@ -152,8 +158,8 @@ if (!IS_FORM_SENT()) {
        $OUT .= "</select>";
 
        define('__BELOW_SELECTION' , $OUT);
-       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION("member", "what", "name"));
-       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION("member", "action", "menu"));
+       define('__WHAT_SELECTION'  , ADMIN_MAKE_MENU_SELECTION('member', "what", "name"));
+       define('__ACTION_SELECTION', ADMIN_MAKE_MENU_SELECTION('member', "action", "menu"));
 
        // Display form
        LOAD_TEMPLATE("admin_member_add");
@@ -161,28 +167,28 @@ if (!IS_FORM_SENT()) {
        // Insert new menu entry
        if (REQUEST_ISSET_POST(('menu'))) {
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`what`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s','%s')",
-                       array(
-                               REQUEST_POST('menu'),
-                               REQUEST_POST('name'),
-                               REQUEST_POST('title'),
-                               REQUEST_POST('visible'),
-                               REQUEST_POST('active'),
-                               bigintval(REQUEST_POST('sort')),
-                       ), __FILE__, __LINE__);
+               array(
+               REQUEST_POST('menu'),
+               REQUEST_POST('name'),
+               REQUEST_POST('title'),
+               REQUEST_POST('visible'),
+               REQUEST_POST('active'),
+               bigintval(REQUEST_POST('sort')),
+               ), __FILE__, __LINE__);
        } else {
                SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_member_menu` (`action`,`title`,`visible`,`locked`,`sort`) VALUES ('%s','%s','%s','%s','%s')",
-                       array(
-                               REQUEST_POST('name'),
-                               REQUEST_POST('title'),
-                               REQUEST_POST('visible'),
-                               REQUEST_POST('active'),
-                               bigintval(REQUEST_POST('sort')),
-                       ), __FILE__, __LINE__);
+               array(
+               REQUEST_POST('name'),
+               REQUEST_POST('title'),
+               REQUEST_POST('visible'),
+               REQUEST_POST('active'),
+               bigintval(REQUEST_POST('sort')),
+               ), __FILE__, __LINE__);
        }
-       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED'));
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
 } else {
        // Demo mode!
-       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_NOT_SAVED'));
+       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_NOT_SAVED'));
 }
 
 //