Functions imported, some dev-scripts added

[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 4d11ed13fe65819b2ce304461a28c9b83fd5f624..7ab5e1283ab55aa84f147e8d87058e4efb97c780 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -350,7 +350,7 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
 
                // Is valid but does the inlcude file exists?
                $INC = sprintf("inc/modules/admin/action-%s.php", $act);
-               if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
+               if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
                        // Ok, we finally load the admin action module
                        LOAD_INC($INC);
                } elseif (__ACL_ALLOW == false) {
@@ -412,25 +412,19 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 
        // Build main menu
        $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)
-       {
+       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";
-               while (list($menu, $title, $descr) = SQL_FETCHROW($result_main))
-               {
-                       if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
-                       {
+               while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) {
+                       if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) {
                                $ACL = ADMINS_CHECK_ACL($menu, "");
-                       }
-                        else
-                       {
+                       } else {
                                // ACL is "allow"... hmmm
                                $ACL = true;
                        }
-                       if ($ACL)
-                       {
-                               if (!$SUB)
-                               {
+
+                       if ($ACL === true) {
+                               if (!$SUB) {
                                        // Insert compiled menu title and description
                                        $menuTitle[$menu]      = $title;
                                        $menuDesription[$menu] = $descr;
@@ -476,15 +470,15 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                        // ACL is "allow"... hmmm
                                                        $ACL = true;
                                                }
-                                               $readable = FILE_READABLE($INC);
-                                               if ($ACL) {
+                                               $readable = INCLUDE_READABLE($INC);
+                                               if ($ACL === true) {
                                                        // Insert compiled title and description
                                                        $menuTitle[$wht_sub]      = $title_what;
                                                        $menuDesription[$wht_sub] = $desc_what;
                                                        $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
                <NOBR>&nbsp;<strong>--&gt;</strong>&nbsp;";
-                                                       if ($readable)
+                                                       if ($readable === true)
                                                        {
                                                                if ($wht == $wht_sub)
                                                                {
@@ -500,7 +494,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                                                $OUT .= "<i class=\"admin_note\">";
                                                        }
                                                        $OUT .= $title_what;
-                                                       if ($readable)
+                                                       if ($readable === true)
                                                        {
                                                                if ($wht == $wht_sub)
                                                                {
@@ -537,7 +531,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
 
        // Compile and run the code here. This inserts all constants into the
        // HTML output. Costs me some time to figure this out... *sigh* Quix0r
-       $eval = "\$OUT = \"".COMPILE_CODE(addslashes($OUT))."\";";
+       $eval = "\$OUT = \"".COMPILE_CODE(SQL_ESCAPE($OUT))."\";";
        eval($eval);
 
        // Is there a cache instance again?
@@ -1214,10 +1208,8 @@ function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filter
 
 // Checks proxy settins by fetching check-updates3.php from www.mxchange.org
 function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
-       global $_CONFIG;
-
        // Set temporary the new settings
-       $_CONFIG = merge_array($_CONFIG, $settingsArray);
+       mergeConfig($settingsArray);
 
        // Now get the test URL
        $content = GET_URL("check-updates3.php");