return $GLOBALS[__FUNCTION__][$adminId][$action][$what];
}
- // But default result is failed
- $GLOBALS[__FUNCTION__][$action][$what] = FALSE;
-
// Get admin's defult access right
$default = getAdminDefaultAcl($adminId);
SQL_FREERESULT($result);
}
+ // But default result is failed
+ $GLOBALS[__FUNCTION__][$adminId][$action][$what] = FALSE;
+
// Check ACL and (maybe) allow
//* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$aclMode.',parent='.intval($parent));
if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === TRUE) || (($default == 'NO-ACL') && ($aclMode == 'failed') && ($parent === FALSE))) {
// Admin account saved
$message = '{--ADMIN_ACCOUNT_SAVED--}';
- } elseif ((!empty($postData['pass1'])) && (!empty($postData['pass2']))) {
+ } elseif ((!empty($postData['password1'])) && (!empty($postData['password2']))) {
// Update only if both passwords match
- if (($postData['pass1'][$id] == $postData['pass2'][$id])) {
+ if (($postData['password1'][$id] == $postData['password2'][$id])) {
// Save only when both passwords are the same (also when they are empty)
$add = ''; $cache_update = 1;
// Generate hash
- $hash = generateHash($postData['pass1'][$id]);
+ $hash = generateHash($postData['password1'][$id]);
// Save password when set
- if (!empty($postData['pass1'][$id])) {
+ if (!empty($postData['password1'][$id])) {
$add = sprintf(",`password`='%s'", SQL_ESCAPE($hash));
} // END - if
if (!empty($add)) {
setAdminMd5($hash);
} // END - if
- } elseif (generateHash($postData['pass1'][$id], $salt) != getAdminMd5()) {
+ } elseif (generateHash($postData['password1'][$id], $salt) != getAdminMd5()) {
// Update password cookie
setAdminMd5($hash);
}
// No entries found?
if (SQL_HASZERONUMS($result)) {
- // Create new entry (to all admins)
- SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`, `mail_template`) VALUES (NULL, '%s')",
- array($template), __FUNCTION__, __LINE__);
+ // Is ext-admins' version at least 0.7.9?
+ if (isExtensionInstalledAndNewer('admins', '0.7.9')) {
+ // Create new entry (to all admins)
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`, `mail_template`) VALUES (NULL, '%s')",
+ array($template), __FUNCTION__, __LINE__);
+ } // END - if
// Select all email adresses (default)
$result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
$userid
));
}
+
+ // Abort here as below while() loop will cause problems
+ return;
} elseif (($adminId == '0') || (empty($adminId))) {
// Select all email adresses
$result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
// Is the template a bug report?
if ($template == 'admin_report_bug') {
// Then set 'Reply-To:' again
- $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+ $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL;
} // END - if
// Load email addresses and send away