X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=e9a5e8a79b5df96b1d141d75075a596efc74a718;hb=ffe213c8e3f85119ddd5544214d0de9ecb833d98;hp=e0424383fbfd88db20236932c865e1ce6a130017;hpb=c85ddc06cc16f2cd38ddd7d4c142a3f578bbab69;p=mailer.git
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index e0424383fb..e9a5e8a79b 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -110,14 +110,14 @@ function adminsCheckAdminAcl ($action, $what) {
}
// Check ACL and (maybe) allow
- //* DEBUG: */ print 'default='.$default.',acl_mode='.$acl_mode.',parent='.intval($parent).'
';
+ //* 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}
");
+ //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',acl_mode='.$acl_mode);
return $ret;
}
@@ -166,10 +166,10 @@ function adminsChangeAdminAccount ($postData, $element = '') {
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');
+ $message = '{--ADMIN_ACCOUNT_SAVED--}';
} elseif ((isset($postData['pass1'])) && (isset($postData['pass2']))) {
// Update only if both passwords match
if (($postData['pass1'][$id] == $postData['pass2'][$id])) {
@@ -191,9 +191,9 @@ function adminsChangeAdminAccount ($postData, $element = '') {
// Set timeout cookie
setSession('admin_last', time());
- if ($login != getSession('admin_login')) {
+ if ($adminId != getSession('admin_id')) {
// Update login cookie
- setSession('admin_login', $login);
+ setSession('admin_id', $adminId);
// Update password cookie as well?
if (!empty($add)) setSession('admin_md5', $hash);
@@ -212,7 +212,7 @@ function adminsChangeAdminAccount ($postData, $element = '') {
SQL_QUERY_ESC("UPDATE
`{?_MYSQL_PREFIX?}_admins`
SET
- `login`='%s'".$add.",
+ `login`='%s'" . $add . ",
`email`='%s',
`default_acl`='%s',
`la_mode`='%s'
@@ -231,7 +231,7 @@ LIMIT 1",
SQL_QUERY_ESC("UPDATE
`{?_MYSQL_PREFIX?}_admins`
SET
- `login`='%s'".$add.",
+ `login`='%s'" . $add . ",
`email`='%s',
`la_mode`='%s'
WHERE
@@ -246,10 +246,10 @@ LIMIT 1",
}
// Admin account saved
- $message = getMessage('ADMIN_ACCOUNT_SAVED');
+ $message = '{--ADMIN_ACCOUNT_SAVED--}';
} else {
// Passwords did not match
- $message = getMessage('ADMINS_ERROR_PASS_MISMATCH');
+ $message = '{--ADMINS_ERROR_PASS_MISMATCH--}';
}
} else {
// Update whole array
@@ -291,7 +291,7 @@ function adminsEditAdminAccount ($postData) {
$currMode = getAdminDefaultAcl(getCurrentAdminId());
// Begin the edit loop
- $OUT = ''; $SW = 2;
+ $OUT = '';
foreach ($postData['sel'] as $id => $selected) {
// Secure id number
$id = bigintval($id);
@@ -305,24 +305,22 @@ function adminsEditAdminAccount ($postData) {
SQL_FREERESULT($result);
// Prepare some more data for the template
- $content['sw'] = $SW;
$content['id'] = $id;
// Shall we allow changing default ACL?
if ($currMode == 'allow') {
// Allow chaning it
- $content['mode'] = generateOptionList('/ARRAY/', array('allow', 'deny'), array(getMessage('ADMINS_ALLOW_MODE'), getMessage('ADMINS_DENY_MODE')), $content['mode']);
+ $content['mode'] = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMINS_ALLOW_MODE--}', '{--ADMINS_DENY_MODE--}'), $content['mode']);
} else {
// Don't allow it
$content['mode'] = ' ';
}
- $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array(getMessage('ADMINS_GLOBAL_LA_SETTING'), getMessage('ADMINS_OLD_LA_SETTING'), getMessage('ADMINS_NEW_LA_SETTING')), $content['la_mode']);
+ $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']);
// Load row template and switch color
$OUT .= loadTemplate('admin_edit_admins_row', true, $content);
- $SW = 3 - $SW;
- }
- }
+ } // END - if
+ } // END - foreach
// Load template
loadTemplate('admin_edit_admins', false, $OUT);
@@ -336,7 +334,7 @@ function adminsDeleteAdminAccount ($postData) {
SQL_FREERESULT($result_main);
if ($accounts > 1) {
// Delete accounts
- $OUT = ''; $SW = 2;
+ $OUT = '';
foreach ($postData['sel'] as $id => $selected) {
// Secure id number
$id = bigintval($id);
@@ -348,24 +346,22 @@ function adminsDeleteAdminAccount ($postData) {
// Entry found
$content = SQL_FETCHARRAY($result);
SQL_FREERESULT($result);
- $content['mode'] = getMessage('ADMINS_'.strtoupper($content['mode']).'_MODE');
- $content['la_mode'] = getMessage('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
+ $content['mode'] = '{--ADMINS_' . strtoupper($content['mode']) . '_MODE--}';
+ $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
// Prepare some more data
- $content['sw'] = $SW;
$content['id'] = $id;
// Load row template and switch color
$OUT .= loadTemplate('admin_del_admins_row', true, $content);
- $SW = 3 - $SW;
- }
- }
+ } // END - if
+ } // END - foreach
// Load template
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--}');
}
}
@@ -397,20 +393,18 @@ function adminsRemoveAdminAccount ($postData) {
function adminsListAdminAccounts() {
// 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 = '';
while ($content = SQL_FETCHARRAY($result)) {
// Compile some variables
- $content['mode'] = getMessage('ADMINS_'.strtoupper($content['mode']).'_MODE');
- $content['la_mode'] = getMessage('ADMINS_'.strtoupper($content['la_mode']).'_LA_SETTING');
+ $content['mode'] = '{--ADMINS_' . strtoupper($content['mode']) . '_MODE--}';
+ $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
// Prepare some more data
- $content['sw'] = $SW;
$content['email_link'] = generateEmailLink($content['id'], 'admins');
// Load row template and switch color
$OUT .= loadTemplate('admin_list_admins_row', true, $content);
- $SW = 3 - $SW;
- }
+ } // END - while
// Free memory
SQL_FREERESULT($result);
@@ -420,7 +414,7 @@ function adminsListAdminAccounts() {
}
// 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);
@@ -463,7 +457,7 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
$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__);
@@ -561,7 +555,7 @@ function getAminsExpertWarning () {
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
@@ -597,7 +591,7 @@ function getAdminLoginFailures ($adminLogin) {
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
@@ -636,10 +630,10 @@ function getAdminLastFailure ($adminLogin) {
// 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;
@@ -648,8 +642,8 @@ function FILTER_ADD_EXTRA_SQL_DATA ($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'];