Fixes in changing URLs in surfbar extension. Resolves #40/#41

[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 34338993123827143000009b2b31d20ed231ee78..e95bbe7e9e455496cf41e6c68af06da05276f488 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -414,8 +414,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
        $result_main = SQL_QUERY("SELECT action, title, descr FROM `"._MYSQL_PREFIX."_admin_menu` WHERE (what='' OR what IS NULL) ORDER BY sort, id DESC", __FILE__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0)
        {
-               $OUT = "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
-<TR><TD colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</TD></TR>\n";
+               $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
+<tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
                while (list($menu, $title, $descr) = SQL_FETCHROW($result_main))
                {
                        if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
@@ -435,8 +435,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                        $menuTitle[$menu]      = $title;
                                        $menuDesription[$menu] = $descr;
                                }
-                               $OUT .= "<TR>
-       <TD class=\"admin_menu\" colspan=\"2\">
+                               $OUT .= "<tr>
+       <td class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<strong>&middot;</strong>&nbsp;";
                                if (($menu == $act) && (empty($wht)))
                                {
@@ -455,18 +455,18 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                {
                                        $OUT .= "</a>]";
                                }
-                               $OUT .= "</NOBR></TD>
-</TR>\n";
+                               $OUT .= "</NOBR></td>
+</tr>\n";
                                $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `"._MYSQL_PREFIX."_admin_menu` WHERE action='%s' AND what != '' AND what IS NOT NULL ORDER BY sort, id DESC",
                                 array($menu), __FILE__, __LINE__);
                                if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
                                {
                                        $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";
+                                       $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)) {
                                                // Filename
                                                $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $wht_sub);
@@ -481,8 +481,8 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                        // Insert compiled title and description
                                                        $menuTitle[$wht_sub]      = $title_what;
                                                        $menuDesription[$wht_sub] = $desc_what;
-                                                       $OUT .= "<TR>
-       <TD class=\"admin_menu\" colspan=\"2\">
+                                                       $OUT .= "<tr>
+       <td class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<strong>--&gt;</strong>&nbsp;";
                                                        if ($readable)
                                                        {
@@ -515,24 +515,24 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                        {
                                                                $OUT .= "</em>";
                                                        }
-                                                       $OUT .= "</NOBR></TD>
-</TR>\n";
+                                                       $OUT .= "</NOBR></td>
+</tr>\n";
                                                }
                                        }
 
                                        // Free memory
                                        SQL_FREERESULT($result_what);
-                                       $OUT .= "    </TABLE>
-       </TD>
-</TR>\n";
+                                       $OUT .= "    </table>
+       </td>
+</tr>\n";
                                }
-                               $OUT .= "<TR><TD height=\"7\" colspan=\"2\"></TD></TR>\n";
+                               $OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
                        }
                }
 
                // Free memory
                SQL_FREERESULT($result_main);
-               $OUT .= "</TABLE>\n";
+               $OUT .= "</table>\n";
        }
 
        // Compile and run the code here. This inserts all constants into the