Naming convention further applied, TODOs.txt updated

[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 102e4ca1bb1211063e055e1aa58ba63225c61b91..682dcdbd20981bca3a5f4a718ccad88818e264b0 100644 (file)
--- a/inc/modules/admin/what-mem_add.php
+++ b/inc/modules/admin/what-mem_add.php
@@ -60,7 +60,7 @@ if (!isFormSent()) {
        // 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` ASC",
                __FILE__, __LINE__);
-       if (SQL_NUMROWS($result) > 0) {
+       if (!SQL_HASZERONUMS($result)) {
                // Read menu structure
                // @TODO Cant this be rewritten?
                while ($content = SQL_FETCHARRAY($result)) {
@@ -101,7 +101,7 @@ if (!isFormSent()) {
                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__);
-                       if (SQL_NUMROWS($result) > 0) {
+                       if (!SQL_HASZERONUMS($result)) {
                                // Initialize arrays
                                $menus[$value_main] = array();
                                $titles[$value_main] = array();
@@ -143,24 +143,24 @@ if (!isFormSent()) {
                } // END - foreach
        } // END - if
 
-       $OUT = "<select class=\"admin_select\" name=\"sort\" size=\"1\">
-      <option value=\"\">{--IS_FIRST_MENU--}</option>\n";
+       $OUT = '<select class="admin_select" name="sort" size="1">
+      <option value="">{--IS_FIRST_MENU--}</option>';
        foreach ($below as $key => $m) {
                if (is_array($m)) {
                        foreach ($m as $key2 => $m2) {
-                               $OUT .= "      <option value=\"" . $m2 . "\">" . $titles[$key][$key2];
+                               $OUT .= '<option value="' . $m2 . '">' . $titles[$key][$key2];
                                foreach ($menus as $k => $v) {
                                        if (($v == $key) && (!is_array($v))) {
-                                               $OUT .= " (" . $titles[$k] . ')';
+                                               $OUT .= ' (' . $titles[$k] . ')';
                                        } // END - if
                                } // END - foreach
-                               $OUT .= "</option>\n";
+                               $OUT .= '</option>';
                        } // END - foreach
                } else {
-                       $OUT .= "      <option value=\"" . $m . "\">" . $titles[$key] . "</option>\n";
+                       $OUT .= '<option value="' . $m . '">' . $titles[$key] . '</option>';
                }
        }
-       $OUT .= "</select>";
+       $OUT .= '</select>';
 
        // Prepare selection boxes for template
        $content['below_selection']  = $OUT;
@@ -168,7 +168,7 @@ if (!isFormSent()) {
        $content['action_selection'] = adminAddMenuSelectionBox('member', 'action', 'menu');
 
        // Display form
-       loadTemplate('admin_member_add', false, $content);
+       loadTemplate('admin_add_member_menu', false, $content);
 } elseif (!isDemoModeActive()) {
        // Insert new menu entry
        if (isPostRequestParameterSet('menu')) {