X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=228fdf50182478491ab3cc50fffe621900c055d1;hb=b8c86fa12322603c24a88ea2b0fd3dbeba612752;hp=fa49f1f28ed716ba453ec47a0ea3dd0e11f7c1fe;hpb=8ece7fd45c386f7ccd60f9c4800ad207602b0240;p=mailer.git
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index fa49f1f28e..228fdf5018 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -44,13 +44,13 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
// Lookup the user
$result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1",
- array($user), __FILE__, __LINE__);
+ array($user), __FUNCTION__, __LINE__);
// Is the entry there?
if (SQL_NUMROWS($result) == 0) {
// Ok, let's create the admin login
SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')",
- array($user, $md5, $email), __FILE__, __LINE__);
+ array($user, $md5, $email), __FUNCTION__, __LINE__);
$ret = "done";
} // END - if
@@ -62,8 +62,6 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
}
// Only be executed on login procedure!
function CHECK_ADMIN_LOGIN ($admin_login, $password) {
- global $cacheArray, $cacheInstance;
-
// By default no admin is found
$ret = "404";
@@ -74,17 +72,17 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
$data = array('aid' => $aid);
// Is the cache valid?
- if (isset($cacheArray['admins']['password'][$aid])) {
+ if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
// Get password from cache
- $data['password'] = $cacheArray['admins']['password'][$aid];
+ $data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid];
$ret = "pass";
incrementConfigEntry('cache_hits');
// Include more admins data?
if (GET_EXT_VERSION("admins") >= "0.7.0") {
// Load them here
- $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid];
- $data['last_failure'] = $cacheArray['admins']['last_failure'][$aid];
+ $data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid];
+ $data['last_failure'] = $GLOBALS['cache_array']['admins']['last_failure'][$aid];
} // END - if
} elseif (!EXT_IS_ACTIVE("cache")) {
// Add extra data via filter now
@@ -92,7 +90,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
// Get password from DB
$result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
- array($aid), __FILE__, __LINE__);
+ array($aid), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
@@ -141,11 +139,11 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
// Update password and reset login failures
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1",
- array($data['password'], $aid), __FILE__, __LINE__);
+ array($data['password'], $aid), __FUNCTION__, __LINE__);
} else {
// Update password
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1",
- array($data['password'], $aid), __FILE__, __LINE__);
+ array($data['password'], $aid), __FUNCTION__, __LINE__);
}
// Rebuild cache
@@ -174,7 +172,7 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) {
// Update counter
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",
- array($aid), __FILE__, __LINE__);
+ array($aid), __FUNCTION__, __LINE__);
// Rebuild cache
REBUILD_CACHE("admins", "admin");
@@ -187,13 +185,11 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
// Try to login the admin by setting some session/cookie variables
function LOGIN_ADMIN ($adminLogin, $passHash) {
- global $cacheInstance;
-
// Reset failure counter on matching admins version
if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) {
// Reset counter on out-dated sql_patches version
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
- array($adminLogin), __FILE__, __LINE__);
+ array($adminLogin), __FUNCTION__, __LINE__);
// Rebuild cache
REBUILD_CACHE("admins", "admin");
@@ -208,14 +204,14 @@ function LOGIN_ADMIN ($adminLogin, $passHash) {
) && (
set_session('admin_last', time())
) && (
- set_session('admin_to', bigintval($_POST['timeout']))
+ set_session('admin_to', bigintval(REQUEST_POST('timeout')))
)
);
}
// Only be executed on cookie checking
function CHECK_ADMIN_COOKIES ($admin_login, $password) {
- global $cacheArray;
+ // By default no admin cookies are found
$ret = "404"; $pass = "";
// Get hash
@@ -233,86 +229,11 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) {
// Return result
return $ret;
}
-//
-function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) {
- // Initialize some variables
- $done = false;
- $seek++;
- $next=-1;
- $found = false;
-
- // Is the file there and read-/write-able?
- if ((FILE_READABLE($file)) && (is_writeable($file))) {
- $search = "CFG: ".$comment;
- $tmp = $file.".tmp";
-
- // Open the source file
- $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
");
-
- // Is the resource valid?
- if (is_resource($fp)) {
- // Open temporary file
- $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
");
-
- // Is the resource again valid?
- if (is_resource($fp_tmp)) {
- while (!feof($fp)) {
- // Read from source file
- $line = fgets ($fp, 1024);
-
- if (strpos($line, $search) > -1) { $next = 0; $found = true; }
-
- if ($next > -1) {
- if ($next === $seek) {
- $next = -1;
- $line = $prefix . $DATA . $suffix."\n";
- } else {
- $next++;
- }
- }
-
- // Write to temp file
- fputs($fp_tmp, $line);
- }
-
- // Close temp file
- fclose($fp_tmp);
-
- // Finished writing tmp file
- $done = true;
- }
-
- // Close source file
- fclose($fp);
-
- if (($done) && ($found)) {
- // Copy back tmp file and delete tmp :-)
- @copy($tmp, $file);
- @unlink($tmp);
- define('_FATAL', false);
- } elseif (!$found) {
- OUTPUT_HTML("CHANGE: 404!");
- define('_FATAL', true);
- } else {
- OUTPUT_HTML("TMP: UNDONE!");
- define('_FATAL', true);
- }
- }
- } else {
- // File not found, not readable or writeable
- OUTPUT_HTML("404: ".$file."
");
- }
-}
//
-function ADMIN_DO_ACTION($wht) {
- global $menuDesription, $menuTitle, $cacheArray, $DATA;
-
+function ADMIN_DO_ACTION ($wht) {
+ global $DATA;
//* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n";
- if (EXT_IS_ACTIVE("cache")) {
- // Include cache instance
- global $cacheInstance;
- }
// Remove any spaces from variable
if (empty($wht)) {
@@ -344,28 +265,27 @@ 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'))
-LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
+WHERE `action`='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))
+LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __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) {
// Access denied
LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED'));
- addFatalMessage(getMessage('ADMIN_ACCESS_DENIED'));
+ addFatalMessage(__FUNCTION__, __LINE__, 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(__FUNCTION__, __LINE__, 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(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht);
}
// Free memory
@@ -376,30 +296,28 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__);
}
//
function ADD_ADMIN_MENU($act, $wht, $return=false) {
- global $menuDesription, $menuTitle, $cacheInstance;
-
// Init variables
$SUB = false;
$OUT = "";
// Menu descriptions
- $menuDesription = array();
- $menuTitle = array();
+ $GLOBALS['menu']['description'] = array();
+ $GLOBALS['menu']['title'] = array();
// Is there a cache instance?
- if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) {
+ if ((isset($GLOBALS['cache_instance'])) && (is_object($GLOBALS['cache_instance'])) && (getConfig('cache_admin_menu') == "Y")) {
// Create cache name
$cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
// Is that cache there?
- if ($cacheInstance->loadCacheFile($cacheName)) {
+ if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) {
// Then load it
- $data = $cacheInstance->getArrayFromCache();
+ $data = $GLOBALS['cache_instance']->getArrayFromCache();
// Extract all parts
$OUT = base64_decode($data['output'][0]);
- $menuTitle = unserialize(base64_decode($data['title'][0]));
- $menuDescription = unserialize(base64_decode($data['descr'][0]));
+ $GLOBALS['menu']['title'] = unserialize(base64_decode($data['title'][0]));
+ $GLOBALS['menu']['description'] = unserialize(base64_decode($data['descr'][0]));
// Return or output content?
if ($return) {
@@ -411,29 +329,23 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) {
} // END - if
// 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)
- {
+ $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
+ if (SQL_NUMROWS($result_main) > 0) {
$OUT = "
| |
\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;
+ $GLOBALS['menu']['title'][$menu] = $title;
+ $GLOBALS['menu']['description'][$menu] = $descr;
}
$OUT .= "
\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",
- array($menu), __FILE__, __LINE__);
+ $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), __FUNCTION__, __LINE__);
if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))
{
- $menuDesription = array();
- $menuTitle = array(); $SUB = true;
+ $GLOBALS['menu']['description'] = array();
+ $GLOBALS['menu']['title'] = array(); $SUB = true;
$OUT .= "
| |