X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=0fad9b6657952468158c087573f4c07313a7635f;hb=ba764b4060d3d82fc59e1bd72f68d0a4bb51f723;hp=9739305777b21a352542a83ef24cf3e966d20b73;hpb=6a0c39a390c28999679d84a7ae5264363b0054dc;p=mailer.git
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 9739305777..0fad9b6657 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -17,7 +17,7 @@
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
@@ -41,18 +41,20 @@ if (!defined('__SECURITY')) {
}
// Check ACL for menu combination
-function adminsCheckAdminAcl ($action, $what) {
- // If action is login or logout allow allways!
- $default = 'allow';
+function isAdminsAllowedByAcl ($action, $what) {
+ // Get admin's id
+ $adminId = getCurrentAdminId();
+
if (($action == 'login') || ($action == 'logout')) {
+ // If action is login or logout allow allways!
return true;
- } // END - if
-
- // Default is deny
- $ret = false;
+ } elseif (isset($GLOBALS[__FUNCTION__][$adminId][$action][$what])) {
+ // If we have cache, use it
+ return $GLOBALS[__FUNCTION__][$adminId][$action][$what];
+ }
- // Get admin's id
- $adminId = getCurrentAdminId();
+ // But default result is failed
+ $GLOBALS[__FUNCTION__][$action][$what] = false;
// Get admin's defult access right
$default = getAdminDefaultAcl($adminId);
@@ -63,7 +65,7 @@ function adminsCheckAdminAcl ($action, $what) {
$parent_action = getActionFromModuleWhat('admin', $what);
// Check with this function...
- $parent = adminsCheckAdminAcl($parent_action, '');
+ $parent = isAdminsAllowedByAcl($parent_action, '');
} else {
// Anything else is true!
$parent = false;
@@ -81,7 +83,7 @@ function adminsCheckAdminAcl ($action, $what) {
$aclMode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId][$key];
// Log debug message
- logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',key=' . $key . ',acl_mode=' . $aclMode);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',key=' . $key . ',acl_mode=' . $aclMode);
// Count cache hits
incrementStatsEntry('cache_hits');
@@ -93,13 +95,13 @@ function adminsCheckAdminAcl ($action, $what) {
$aclMode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId][$key];
// Log debug message
- logDebugMessage(__FUNCTION__, __LINE__, 'what=' . $what . ',key=' . $key . ',acl_mode=' . $aclMode);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'what=' . $what . ',key=' . $key . ',acl_mode=' . $aclMode);
// Count cache hits
incrementStatsEntry('cache_hits');
}
} elseif (!isExtensionActive('cache')) {
- // Old version, so load it from database
+ // Extension ext-cache is absent, so load it from database
$result = false;
if (!empty($action)) {
// Main menu
@@ -123,26 +125,26 @@ function adminsCheckAdminAcl ($action, $what) {
// 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 == '***') && ($aclMode == 'failed') && ($parent === false))) {
+ if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === true) || (($default == 'NO-ACL') && ($aclMode == 'failed') && ($parent === false))) {
// Access is granted
- $ret = true;
+ $GLOBALS[__FUNCTION__][$adminId][$action][$what] = true;
} // END - if
// Return value
//* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',aclMode='.$aclMode);
- return $ret;
+ return $GLOBALS[__FUNCTION__][$adminId][$action][$what];
}
// Create email link to admins's account
function generateAdminEmailLink ($email, $mod = 'admin') {
// Is it an email?
- if (strpos($email, '@') !== false) {
+ if (isInString('@', $email)) {
// Create email link
$result = SQL_QUERY_ESC("SELECT `id`
FROM
`{?_MYSQL_PREFIX?}_admins`
WHERE
- `email`='%s'
+ '%s' REGEXP `email`
LIMIT 1",
array($email), __FUNCTION__, __LINE__);
@@ -151,15 +153,18 @@ LIMIT 1",
// Load userid
list($adminId) = SQL_FETCHROW($result);
- // Rewrite email address to contact link
- $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($adminId) . '%}';
+ // Call this function again
+ $email = generateAdminEmailLink($adminId, $mod);
} // END - if
// Free memory
SQL_FREERESULT($result);
- } elseif ((is_int($email)) && ($email > 0)) {
+ } elseif (isValidUserId($email)) {
// Direct id given
- $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($email) . '%}';
+ $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&id=' . bigintval($email) . '%}';
+ } else {
+ // This is strange and needs fixing
+ debug_report_bug(__FUNCTION__, __LINE__, 'email[' . gettype($email) . ']=' . $email . ',mod=' . $mod . ' - This should not happen.');
}
// Return rewritten (?) email address
@@ -167,12 +172,15 @@ LIMIT 1",
}
// Change a lot admin account
-function adminsChangeAdminAccount ($postData, $element = '') {
+function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = true) {
// Begin the update
$cache_update = '0';
+ $message = '';
+
foreach ($postData['login'] as $id => $login) {
// Secure id number
$id = bigintval($id);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',login=' . $login);
// When both passwords match update admin account
if ((!empty($element)) && (isset($postData[$element]))) {
@@ -182,7 +190,7 @@ function adminsChangeAdminAccount ($postData, $element = '') {
// Admin account saved
$message = '{--ADMIN_ACCOUNT_SAVED--}';
- } elseif ((isset($postData['pass1'])) && (isset($postData['pass2']))) {
+ } elseif ((!empty($postData['pass1'])) && (!empty($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)
@@ -192,7 +200,9 @@ function adminsChangeAdminAccount ($postData, $element = '') {
$hash = generateHash($postData['pass1'][$id]);
// Save password when set
- if (!empty($postData['pass1'][$id])) $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash));
+ if (!empty($postData['pass1'][$id])) {
+ $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash));
+ } // END - if
// Get admin's id
$adminId = getCurrentAdminId();
@@ -267,39 +277,33 @@ LIMIT 1",
}
} else {
// 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';
+ $SQL = getUpdateSqlFromArray($postData, 'admins', 'id', '%s', array('login', 'id'), $id);
// Run it
SQL_QUERY_ESC($SQL, array(bigintval($id)), __FUNCTION__, __LINE__);
+
+ // Was it updated?
+ if (SQL_AFFECTEDROWS() == 1) {
+ // Admin account saved
+ $message = '{--ADMIN_ACCOUNT_SAVED--}';
+ } else {
+ // Passwords did not match
+ $message = '{--ADMIN_ADMINS_ERROR_PASS_MISMATCH--}';
+ }
}
} // END - foreach
- // Display message
- if (!empty($message)) {
+ // Display message if not empty and allowed
+ if ((!empty($message)) && ($displayMessage === true)) {
+ // Display it
displayMessage($message);
} // END - if
// Remove cache file
runFilterChain('post_form_submited', postRequestArray());
+
+ // Return message
+ return $message;
}
// Make admin accounts editable
@@ -314,35 +318,66 @@ function adminsEditAdminAccount ($postData) {
$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` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
array($id), __FUNCTION__, __LINE__);
if ((SQL_NUMROWS($result) == 1) && ($selected == 1)) {
// Entry found
$content = SQL_FETCHARRAY($result);
- SQL_FREERESULT($result);
// Prepare some more data for the template
$content['id'] = $id;
// Shall we allow changing default ACL?
if ($currMode == 'allow') {
- // Allow chaning it
- $content['mode'] = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}', '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'), $content['mode']);
+ // Allow changing it
+ $content['mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
} else {
// Don't allow it
$content['mode'] = ' ';
}
- $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMIN_ADMINS_LA_MODE_NEW--}'), $content['la_mode']);
// Load row template and switch color
$OUT .= loadTemplate('admin_edit_admins_row', true, $content);
} // END - if
+
+ // Free result
+ SQL_FREERESULT($result);
} // END - foreach
// Load template
loadTemplate('admin_edit_admins', false, $OUT);
}
+// Generate access mode selection box for given admin id
+function generateAdminAccessModeSelectionBox ($adminId = NULL) {
+ // Start the selection box
+ $OUT = '';
+
+ // Return content
+ return $OUT;
+}
+
+// Generate menu mode selection box for given admin it
+function generateAdminMenuModeSelectionBox ($adminId = NULL) {
+ // Start the selection box
+ $OUT = '';
+
+ // Return content
+ return $OUT;
+}
+
// Delete given admin accounts
function adminsDeleteAdminAccount ($postData) {
// Check if this account is the last one which cannot be deleted...
@@ -354,7 +389,7 @@ function adminsDeleteAdminAccount ($postData) {
$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?
@@ -410,7 +445,7 @@ function adminsRemoveAdminAccount ($postData) {
// 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__);
+ $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
@@ -440,9 +475,11 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
// 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__);
+
+ // 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 (0, '%s')",
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`,`mail_template`) VALUES (0, '%s')",
array($template), __FUNCTION__, __LINE__);
} else {
// Load admin ids...
@@ -638,9 +675,9 @@ function getAdminLastFailure ($adminId) {
return $data['last_failure'];
}
-// ---------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
// Wrapper functions
-// ---------------------------------------------------------------------------
+//-----------------------------------------------------------------------------
// Wrapper function to check wether expert setting warning is enabled
function isAdminsExpertWarningEnabled () {