* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009 - 2011 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');
- } elseif ($postData['pass1'][$id] == $postData['pass2'][$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]);
-
- // Save password when set
- if (!empty($postData['pass1'][$id])) $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash));
-
- // Get admin's id
- $adminId = getCurrentAdminId();
- $salt = substr(getAdminHash(getAdminLogin($adminId)), 0, -40);
-
- // Rewrite cookie when it's own account
- if ($adminId == $id) {
- // Set timeout cookie
- setSession('admin_last', time());
-
- if ($login != getSession('admin_login')) {
- // Update login cookie
- setSession('admin_login', $login);
-
- // Update password cookie as well?
- if (!empty($add)) setSession('admin_md5', $hash);
- } elseif (generateHash($postData['pass1'][$id], $salt) != getSession('admin_md5')) {
- // Update password cookie
- setSession('admin_md5', $hash);
- }
- } // END - if
-
- // Get default ACL from admin to check if we can allow him to change the default ACL
- $default = getAdminDefaultAcl(getCurrentAdminId());
-
- // Update admin account
- if ($default == 'allow') {
- // Allow changing default ACL
- SQL_QUERY_ESC("UPDATE
+ $message = '{--ADMIN_ACCOUNT_SAVED--}';
+ } elseif ((isset($postData['pass1'])) && (isset($postData['pass2']))) {
+ // Update only if both passwords match
+ if (($postData['pass1'][$id] == $postData['pass2'][$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]);
+
+ // Save password when set
+ if (!empty($postData['pass1'][$id])) $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash));
+
+ // Get admin's id
+ $adminId = getCurrentAdminId();
+ $salt = substr(getAdminHash(getAdminLogin($adminId)), 0, -40);
+
+ // Rewrite cookie when it's own account
+ if ($adminId == $id) {
+ // Set timeout cookie
+ setAdminLast(time());
+
+ if ($adminId != getCurrentAdminId()) {
+ // Update login cookie
+ setAdminId($adminId);
+
+ // Update password cookie as well?
+ if (!empty($add)) {
+ setAdminMd5($hash);
+ } // END - if
+ } elseif (generateHash($postData['pass1'][$id], $salt) != getAdminMd5()) {
+ // Update password cookie
+ setAdminMd5($hash);
+ }
+ } // END - if
+
+ // Get default ACL from admin to check if we can allow him to change the default ACL
+ $default = getAdminDefaultAcl(getCurrentAdminId());
+
+ // Update admin account
+ 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'
WHERE
`id`=%s
LIMIT 1",
- array(
- $login,
- $postData['email'][$id],
- $postData['mode'][$id],
- $postData['la_mode'][$id],
- $id
- ), __FUNCTION__, __LINE__);
- } else {
- // Do not allow it here
- SQL_QUERY_ESC("UPDATE
+ array(
+ $login,
+ $postData['email'][$id],
+ $postData['mode'][$id],
+ $postData['la_mode'][$id],
+ $id
+ ), __FUNCTION__, __LINE__);
+ } 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",
- array(
- $login,
- $postData['email'][$id],
- $postData['la_mode'][$id],
- $id
- ), __FUNCTION__, __LINE__);
- }
+ array(
+ $login,
+ $postData['email'][$id],
+ $postData['la_mode'][$id],
+ $id
+ ), __FUNCTION__, __LINE__);
+ }
- // Admin account saved
- $message = getMessage('ADMIN_ACCOUNT_SAVED');
+ // Admin account saved
+ $message = '{--ADMIN_ACCOUNT_SAVED--}';
+ } else {
+ // Passwords did not match
+ $message = '{--ADMIN_ADMINS_ERROR_PASS_MISMATCH--}';
+ }
} else {
- // Passwords did not match
- $message = getMessage('ADMINS_ERROR_PASS_MISMATCH');
+ // Update whole array
+ $SQL = 'UPDATE `{?_MYSQL_PREFIX?}_admins` SET ';
+ foreach ($postData as $entry => $value) {
+ // Skip login/id entry
+ if (in_array($entry, array('login', 'id'))) continue;
+
+ // Do we have a non-string (e.g. number, NULL, NOW() or back-tick at the beginning?
+ if (is_null($value[$id])) {
+ // NULL detected
+ $SQL .= '`' . $entry . '`=NULL, ';
+ } elseif ((bigintval($value[$id], true, false) === $value[$id]) || ($value[$id] == 'NOW()') || (substr($value[$id], 0, 1) == '`')) {
+ // No need for ticks (')
+ $SQL .= '`' . $entry . '`=' . $value[$id] . ', ';
+ } else {
+ // Strings need ticks (') around them
+ $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$id]) . "', ";
+ }
+ } // END - foreach
+
+ // Remove last 2 chars and finish query
+ $SQL = substr($SQL, 0, -2) . ' WHERE `id`=%s LIMIT 1';
+
+ // Run it
+ SQL_QUERY_ESC($SQL, array(bigintval($id)), __FUNCTION__, __LINE__);
}
} // END - foreach
// Display message
if (!empty($message)) {
- loadTemplate('admin_settings_saved', false, $message);
+ displayMessage($message);
} // END - if
// Remove cache file
- runFilterChain('post_admin_edited', postRequestArray());
+ runFilterChain('post_form_submited', postRequestArray());
}
// Make admin accounts editable
$currMode = getAdminDefaultAcl(getCurrentAdminId());
// Begin the edit loop
- $OUT = ''; $SW = 2;
+ $OUT = '';
foreach ($postData['sel'] as $id => $selected) {
// Secure id number
$id = bigintval($id);
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('{--ADMIN_ADMINS_MODE_ALLOW--}', '{--ADMIN_ADMINS_MODE_DENY--}'), $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('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--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);
// Delete given admin accounts
function adminsDeleteAdminAccount ($postData) {
// Check if this account is the last one which cannot be deleted...
- $result_main = SQL_QUERY("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins`", __FUNCTION__, __LINE__);
- $accounts = SQL_NUMROWS($result_main);
- SQL_FREERESULT($result_main);
- if ($accounts > 1) {
+ if (countSumTotalData('', 'admins', 'id', '', true) > 1) {
// Delete accounts
- $OUT = ''; $SW = 2;
+ $OUT = '';
foreach ($postData['sel'] as $id => $selected) {
// Secure id number
$id = bigintval($id);
// 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",
+ $result = SQL_QUERY_ESC("SELECT `login`, `email`, `default_acl` AS `mode`, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
array($id), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
- // Entry found
+ // Entry found, so load data
$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'] = '{--ADMIN_ADMINS_MODE_' . strtoupper($content['mode']) . '--}';
+ $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
// 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;
- }
- }
+ $OUT .= loadTemplate('admin_delete_admins_row', true, $content);
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+ } // END - foreach
// Load template
- loadTemplate('admin_del_admins', false, $OUT);
+ loadTemplate('admin_delete_admins', false, $OUT);
} else {
// Cannot delete last account!
- loadTemplate('admin_settings_saved', false, getMessage('ADMIN_ADMINS_CANNOT_DELETE_LAST'));
+ displayMessage('{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}');
}
}
// Delete only when it's not your own account!
if (($del == 1) && (getCurrentAdminId() != $id)) {
// Rewrite his tasks to all admins
- 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`=NULL WHERE `assigned_admin`=%s",
array($id), __FUNCTION__, __LINE__);
// Remove account
}
// Remove cache if cache system is activated
- runFilterChain('post_admin_deleted', postRequestArray());
+ runFilterChain('post_form_deleted', postRequestArray());
}
// List all admin accounts
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;
+ $result = SQL_QUERY('SELECT `id`, `login`, `email`, `default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__);
+ $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');
-
- // Prepare some more data
- $content['sw'] = $SW;
- $content['email_link'] = generateEmailLink($content['id'], 'admins');
+ $content['mode'] = '{--ADMINS_' . strtoupper($content['mode']) . '_MODE--}';
+ $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
// Load row template and switch color
$OUT .= loadTemplate('admin_list_admins_row', true, $content);
- $SW = 3 - $SW;
- }
+ } // END - while
// Free memory
SQL_FREERESULT($result);
loadTemplate('admin_list_admins', false, $OUT);
}
-// 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`';
-
- // Return it
- return $add;
-}
-
// 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",
+ $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
__FUNCTION__, __LINE__);
} else {
// If Admin-Id is not "to-all" select
// Default is has not the right
$data['expert_settings'] = 'N';
- // Get current admin login
- $admin = getAdminLogin(getCurrentAdminId());
+ // Get current admin Id
+ $adminId = getCurrentAdminId();
// Lookup settings in cache
- if (isset($GLOBALS['cache_array']['admin']['expert_settings'][$admin])) {
+ if (isset($GLOBALS['cache_array']['admin']['expert_settings'][$adminId])) {
// Use cache
- $data['expert_settings'] = $GLOBALS['cache_array']['admin']['expert_settings'][$admin];
+ $data['expert_settings'] = $GLOBALS['cache_array']['admin']['expert_settings'][$adminId];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionInstalled('cache')) {
// Load from database
- $result = SQL_QUERY_ESC("SELECT `expert_settings` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($admin), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `expert_settings` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+ array($adminId), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
$data = SQL_FETCHARRAY($result);
// Set cache
- $GLOBALS['cache_array']['admin']['expert_settings'][$admin] = $data['expert_settings'];
+ $GLOBALS['cache_array']['admin']['expert_settings'][$adminId] = $data['expert_settings'];
} // END - if
// Free memory
// Default is has not the right
$data['expert_warning'] = 'N';
- // Get current admin login
- $admin = getAdminLogin(getCurrentAdminId());
+ // Get current admin id
+ $adminId = getCurrentAdminId();
// Lookup warning in cache
- if (isset($GLOBALS['cache_array']['admin']['expert_warning'][$admin])) {
+ if (isset($GLOBALS['cache_array']['admin']['expert_warning'][$adminId])) {
// Use cache
- $data['expert_warning'] = $GLOBALS['cache_array']['admin']['expert_warning'][$admin];
+ $data['expert_warning'] = $GLOBALS['cache_array']['admin']['expert_warning'][$adminId];
// Update cache hits
incrementStatsEntry('cache_hits');
} elseif (!isExtensionInstalled('cache')) {
// Load from database
- $result = SQL_QUERY_ESC("SELECT `expert_warning` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
- array($admin), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `expert_warning` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+ array($adminId), __FUNCTION__, __LINE__);
// Entry found?
if (SQL_NUMROWS($result) == 1) {
$data = SQL_FETCHARRAY($result);
// Set cache
- $GLOBALS['cache_array']['admin']['expert_warning'][$admin] = $data['expert_warning'];
+ $GLOBALS['cache_array']['admin']['expert_warning'][$adminId] = $data['expert_warning'];
} // END - if
// Free memory
return $data['expert_warning'];
}
+// Get login_failures number from administrator's login name
+function getAdminLoginFailures ($adminId) {
+ // Admin login should not be empty
+ if (empty($adminId)) {
+ debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.');
+ } // END - if
+
+ // By default no admin is found
+ $data['login_failures'] = '-1';
+
+ // Check cache
+ if (isset($GLOBALS['cache_array']['admin']['login_failures'][$adminId])) {
+ // Use it if found to save SQL queries
+ $data['login_failures'] = $GLOBALS['cache_array']['admin']['login_failures'][$adminId];
+
+ // Update cache hits
+ incrementStatsEntry('cache_hits');
+ } elseif (!isExtensionActive('cache')) {
+ // Load from database
+ $result = SQL_QUERY_ESC("SELECT `login_failures` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+ array($adminId), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
+ if (SQL_NUMROWS($result) == 1) {
+ // Get it
+ $data = SQL_FETCHARRAY($result);
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+ }
+
+ // Return the login_failures
+ return $data['login_failures'];
+}
+
+// Get last_failure number from administrator's login name
+function getAdminLastFailure ($adminId) {
+ // Admin login should not be empty
+ if (empty($adminId)) {
+ debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.');
+ } // END - if
+
+ // By default no admin is found
+ $data['last_failure'] = '-1';
+
+ // Check cache
+ if (isset($GLOBALS['cache_array']['admin']['last_failure'][$adminId])) {
+ // Use it if found to save SQL queries
+ $data['last_failure'] = $GLOBALS['cache_array']['admin']['last_failure'][$adminId];
+
+ // Update cache hits
+ incrementStatsEntry('cache_hits');
+ } elseif (!isExtensionActive('cache')) {
+ // Load from database
+ $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`last_failure`) AS `last_failure` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
+ array($adminId), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
+ if (SQL_NUMROWS($result) == 1) {
+ // Get it
+ $data = SQL_FETCHARRAY($result);
+ } // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
+ }
+
+ // Return the last_failure
+ return $data['last_failure'];
+}
+
+// ---------------------------------------------------------------------------
+// Wrapper functions
+// ---------------------------------------------------------------------------
+
+// Wrapper function to check wether expert setting warning is enabled
+function isAdminsExpertWarningEnabled () {
+ return (getAminsExpertWarning() == 'Y');
+}
+
// [EOF]
?>