X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmysql-manager.php;h=79fcc639933dfe75f3a4648fd43923d552ff89a3;hb=23f39916099dad094d2d2b0fe54d335bddc986db;hp=19750af9c41acb72a38086ba10f01a8176f5017f;hpb=dbe2ba98497898c45b840e651a43a39969e1bab0;p=mailer.git
diff --git a/inc/mysql-manager.php b/inc/mysql-manager.php
index 19750af9c4..79fcc63993 100644
--- 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;
}
@@ -171,10 +174,7 @@ function CHECK_MODULE($mod) {
} // END - if
// Destroy cache here
- if (GET_EXT_VERSION("cache") >= "0.1.2") {
- if ($cacheInstance->cache_file("mod_reg", true)) $cacheInstance->cache_destroy();
- unset($cacheArray['modules']);
- } // END - if
+ REBUILD_CACHE("mod_reg", "modreg");
// And reload data
$ret = CHECK_MODULE($mod_chk);
@@ -254,30 +254,49 @@ function ADD_DESCR($ACC_LVL, $file, $return = false, $output = true) {
$prefix .= " -> ";
- if (ereg(".php", $search)) {
- $search = substr($search, 0, strpos($search, ".php"));
- }
+ // We need to remove .php and the end
+ if (substr($search, -4, 4) == ".php") {
+ // Remove the .php
+ $search = substr($search, 0, -4);
+ } // END - i
+ // Get the title from menu
$result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_%s_menu WHERE %s='%s' ".$AND." LIMIT 1",
array($ACC_LVL, $type, $search), __FILE__, __LINE__);
+ // Menu found?
if (SQL_NUMROWS($result) == 1) {
+ // Load title
list($ret) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
+
+ // Shall we return it?
if ($return) {
// Return title
return $ret;
} elseif (((GET_EXT_VERSION("sql_patches") >= "0.2.3") && ($_CONFIG['youre_here'] == "Y")) || ((IS_ADMIN()) && ($MOD_CHECK == "admin"))) {
// Output HTML code
$OUT = $prefix."".$ret."\n";
+
+ // Can we close the you-are-here navigation?
//* DEBUG: */ echo __LINE__."*".$type."/".$GLOBALS['what']."*
\n";
- if (($type == "what") || (($type == "action") && (!isset($_GET['what'])) && ($GLOBALS['what'] != "welcome"))) {
+ //* DEBUG: */ die("
".print_r($_CONFIG, true)."
");
+ if (($type == "what") || (($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview")))) {
//* DEBUG: */ echo __LINE__."+".$type."+
\n";
$OUT .= "
\n";
$DEPTH="0";
- }
+
+ // Handle failed logins here if not in guest
+ //* DEBUG: */ echo __FUNCTION__.":type={$type},action={$GLOBALS['action']},what={$GLOBALS['what']},lvl={$ACC_LVL}
\n";
+ if ((($type == "what") || ($type == "action") && ((!isset($GLOBALS['what'])) || ($GLOBALS['what'] == "overview") || ($GLOBALS['what'] == $_CONFIG['index_home']))) && ($ACC_LVL != "guest") && ((GET_EXT_VERSION("sql_patches") >= "0.4.7") || (GET_EXT_VERSION("admins") >= "0.7.0"))) {
+ // Handle failture
+ $OUT .= HANDLE_LOGIN_FAILTURES($ACC_LVL);
+ } // END - if
+ } // END - if
}
- }
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
// Return or output HTML code?
if ($output) {
@@ -314,11 +333,19 @@ function ADD_MENU($MODE, $act, $wht) {
// There are menus available, so we simply display them... :)
while (list($main_title, $main_action) = SQL_FETCHROW($result_main)) {
//* DEBUG: */ echo __LINE__."/".$main_cnt."/".$main_action."/".$sub_what.":".$GLOBALS['what']."*
\n";
- // Load menu header template
+ // Init variables
$BLOCK_MODE = false; $act = $main_action;
- LOAD_TEMPLATE($MODE."_menu_title", false, $main_title);
- $result_sub = SQL_QUERY_ESC("SELECT title, what FROM "._MYSQL_PREFIX."_%s_menu WHERE action='%s' AND what != '' ".$AND." ORDER BY sort",
+ // Prepare content
+ $content = array(
+ 'action' => $main_action,
+ 'title' => $main_title
+ );
+
+ // 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 what IS NOT NULL ".$AND." ORDER BY sort",
array($MODE, $main_action), __FILE__, __LINE__);
$ctl = SQL_NUMROWS($result_sub);
if ($ctl > 0) {
@@ -355,6 +382,13 @@ function ADD_MENU($MODE, $act, $wht) {
$content .= "";
}
$wht = $sub_what; $cnt++;
+ // Prepare array
+ $content = array(
+ 'menu' => $content,
+ 'what' => $sub_what
+ );
+
+ // Add regular menu row or bottom row?
if ($cnt < $ctl) {
LOAD_TEMPLATE($MODE."_menu_row", false, $content);
} else {
@@ -406,12 +440,18 @@ function IS_ADMIN($admin="")
//* DEBUG: */ echo __LINE__."ADMIN:".$admin."/".$passCookie."
";
// Search in array for entry
- if ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
+ if (isset($cacheArray['admin_hash'])) {
+ // Use cached string
+ $valPass = $cacheArray['admin_hash'];
+ } elseif ((!empty($passCookie)) && (isset($cacheArray['admins']['password'][$admin])) && (!empty($admin))) {
// Count cache hits
$_CONFIG['cache_hits']++;
// Login data is valid or not?
$valPass = generatePassString($cacheArray['admins']['password'][$admin]);
+
+ // Cache it away
+ $cacheArray['admin_hash'] = $valPass;
} elseif (!empty($admin)) {
// Search for admin
$result = SQL_QUERY_ESC("SELECT HIGH_PRIORITY password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
@@ -423,9 +463,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);
@@ -438,7 +481,7 @@ function IS_ADMIN($admin="")
}
// Return result of comparision
- //* DEBUG: */ if (!$ret) echo __LINE__."OK!
";
+ //* DEBUG: */ if (!$ret) echo __LINE__."OK!
";
return $ret;
}
//
@@ -565,13 +608,13 @@ function IS_MEMBER()
if ((!empty($mod)) && (empty($LAST['module']))) { $LAST['module'] = $mod; $LAST['online'] = $onl; }
// So did we now have valid data and an unlocked user?
- //* DEBUG: */ echo $valPass."
".get_session('u_hash')."
";
+ //* DEBUG: */ echo $valPass."
".get_session('u_hash')."
";
if (($status == "CONFIRMED") && ($valPass == get_session('u_hash'))) {
// Account is confirmed and all cookie data is valid so he is definely logged in! :-)
$ret = true;
} else {
// Maybe got locked etc.
- //* DEBUG: */ echo __LINE__."!!!
";
+ //* DEBUG: */ echo __LINE__."!!!
";
destroy_user_session();
// Remove array elements to prevent errors
@@ -579,7 +622,7 @@ function IS_MEMBER()
}
} else {
// Cookie data is invalid!
- //* DEBUG: */ echo __LINE__."***
";
+ //* DEBUG: */ echo __LINE__."***
";
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
@@ -587,21 +630,21 @@ function IS_MEMBER()
// Free memory
SQL_FREERESULT($result);
- }
- else
- {
+ } else {
// Cookie data is invalid!
- //* DEBUG: */ echo __LINE__."///
";
+ //* DEBUG: */ echo __LINE__."///
";
destroy_user_session();
// Remove array elements to prevent errors
unset($GLOBALS['userid']);
}
+
+ // Return status
return $ret;
}
//
function UPDATE_LOGIN_DATA ($UPDATE=true) {
- global $LAST;
+ global $LAST, $_CONFIG;
if (!is_array($LAST)) $LAST = array();
// Are the required cookies set?
@@ -633,10 +676,14 @@ function UPDATE_LOGIN_DATA ($UPDATE=true) {
// This will be displayed on welcome page! :-)
if (empty($LAST['module'])) {
$LAST['module'] = $mod; $LAST['online'] = $onl;
- }
+ } // END - if
+
+ // "what" not set?
if (empty($GLOBALS['what'])) {
+ // Fix it to default
$GLOBALS['what'] = "welcome";
- }
+ if (!empty($_CONFIG['index_home'])) $GLOBALS['what'] = $_CONFIG['index_home'];
+ } // END - if
// Update last module / online time
$result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_user_data SET last_module='%s', last_online=UNIX_TIMESTAMP() WHERE userid=%s LIMIT 1",
@@ -697,16 +744,29 @@ function VALIDATE_MENU_ACTION ($MODE, $act, $wht, $UPDATE=false)
return $ret;
}
//
-function GET_MOD_DESCR($MODE, $wht)
+function GET_MOD_DESCR($MODE, $wht, $column="what")
{
- if (empty($wht)) $wht = "welcome";
+ // Fix empty "what"
+ if (empty($wht)) {
+ $wht = "welcome";
+ if (!empty($_CONFIG['index_home'])) $wht = $_CONFIG['index_home'];
+ } // END - if
+
+ // Default is not found
$ret = "??? (".$wht.")";
- $result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_%s_menu WHERE what='%s' LIMIT 1", array($MODE, $wht), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 1)
- {
+
+ // Look for title
+ $result = SQL_QUERY_ESC("SELECT title FROM "._MYSQL_PREFIX."_%s_menu WHERE %s='%s' LIMIT 1",
+ array($MODE, $column, $wht), __FILE__, __LINE__);
+
+ // Is there an entry?
+ if (SQL_NUMROWS($result) == 1) {
+ // Fetch the title
list($ret) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- }
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
return $ret;
}
//
@@ -844,34 +904,29 @@ function COUNT_MODULE($mod)
// Get action value from mode (admin/guest/member) and what-value
function GET_ACTION ($MODE, &$wht)
{
- global $ret; $ret = "";
- //* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=
";
- if ((empty($wht)) && ($MODE != "admin"))
- {
+ global $ret, $_CONFIG;
+ // @DEPRECATED Init status
+ $ret = "";
+
+ //* DEBUG: */ echo __LINE__."=".$MODE."/".$wht."/".$GLOBALS['action']."=
";
+ if ((empty($wht)) && ($MODE != "admin")) {
$wht = "welcome";
- }
- if ($MODE == "admin")
- {
+ if (!empty($_CONFIG['index_home'])) $wht = $_CONFIG['index_home'];
+ } // END - if
+
+ if ($MODE == "admin") {
// Action value for admin area
- if (!empty($GLOBALS['action']))
- {
+ if (!empty($GLOBALS['action'])) {
// Get it directly from URL
return $GLOBALS['action'];
- }
- elseif (($wht == "overview") || (empty($GLOBALS['what'])))
- {
+ } elseif (($wht == "overview") || (empty($GLOBALS['what']))) {
// Default value for admin area
$ret = "login";
}
- }
- elseif (!empty($GLOBALS['action']))
- {
- // Fix welcome value
- if (empty($wht)) $wht = "welcome";
+ } elseif (!empty($GLOBALS['action'])) {
+ // Get it directly from URL
return $GLOBALS['action'];
- }
- else
- {
+ } else {
// Everything else will be touched after checking the module has a menu assigned
}
//* DEBUG: */ echo __LINE__."*".$ret."*
\n";
@@ -892,8 +947,7 @@ function GET_ACTION ($MODE, &$wht)
// Load from database
$result = SQL_QUERY_ESC("SELECT action FROM "._MYSQL_PREFIX."_%s_menu WHERE what='%s' LIMIT 1",
array($MODE, $wht), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 1)
- {
+ if (SQL_NUMROWS($result) == 1) {
// Load action value and pray that this one is the right you want... ;-)
list($ret) = SQL_FETCHROW($result);
}
@@ -1570,6 +1624,8 @@ function LOAD_CONFIG($no="0") {
}
// Gets the matching what name from module
function GET_WHAT($MOD_CHECK) {
+ global $_CONFIG;
+
$wht = "";
//* DEBUG: */ echo __LINE__."!".$MOD_CHECK."!
\n";
switch ($MOD_CHECK)
@@ -1581,6 +1637,7 @@ function GET_WHAT($MOD_CHECK) {
case "login":
case "index":
$wht = "welcome";
+ if (($MOD_CHECK == "index") && (!empty($_CONFIG['index_home']))) $wht = $_CONFIG['index_home'];
break;
default:
@@ -1687,14 +1744,8 @@ function UPDATE_CONFIG ($entries, $values, $updateMode="") {
$affectedRows = SQL_AFFECTEDROWS();
//* DEBUG: */ echo __FUNCTION__.":entries={$entries},affectedRows={$affectedRows}
\n";
- // Destroy cache?
- if ((GET_EXT_VERSION("cache") >= "0.1.2") && ($affectedRows == 1)) {
- global $cacheInstance, $_CONFIG, $CSS;
- if ($cacheInstance->cache_file("config", true)) $cacheInstance->cache_destroy();
-
- // Rebuid the cache
- require(PATH."inc/load_cache-config.php");
- } // END - if
+ // Rebuild cache
+ REBUILD_CACHE("config", "config");
}
// Creates a new task for updated extension
function CREATE_EXTENSION_UPDATE_TASK ($admin_id, $subject, $notes) {
@@ -1729,7 +1780,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!
@@ -1746,5 +1797,6 @@ VALUES (%s, 0, 'NEW', 'EXTENSION', '%s', '%s', UNIX_TIMESTAMP())",
// Free memory
SQL_FREERESULT($result);
}
+
//
?>