* -------------------------------------------------------------------- *
* Kurzbeschreibung : Funktionen fuer die admins-Erweiterung *
* -------------------------------------------------------------------- *
- * $Revision:: 856 $ *
+ * $Revision:: $ *
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
if (!empty($wht)) {
// Check for parent menu:
// First get it's action value
- $parent_action = GET_ACTION("admin", $wht);
+ $parent_action = GET_ACTION('admin', $wht);
// Check with this function...
- $parent = ADMINS_CHECK_ACL($parent_action, "");
+ $parent = ADMINS_CHECK_ACL($parent_action, '');
} else {
// Anything else is true!
$parent = false;
}
// Shall I test for a main or sub menu? (action or what?)
- $lines = 0; $acl_mode = "failed";
- if (GET_EXT_VERSION("cache") >= "0.1.2") {
- // Load only from array when there are lines!
- if ((isset($GLOBALS['cache_array']['admin_acls'])) && (is_array($GLOBALS['cache_array']['admin_acls'])) && (count($GLOBALS['cache_array']['admin_acls']) > 0)) {
- // Load ACL from array
- foreach ($GLOBALS['cache_array']['admin_acls']['admin_id'] as $id => $aid_acls) {
- if ($aid == $aid_acls) {
- // Okay, one line was found!
- if ((!empty($act)) && ($GLOBALS['cache_array']['admin_acls']['action_menu'][$id] == $act)) {
- // Main menu line found
- $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$id];
- $lines = 1;
- }
- elseif ((!empty($wht)) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$id] == $wht)) {
- // Check sub menu
- $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$id];
- $lines = 1;
- }
- if ($lines == 1) {
- // Count cache hits
- incrementConfigEntry('cache_hits');
- break;
- }
- }
- }
-
- // No ACL found?
- if ($acl_mode == "failed") {
- $acl_mode = "";
- $lines = 0;
- }
- } else {
- // No lines here
- $lines = 0;
+ $acl_mode = "failed";
+ if ((GET_EXT_VERSION('cache') >= '0.1.2') && (count($GLOBALS['cache_array']['admin_acls']) > 0)) {
+ // Lookup in cache
+ if ((!empty($act)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid])) & ($GLOBALS['cache_array']['admin_acls']['action_menu'][$aid] == $act)) {
+ // Main menu line found
+ $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$aid];
+
+ // Count cache hits
+ incrementConfigEntry('cache_hits');
+ } elseif ((!empty($wht)) && (isset($GLOBALS['cache_array']['admin_acls']['what_menu'][$aid])) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$aid] == $wht)) {
+ // Check sub menu
+ $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$aid];
+
+ // Count cache hits
+ incrementConfigEntry('cache_hits');
}
- } else {
+ } elseif (!EXT_IS_ACTIVE('cache')) {
// Old version, so load it from database
- if (!empty($act))
- {
+ if (!empty($act)) {
// Main menu
$result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND action_menu='%s' LIMIT 1",
- array(bigintval($aid), $act), __FUNCTION__, __LINE__);
+ array(bigintval($aid), $act), __FUNCTION__, __LINE__);
} elseif (!empty($wht)) {
// Sub menu
$result = SQL_QUERY_ESC("SELECT access_mode FROM `{!_MYSQL_PREFIX!}_admins_acls` WHERE admin_id=%s AND what_menu='%s' LIMIT 1",
- array(bigintval($aid), $wht), __FUNCTION__, __LINE__);
+ array(bigintval($aid), $wht), __FUNCTION__, __LINE__);
}
- // Get number of lines
- $lines = SQL_NUMROWS($result);
+ // Is an entry found?
+ if (SQL_NUMROWS($result) == 1) {
+ // Load ACL
+ list($acl_mode) = SQL_FETCHROW($result);
+ } // END - if
- // Load ACL
- list($acl_mode) = SQL_FETCHROW($result);
+ // Free memory
SQL_FREERESULT($result);
}
// Check ACL and (maybe) allow
- if ((($default == "allow") && ($lines == 0)) || (($default == "deny") && ($lines == "1") && ($acl_mode == "allow")) || (($lines == 0) && ($parent))) $ret = true;
+ if (($default == "allow") || (($default == "deny") && ($acl_mode == "allow")) || ($parent === true)) {
+ // Access is granted
+ $ret = true;
+ } // END - if
// Return value
+ //* DEBUG: */ print __FUNCTION__."[".__LINE__."]:act={$act},wht={$wht},default={$default},acl_mode={$acl_mode}<br />\n";
return $ret;
}
// Create email link to admins's account
-function ADMINS_CREATE_EMAIL_LINK ($email, $mod="admin") {
- if (strpos("@", $email) > 0) {
+function ADMINS_CREATE_EMAIL_LINK ($email, $mod='admin') {
+ // Is it an email?
+ if (strpos($email, "@") !== false) {
// Create email link
- $result = SQL_QUERY_ESC("SELECT id
+ $result = SQL_QUERY_ESC("SELECT `id`
FROM `{!_MYSQL_PREFIX!}_admins`
-WHERE email='%s' LIMIT 1",
+WHERE `email`='%s' LIMIT 1",
array($email), __FUNCTION__, __LINE__);
// Is there an entry?
if (SQL_NUMROWS($result) == 1) {
// Load userid
- list($uid) = SQL_FETCHROW($result);
+ list($aid) = SQL_FETCHROW($result);
// Rewrite email address to contact link
- $email = "{!URL!}/modules.php?module=".$mod."&what=user_contct&uid=".bigintval($uid);
- }
+ $email = "{!URL!}/modules.php?module=".$mod."&what=admins_contct&admin=".bigintval($aid);
+ } // END - if
// Free memory
SQL_FREERESULT($result);
// When both passwords match update admin account
if ($POST['pass1'][$id] == $POST['pass2'][$id]) {
// Save only when both passwords are the same (also when they are empty)
- $ADD = ""; $cache_update = "1";
+ $add = ''; $cache_update = "1";
// Generate hash
$hash = generateHash($POST['pass1'][$id]);
// Save password when set
- if (!empty($POST['pass1'][$id])) $ADD = sprintf(", password='%s'", SQL_ESCAPE($hash));
+ if (!empty($POST['pass1'][$id])) $add = sprintf(", password='%s'", SQL_ESCAPE($hash));
// Get admin's ID
$aid = GET_CURRENT_ADMIN_ID();
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);
if ($default == "allow") {
// Allow changing default ACL
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET
-login='%s'".$ADD.",
+login='%s'".$add.",
email='%s',
default_acl='%s',
la_mode='%s'
} else {
// Do not allow it here
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET
-login='%s'".$ADD.",
+login='%s'".$add.",
email='%s',
la_mode='%s'
WHERE id=%s LIMIT 1",
CACHE_PURGE_ADMIN_MENU($id);
// Admin account saved
- $MSG = ADMIN_ACCOUNT_SAVED;
+ $message = ADMIN_ACCOUNT_SAVED;
} else {
// Passwords did not match
- $MSG = ADMINS_ERROR_PASS_MISMATCH;
+ $message = ADMINS_ERROR_PASS_MISMATCH;
}
// Display message
- if (!empty($MSG)) {
- LOAD_TEMPLATE("admin_settings_saved", false, $MSG);
+ if (!empty($message)) {
+ LOAD_TEMPLATE('admin_settings_saved', false, $message);
}
}
$currMode = GET_ADMIN_DEFAULT_ACL(GET_CURRENT_ADMIN_ID());
// Begin the edit loop
- $OUT = ""; $SW = 2;
+ $OUT = ''; $SW = 2;
foreach ($POST['sel'] as $id => $selected) {
// Secure ID number
$id = bigintval($id);
SQL_FREERESULT($result_main);
if ($accounts > 1) {
// Delete accounts
- $OUT = ""; $SW = 2;
+ $OUT = ''; $SW = 2;
foreach ($POST['sel'] as $id => $selected) {
// Secure ID number
$id = bigintval($id);
LOAD_TEMPLATE("admin_del_admins");
} else {
// Cannot delete last account!
- LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));
+ LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));
}
}
function ADMINS_LIST_ADMIN_ACCOUNTS() {
// Select all admin accounts
$result = SQL_QUERY("SELECT id, login, email, default_acl AS mode, la_mode FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY login ASC", __FUNCTION__, __LINE__);
- $OUT = ""; $SW = 2;
+ $OUT = ''; $SW = 2;
while ($content = SQL_FETCHARRAY($result)) {
// Compile some variables
$content['mode'] = constant('ADMINS_'.strtoupper($content['mode']).'_MODE');
}
// Filter for adding extra data to the query
-function FILTER_ADD_EXTRA_SQL_DATA ($ADD = "") {
+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";
+ if (GET_EXT_VERSION('admins') >= '0.3.0') $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;
+ return $add;
}
//
projects / mailer.git / blobdiff