X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=f9f775a00363cd6860966e8573424bc9a216efdf;hb=08b54260db1cd082627a280df740441c7f929c24;hp=0ac017533a5459133065f1e95ba120951d6487e9;hpb=d0ab0382dd73638f0bc13a1a3d6f117ec11a203e;p=mailer.git
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 0ac017533a..f9f775a003 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -64,14 +64,14 @@ function REGISTER_ADMIN ($user, $md5)
// Only be executed on login procedure!
function CHECK_ADMIN_LOGIN ($admin_login, $password)
{
- global $ADMINS, $CONFIG, $CACHE;
+ global $cacheArray, $_CONFIG, $cacheInstance;
$ret = "404"; $pass = "";
- if (!empty($ADMINS['aid'][$admin_login]))
+ if (!empty($cacheArray['admins']['aid'][$admin_login]))
{
// Get password from cache
- $pass = $ADMINS['password'][$admin_login];
+ $pass = $cacheArray['admins']['password'][$admin_login];
$ret = "pass";
- $CONFIG['cache_hits']++;
+ $_CONFIG['cache_hits']++;
}
else
{
@@ -86,7 +86,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
}
}
- //* DEBUG: */ echo "*".$pass."/".$password."/".$ret."
";
+ //* DEBUG: */ echo "*".$pass."/".$password."/".$ret."
";
if ((strlen($pass) == 32) && ($pass == md5($password)))
{
// Generate new hash
@@ -111,9 +111,9 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
array($pass, $admin_login), __FILE__, __LINE__);
// Shall I remove the cache file?
- if ((EXT_IS_ACTIVE("cache")) && ($CACHE != false))
+ if ((EXT_IS_ACTIVE("cache")) && ($cacheInstance != false))
{
- if ($CACHE->cache_file("admins", true)) $CACHE->cache_destroy();
+ if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
}
// Password matches!
@@ -127,64 +127,60 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password)
return $ret;
}
// Only be executed on cookie checking
-function CHECK_ADMIN_COOKIES ($admin_login, $password)
-{
- global $ADMINS, $CONFIG;
+function CHECK_ADMIN_COOKIES ($admin_login, $password) {
+ global $cacheArray, $_CONFIG;
$ret = "404"; $pass = "";
- if (!empty($ADMINS['aid'][$admin_login]))
- {
+ if (!empty($cacheArray['admins']['aid'][$admin_login])) {
// Get password from cache
- $pass = $ADMINS['password'][$admin_login];
+ $pass = $cacheArray['admins']['password'][$admin_login];
$ret = "pass";
- $CONFIG['cache_hits']++;
- }
- else
- {
+ $_CONFIG['cache_hits']++;
+ } else {
// Get password from DB
$result = SQL_QUERY_ESC("SELECT password FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
array($admin_login), __FILE__, __LINE__);
- if (SQL_NUMROWS($result) == 1)
- {
+ if (SQL_NUMROWS($result) == 1) {
$ret = "pass";
list($pass) = SQL_FETCHROW($result);
SQL_FREERESULT($result);
}
}
- //* DEBUG: */ echo "*".$pass."/".$password."
";
+ //* DEBUG: */ echo "*".$pass."/".$password."
";
// Check if password matches
- if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password)))
- {
+ if (($ret == "pass") && ((generatePassString($pass) == $password) || ($pass == $password))) {
// Passwords matches!
$ret = "done";
}
+
+ // Return result
return $ret;
}
//
-function admin_WriteData ($FILE, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0)
+function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0)
{
- $DONE = false; $SEEK++; $found = false;
- if (file_exists($FILE))
+ $done = false; $seek++; $found = false;
+ if (file_exists($file))
{
- $SEARCH = "CFG: ".$COMMENT;
- $TMP = $FILE.".tmp";
- $fp = fopen($FILE, 'r') or OUTPUT_HTML ("READ: ".$FILE."
");
+ $search = "CFG: ".$comment;
+ $tmp = $file.".tmp";
+ $fp = fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
");
if ($fp)
{
- $fp_tmp = fopen($TMP, 'w') or OUTPUT_HTML ("WRITE: ".$TMP."
");
+ $fp_tmp = fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
");
if ($fp_tmp)
{
while (! feof($fp))
{
$line = fgets ($fp, 1024);
- if (strpos($line, $SEARCH) > -1) { $next = 0; $found = true; }
+ if (strpos($line, $search) > -1) { $next = 0; $found = true; }
if ($next > -1)
{
- if ($next == $SEEK)
+ if ($next == $seek)
{
$next = -1;
- $line = $PREFIX.$DATA.$SUFFIX."\n";
+ $line = $prefix . $DATA . $suffix."\n";
}
else
{
@@ -195,42 +191,42 @@ function admin_WriteData ($FILE, $COMMENT, $PREFIX, $SUFFIX, $DATA, $SEEK=0)
}
fclose($fp_tmp);
// Finished writing tmp file
- $DONE = true;
+ $done = true;
}
fclose($fp);
- if (($DONE) && ($found))
+ if (($done) && ($found))
{
// Copy back tmp file and delete tmp :-)
- @copy($TMP, $FILE);
- @unlink($TMP);
- define ('_FATAL', false);
+ @copy($tmp, $file);
+ @unlink($tmp);
+ define('_FATAL', false);
}
elseif (!$found)
{
- OUTPUT_HTML ("CHANGE: 404!");
- define ('_FATAL', true);
+ OUTPUT_HTML("CHANGE: 404!");
+ define('_FATAL', true);
}
else
{
- OUTPUT_HTML ("TMP: UNDONE!");
- define ('_FATAL', true);
+ OUTPUT_HTML("TMP: UNDONE!");
+ define('_FATAL', true);
}
}
}
else
{
- OUTPUT_HTML ("404: ".$FILE."
");
+ OUTPUT_HTML("404: ".$file."
");
}
}
//
function ADMIN_DO_ACTION($wht)
{
- global $menuDesription, $MTITLE, $CONFIG, $EXTENSIONS, $link, $DATA;
+ global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $link, $DATA, $DEPTH;
//* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n";
if (EXT_IS_ACTIVE("cache"))
{
// Include cache instance
- global $CACHE;
+ global $cacheInstance;
}
// Remove any spaces from variable
@@ -249,8 +245,8 @@ function ADMIN_DO_ACTION($wht)
$act = GET_ACTION($GLOBALS['module'], $wht);
// Define admin login name and ID number
- define('__ADMIN_LOGIN', SQL_ESCAPE($_COOKIE['admin_login']));
- define('__ADMIN_ID' , GET_ADMIN_ID($_COOKIE['admin_login']));
+ define('__ADMIN_LOGIN', SQL_ESCAPE(get_session('admin_login')));
+ define('__ADMIN_ID' , GET_ADMIN_ID(get_session('admin_login')));
// Preload templates
if (EXT_IS_ACTIVE("admins")) {
@@ -304,12 +300,12 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
//
function ADD_ADMIN_MENU($act, $wht,$return=false)
{
- global $_GET, $menuDesription, $MTITLE, $link;
+ global $menuDesription, $menuTitle, $link;
$SUB = false;
// Menu descriptions
$menuDesription = array();
- $MTITLE = array();
+ $menuTitle = array();
// Build main menu
$result_main = SQL_QUERY("SELECT action, title, descr FROM "._MYSQL_PREFIX."_admin_menu WHERE what='' ORDER BY sort, id DESC", __FILE__, __LINE__);
@@ -334,13 +330,13 @@ function ADD_ADMIN_MENU($act, $wht,$return=false)
if (!$SUB)
{
// Insert compiled menu title and description
- $MTITLE[$menu] = $title;
+ $menuTitle[$menu] = $title;
$menuDesription[$menu] = $descr;
}
$OUT .= "
-