projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
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 fa49f1f28ed716ba453ec47a0ea3dd0e11f7c1fe..7ab5e1283ab55aa84f147e8d87058e4efb97c780 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -344,13 +344,13 @@ function ADMIN_DO_ACTION($wht) {
 
        // Check if action/what pair is valid
        $result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu`
-WHERE action='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))
+WHERE `action`='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))
 LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
        if (SQL_NUMROWS($result_action) == 1) {
 
                // 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) {
@@ -359,13 +359,13 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
                        addFatalMessage(getMessage('ADMIN_ACCESS_DENIED'));
                } else {
                        // Include file not found! :-(
-                       LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_404_ACTION'));
-                       addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
+                       LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act));
+                       addFatalMessage(getMessage('ADMIN_ACTION_404'), $act);
                }
        } else {
                // Invalid action/what pair found!
-               LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_INVALID_ACTION'));
-               addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
+               LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht));
+               addFatalMessage(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht);
        }
 
        // Free memory
@@ -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;
@@ -457,7 +451,7 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
                                }
                                $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",
+                               $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))
                                {
@@ -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?
@@ -632,7 +626,7 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") {
 
 // Save settings to the database
 function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma=array(), $alwaysAdd=false) {
-       global $_CONFIG, $cacheArray, $cacheInstance;
+       global $cacheArray, $cacheInstance;
 
        // Prepare all arrays, variables
        $DATA = array();
@@ -667,7 +661,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con
                                }
 
                                // Update current configuration
-                               $_CONFIG[$id] = $val;
+                               setConfigEntry($id, $val);
                        } // END - if
                } // END - if
        } // END - foreach
@@ -778,7 +772,7 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
 
        //* DEBUG: */ echo "a:".$title."<br />";
        // Return link
-       return "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"{!ADMIN_USER_PROFILE_TITLE!}\">".$title."</a>";
+       return "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$wht."&amp;u_id=".$uid."\" title=\"{--ADMIN_USER_PROFILE_TITLE--}\">".$title."</a>";
 }
 
 // Check "logical-area-mode"
@@ -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");
Mailer-Project repository