* svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
}
// Check ACL and (maybe) allow
- //* DEBUG: */ print 'default='.$default.',acl_mode='.$acl_mode.',parent='.intval($parent).'<br />';
+ //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$acl_mode.',parent='.intval($parent));
if (($default == 'allow') || (($default == 'deny') && ($acl_mode == 'allow')) || ($parent === true) || (($default == '***') && ($acl_mode == 'failed') && ($parent === false))) {
// Access is granted
$ret = true;
} // END - if
// Return value
- //* DEBUG: */ outputHtml(__FUNCTION__."[".__LINE__."]:act={$action},wht={$whatOR},default={$default},acl_mode={$acl_mode}<br />");
+ //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',acl_mode='.$acl_mode);
return $ret;
}
if ((!empty($element)) && (isset($postData[$element]))) {
// Save this setting
SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
- array($element, $postData[$element][$id], $id), __FILE__, __LINE__);
+ array($element, $postData[$element][$id], $id), __FUNCTION__, __LINE__);
// Admin account saved
$message = getMessage('ADMIN_ACCOUNT_SAVED');
SQL_QUERY_ESC("UPDATE
`{?_MYSQL_PREFIX?}_admins`
SET
- `login`='%s'".$add.",
+ `login`='%s'" . $add . ",
`email`='%s',
`default_acl`='%s',
`la_mode`='%s'
SQL_QUERY_ESC("UPDATE
`{?_MYSQL_PREFIX?}_admins`
SET
- `login`='%s'".$add.",
+ `login`='%s'" . $add . ",
`email`='%s',
`la_mode`='%s'
WHERE
loadTemplate('admin_del_admins', false, $OUT);
} else {
// Cannot delete last account!
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');
}
}
}
// Sends out mail to all administrators
-// IMPORTANT: Please use SEND_ADMIN_NOTIFCATION() for now!
+// IMPORTANT: Please use sendAdminNotification() instead of calling this function directly
function sendAdminsEmails ($subj, $template, $content, $userid) {
// Trim template name
$template = trim($template);
// Check which admin shall receive this mail
$result = SQL_QUERY_ESC("SELECT `admin_id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `admin_id` ASC",
array($template), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) == '0') {
+ if (SQL_HASZERONUMS($result)) {
// Create new entry (to all admins)
SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`, `mail_template`) VALUES (0, '%s')",
array($template), __FUNCTION__, __LINE__);
$userid
));
}
- } elseif ($adminId == '0') {
+ } elseif (($adminId == '0') || (empty($adminId))) {
// Select all email adresses
$result = SQL_QUERY("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC",
__FUNCTION__, __LINE__);
function getAdminLoginFailures ($adminLogin) {
// Admin login should not be empty
if (empty($adminLogin)) {
- debug_report_bug('adminLogin is empty.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'adminLogin is empty.');
} // END - if
// By default no admin is found
function getAdminLastFailure ($adminLogin) {
// Admin login should not be empty
if (empty($adminLogin)) {
- debug_report_bug('adminLogin is empty.');
+ debug_report_bug(__FUNCTION__, __LINE__, 'adminLogin is empty.');
} // END - if
// By default no admin is found
// Filter for adding extra data to the query
function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {
// Is the admins extension updated? (should be!)
- if (getExtensionVersion('admins') >= '0.3.0') $add .= ', `default_acl` AS def_acl';
- if (getExtensionVersion('admins') >= '0.6.7') $add .= ', `la_mode`';
- if (getExtensionVersion('admins') >= '0.7.2') $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure';
- if (getExtensionVersion('admins') >= '0.7.3') $add .= ', `expert_settings`, `expert_warning`';
+ if (isExtensionInstalledAndNewer('admins', '0.3.0')) $add .= ', `default_acl` AS def_acl';
+ if (isExtensionInstalledAndNewer('admins', '0.6.7')) $add .= ', `la_mode`';
+ if (isExtensionInstalledAndNewer('admins', '0.7.2')) $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure';
+ if (isExtensionInstalledAndNewer('admins', '0.7.3')) $add .= ', `expert_settings`, `expert_warning`';
// Return it
return $add;
// Reset the login failures
function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) {
// Store it in session
- setSession('mxchange_admin_failures' , getAdminLoginFailures($data['login']));
- setSession('mxchange_admin_last_failure', getAdminLastFailure($data['login']));
+ setSession('mailer_admin_failures' , getAdminLoginFailures($data['login']));
+ setSession('mailer_admin_last_failure', getAdminLastFailure($data['login']));
// Prepare update data
$postData['login'][getCurrentAdminId()] = $data['login'];
// Change it in the admin
adminsChangeAdminAccount($postData);
+ // Always make sure the cache is destroyed
+ rebuildCache('admin');
+
// Return the data for further processing
return $data;
}
// Change it in the admin
adminsChangeAdminAccount($postData);
+ // Always make sure the cache is destroyed
+ rebuildCache('admin');
+
+ // Return the data for further processing
+ return $data;
+}
+
+// Rehashes the given plain admin password and stores it the database
+function FILTER_REHASH_ADMINS_PASSWORD ($data) {
+ // Generate new hash
+ $newHash = generateHash($data['plain_pass']);
+
+ // Prepare update data
+ $postData['login'][getCurrentAdminId()] = $data['login'];
+ $postData['password'][getCurrentAdminId()] = $newHash;
+
+ // Change it in the admin
+ adminsChangeAdminAccount($postData);
+
+ // Update cookie/session and data array
+ setSession('admin_md5', encodeHashForCookie($newHash));
+ $data['pass_hash'] = $newHash;
+
+ // Always make sure the cache is destroyed
+ rebuildCache('admin');
+
// Return the data for further processing
return $data;
}