Security line in all includes changed

[mailer.git] / inc / mysql-manager.php

diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index ad02fe75d7d97711cf2329abe7055c5f7c97187a..c32622cf8ea823275aa1addee9cdfb5b1a98ab61 100644 (file)
--- a/inc/mysql-manager.php
+++ b/inc/mysql-manager.php
@@ -32,7 +32,7 @@
  ************************************************************************/
 
 // Some security stuff...
-if (ereg(basename(__FILE__), $_SERVER['PHP_SELF'])) {
+if (!defined('__SECURITY')) {
        $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
        require($INC);
 }
@@ -44,7 +44,8 @@ function ADD_MODULE_TITLE($mod) {
 
        // Is the script installed?
        if (isBooleanConstantAndTrue('mxchange_installed')) {
-               if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (is_array($cacheArray['modules']['module'])) && (isset($cacheArray['modules']['module'][$mod]))) {
+               // Check if cache is valid
+               if ((GET_EXT_VERSION("cache") >= "0.1.2") && (isset($cacheArray['modules']['module'])) && (in_array($mod, $cacheArray['modules']['module']))) {
                        // Load from cache
                        $name = $cacheArray['modules']['title'][$mod];
 
@@ -56,7 +57,7 @@ function ADD_MODULE_TITLE($mod) {
                        list($name) = SQL_FETCHROW($result);
                        SQL_FREERESULT($result);
                }
-       }
+       } // END - if
 
        // Trim name
        $name = trim($name);
@@ -68,8 +69,10 @@ function ADD_MODULE_TITLE($mod) {
                if (SQL_NUMROWS($result) == 0) {
                        // Add module to database
                        $dummy = CHECK_MODULE($mod);
-               }
-       }
+               } // END - if
+       } // END - if
+
+       // Return name
        return $name;
 }
 
@@ -277,7 +280,7 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
                        // Can we close the you-are-here navigation?
                        //* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*<br />\n";
                        //* DEBUG: */ die("<pre>".print_r($_CONFIG, true)."</pre>");
-                       if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || (($GLOBALS['what'] == $_CONFIG['index_home']) && ($ACC_LVL == "guest"))))) {
+                       if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
                                //* DEBUG: */ echo __LINE__."+".$type."+<br />\n";
                                $OUT .= "</DIV><br />\n";
                                $DEPTH="0";
@@ -342,7 +345,7 @@ function ADD_MENU($MODE, $act, $wht) {
                        // Load menu header template
                        LOAD_TEMPLATE($MODE."_menu_title", false, $content);
 
-                       $result_sub = SQL_QUERY_ESC("SELECT title, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND what != '' ".$AND." ORDER BY sort",
+                       $result_sub = SQL_QUERY_ESC("SELECT title, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND what != '' AND what IS NOT NULL".$AND." ORDER BY sort",
                         array($MODE, $main_action), __FILE__, __LINE__);
                        $ctl = SQL_NUMROWS($result_sub);
                        if ($ctl > 0) {
@@ -454,9 +457,12 @@ function IS_ADMIN($admin="")
                        // Admin login was found so let's load password from DB
                        list($passDB) = SQL_FETCHROW($result);
 
+                       // Temporary cache it
+                       $cacheArray['admins']['password'][$admin] = $passDB;
+
                        // Generate password hash
                        $valPass = generatePassString($passDB);
-               }
+               } // END - if
 
                // Free memory
                SQL_FREERESULT($result);
@@ -893,7 +899,7 @@ function COUNT_MODULE($mod)
 function GET_ACTION ($MODE, &$wht)
 {
        global $ret, $_CONFIG;
-       // DEPRECATED: Init status
+       // @DEPRECATED Init status
        $ret = "";
 
        //* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=<br />";
@@ -1768,7 +1774,7 @@ function CREATE_NEW_EXTENSION_TASK ($admin_id, $subject, $ext) {
                        $msg = LOAD_TEMPLATE("ext_".$ext, true);
                } else {
                        // Load default message
-                       $msg = LOAD_EMAIL_TEMPLATE("admin_new_ext","", 0);
+                       $msg = LOAD_TEMPLATE("admin_new_ext", "", 0);
                }
 
                // Task not created so it's a brand-new extension which we need to register and create a task for!