// Check ACL for menu combination
function ADMINS_CHECK_ACL($act, $wht) {
- global $cacheArray, $_CONFIG, $cacheInstance;
+ global $cacheArray, $cacheInstance;
// If action is login or logout allow allways!
$default = "allow";
if (($act == "login") || ($act == "logout")) return true;
// Default is deny
$ret = false;
- // Get admin's defult access right
- if (!empty($cacheArray['admins']['def_acl'][get_session('admin_login')])) {
- // Load from cache
- $default = $cacheArray['admins']['def_acl'][get_session('admin_login')];
-
- // Count cache hits
- $_CONFIG['cache_hits']++;
- } elseif (!is_object($cacheInstance)) {
- // Load from database
- $result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
- array(get_session('admin_login')), __FILE__, __LINE__);
- list($default) = SQL_FETCHROW($result);
- SQL_FREERESULT($result);
- }
-
// Get admin's ID
- $aid = GET_ADMIN_ID(get_session('admin_login'));
+ $aid = GET_CURRENT_ADMIN_ID();
+
+ // Get admin's defult access right
+ $default = GET_ADMIN_DEFAULT_ACL($aid);
if (!empty($wht)) {
// Check for parent menu:
}
if ($lines == 1) {
// Count cache hits
- $_CONFIG['cache_hits']++;
+ incrementConfigEntry('cache_hits');
break;
}
}
if (!empty($POST['pass1'][$id])) $ADD = sprintf(", password='%s'", SQL_ESCAPE($hash));
// Get admin's ID
- $salt = substr(GET_ADMIN_HASH(get_session('admin_login')), 0, -40);
- $aid = GET_ADMIN_ID(get_session('admin_login'));
+ $aid = GET_CURRENT_ADMIN_ID();
+ $salt = substr(GET_ADMIN_HASH($aid), 0, -40);
// Rewrite cookie when it's own account
if ($aid == $id) {
// Set timeout cookie
- set_session("admin_last", time());
+ set_session('admin_last', time());
if ($login != get_session('admin_login')) {
// Update login cookie
- set_session("admin_login", $login);
+ set_session('admin_login', $login);
// Update password cookie as well?
- if (!empty($ADD)) set_session("admin_md5", $hash);
+ if (!empty($ADD)) set_session('admin_md5', $hash);
} elseif (generateHash($POST['pass1'][$id], $salt) != get_session('admin_md5')) {
// Update password cookie
- set_session("admin_md5", $hash);
+ set_session('admin_md5', $hash);
}
-
- }
+ } // END - if
// Get default ACL from admin to check if we can allow him to change the default ACL
- $result = SQL_QUERY_ESC("SELECT default_acl FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
- array(get_session('admin_login')), __FILE__, __LINE__);
- list($default) = SQL_FETCHROW($result);
-
- // Free result
- SQL_FREERESULT($result);
+ $default = GET_ADMIN_DEFAULT_ACL(GET_CURRENT_ADMIN_ID());
// Update admin account
if ($default == "allow") {
// Allow changing default ACL
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
+ SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
login='%s'".$ADD.",
email='%s',
default_acl='%s',
la_mode='%s'
WHERE id=%s LIMIT 1",
- array(
- $login,
- $POST['email'][$id],
- $POST['mode'][$id],
- $POST['la_mode'][$id],
- $id
-), __FILE__, __LINE__);
+ array(
+ $login,
+ $POST['email'][$id],
+ $POST['mode'][$id],
+ $POST['la_mode'][$id],
+ $id
+ ), __FILE__, __LINE__);
} else {
// Do not allow it here
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
+ SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET
login='%s'".$ADD.",
email='%s',
la_mode='%s'
WHERE id=%s LIMIT 1",
- array(
- $login,
- $POST['email'][$id],
- $POST['la_mode'][$id],
- $id
-), __FILE__, __LINE__);
+ array(
+ $login,
+ $POST['email'][$id],
+ $POST['la_mode'][$id],
+ $id
+ ), __FILE__, __LINE__);
}
// Purge cache
// Display message
if (!empty($MSG)) {
- LOAD_TEMPLATE("admin_settings_saved", false, "<SPAN class=\"admin_done\">".$MSG."</SPAN>");
+ LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
}
}
// Remove cache file
- if ((EXT_IS_ACTIVE("cache")) && ($cache_update == "1")) {
- if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
- }
+ RUN_FILTER('post_admin_edited', $_POST);
}
// Make admin accounts editable
function ADMINS_EDIT_ADMIN_ACCOUNTS ($POST) {
+ // "Resolve" current's admin access mode
+ $currMode = GET_ADMIN_DEFAULT_ACL(GET_CURRENT_ADMIN_ID());
+
// Begin the edit loop
$SW = 2; $OUT = "";
foreach ($POST['sel'] as $id => $sel) {
// Get the admin's data
$result = SQL_QUERY_ESC("SELECT login, email, default_acl AS mode, la_mode FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
- array($id), __FILE__, __LINE__);
+ array($id), __FILE__, __LINE__);
if ((SQL_NUMROWS($result) == 1) && ($sel == 1)) {
// Entry found
$content = SQL_FETCHARRAY($result);
$content['id'] = $id;
// Shall we allow changing default ACL?
- if ($content['mode'] == "allow") {
+ if ($currMode == "allow") {
// Allow chaning it
$content['mode'] = ADD_OPTION_LINES("/ARRAY/", array("allow", "deny"), array(ADMINS_ALLOW_MODE, ADMINS_DENY_MODE), $content['mode']);
} else {
// Entry found
$content = SQL_FETCHARRAY($result);
SQL_FREERESULT($result);
- $eval = "\$content['mode'] = ADMINS_".strtoupper($content['mode'])."_MODE;";
- eval($eval);
- $eval = "\$content['la_mode'] = ADMINS_".strtoupper($content['la_mode'])."_LA_SETTING;";
- eval($eval);
+ $content['mode'] = constant('ADMINS_'.strtoupper($content['mode']).'_MODE');
+ $content['la_mode'] = constant('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
// Prepare some more data
$content['sw'] = $SW;
$id = bigintval($id);
// Delete only when it's not your own account!
- if (($del == 1) && (GET_ADMIN_ID(get_session('admin_login')) != $id)) {
+ if (($del == 1) && (GET_CURRENT_ADMIN_ID() != $id)) {
// Rewrite his tasks to all admins
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE assigned_admin=%s",
+ SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_task_system SET assigned_admin=0 WHERE assigned_admin=%s",
array($id), __FILE__, __LINE__);
// Remove account
- $result = SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
- array($id), __FILE__, __LINE__);
+ SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+ array($id), __FILE__, __LINE__);
// Purge cache
CACHE_PURGE_ADMIN_MENU($id);
}
// Remove cache if cache system is activated
- if ((EXT_IS_ACTIVE("cache")) && ($cache_update == "1")) {
- if ($cacheInstance->cache_file("admins", true)) $cacheInstance->cache_destroy();
- }
+ RUN_FILTER('post_admin_deleted', $_POST);
}
// List all admin accounts
$SW = 2; $OUT = "";
while ($content = SQL_FETCHARRAY($result)) {
// Compile some variables
- $eval = "\$content['mode'] = ADMINS_".strtoupper($content['mode'])."_MODE;";
- eval($eval);
- $eval = "\$content['la_mode'] = ADMINS_".strtoupper($content['la_mode'])."_LA_SETTING;";
- eval($eval);
+ $content['mode'] = constant('ADMINS_'.strtoupper($content['mode']).'_MODE');
+ $content['la_mode'] = constant('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
// Prepare some more data
$content['sw'] = $SW;
LOAD_TEMPLATE("admin_list_admins");
}
+// Filter for adding extra data to the query
+function FILTER_ADD_EXTRA_SQL_DATA ($ADD = "") {
+ // Is the admins extension updated? (should be!)
+ if (GET_EXT_VERSION("admins") >= "0.3") $ADD .= ", default_acl AS def_acl";
+ if (GET_EXT_VERSION("admins") >= "0.6.7") $ADD .= ", la_mode";
+ if (GET_EXT_VERSION("admins") >= "0.7.2") $ADD .= ", login_failures, UNIX_TIMESTAMP(last_failure) AS last_failure";
+
+ // Return it
+ return $ADD;
+}
+
//
?>
projects / mailer.git / blobdiff