redirection of invalid or deleted mail orders improved, several code conventions...

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

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 385f7375d9e220eae2883a071cf78b17ec2886e1..dd93fcee633ec8db69b8cc955b4fb49adeaa1347 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -334,9 +334,9 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        $menuDesription[$menu] = $descr;
                                }
                                $OUT .= "<TR>
-  <TD class=\"admin_menu\" colspan=\"2\">
-    <NOBR>&nbsp;<STRONG>&middot;</STRONG>&nbsp;";
-                               if (($menu == $act) && (empty($wht)))
+       <TD class=\"admin_menu\" colspan=\"2\">
+               <NOBR>&nbsp;<STRONG>&middot;</STRONG>&nbsp;";
+                                       if (($menu == $act) && (empty($wht)))
                                {
                                        $OUT .= "<STRONG>";
                                }
@@ -345,7 +345,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        $OUT .= "[&nbsp;<A href=\"".URL."/modules.php?module=admin&amp;action=".$menu."\">";
                                }
                                $OUT .= $title;
-                               if (($menu == $act) && (empty($wht)))
+                                       if (($menu == $act) && (empty($wht)))
                                {
                                        $OUT .= "</STRONG>";
                                }
@@ -362,10 +362,10 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        $menuDesription = array();
                                        $menuTitle = array(); $SUB = true;
                                        $OUT .= "<TR>
-  <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
-  <TD class=\"admin_menu\">
-    <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
-                                       while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what))
+       <TD width=\"10\" class=\"seperator\">&nbsp;</TD>
+       <TD class=\"admin_menu\">
+               <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
+                                               while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what))
                                        {
                                                // Filename
                                                $INC = sprintf(PATH."inc/modules/admin/what-%s.php", $wht_sub);
@@ -385,8 +385,8 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                                        $menuTitle[$wht_sub]        = $title_what;
                                                        $menuDesription[$wht_sub] = $desc_what;
                                                        $OUT .= "<TR>
-  <TD class=\"admin_menu\" colspan=\"2\">
-    <NOBR>&nbsp;<STRONG>--&gt;</STRONG>&nbsp;";
+       <TD class=\"admin_menu\" colspan=\"2\">
+               <NOBR>&nbsp;<STRONG>--&gt;</STRONG>&nbsp;";
                                                        if ($readable)
                                                        {
                                                                if ($wht == $wht_sub)
@@ -426,7 +426,7 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
                                        // Free memory
                                        SQL_FREERESULT($result_what);
                                        $OUT .= "    </TABLE>
-  </TD>
+       </TD>
 </TR>\n";
                                }
                                $OUT .= "<TR><TD height=\"7\" colspan=\"2\"></TD></TR>\n";
@@ -473,8 +473,7 @@ function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = fal
        // Remeber options in constant
        define('_MEMBER_SELECTION', $OUT);
 
-       if (!$return)
-       {
+       if (!$return) {
                // Display selection box
                define('__LANG_VALUE', GET_LANGUAGE());
 
@@ -483,8 +482,7 @@ function ADD_MEMBER_SELECTION_BOX($add_all = false, $return = false, $none = fal
        }
 }
 //
-function ADMIN_MENU_SELECTION($MODE, $default="", $defid="")
-{
+function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
        $wht = "what != ''";
        if ($MODE == "action") $wht = "what='' AND action !='login'";
        $result = SQL_QUERY_ESC("SELECT %s, title FROM "._MYSQL_PREFIX."_admin_menu WHERE ".$wht." ORDER BY sort",
@@ -495,7 +493,7 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="")
                $OUT = "<SELECT name=\"".$MODE."_menu";
                if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
                $OUT .= "\" size=\"1\" class=\"admin_select\">
-  <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+       <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
                while (list($menu, $title) = SQL_FETCHROW($result))
                {
                        $OUT .= "  <OPTION value=\"".$menu."\"";