X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=a3ff87855c6b9e0f673e233cc026b63bba371021;hb=291f6c32bfb7d2f5cafcf9c394b202065cbb5322;hp=2b7c2de65247a1b10f0f0f6fc061e4be88451a49;hpb=0f3a135204757cc8750262871c8e62c42300acb4;p=mailer.git
diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 2b7c2de652..a3ff87855c 100644
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -16,8 +16,8 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
- * For more information visit: http://www.mxchange.org *
+ * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * 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 *
@@ -138,13 +138,13 @@ function isAdminsAllowedByAcl ($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__);
@@ -153,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
+ reportBug(__FUNCTION__, __LINE__, 'email[' . gettype($email) . ']=' . $email . ',mod=' . $mod . ' - This should not happen.');
}
// Return rewritten (?) email address
@@ -177,13 +180,17 @@ function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = t
foreach ($postData['login'] as $id => $login) {
// Secure id number
$id = bigintval($id);
- /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',login=' . $login);
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',login=' . $login);
// When both passwords match update admin account
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), __FUNCTION__, __LINE__);
+ array(
+ $element,
+ $postData[$element][$id],
+ $id
+ ), __FUNCTION__, __LINE__);
// Admin account saved
$message = '{--ADMIN_ACCOUNT_SAVED--}';
@@ -198,7 +205,7 @@ function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = t
// Save password when set
if (!empty($postData['pass1'][$id])) {
- $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash));
+ $add = sprintf(",`password`='%s'", SQL_ESCAPE($hash));
} // END - if
// Get admin's id
@@ -243,7 +250,7 @@ LIMIT 1",
array(
$login,
$postData['email'][$id],
- $postData['mode'][$id],
+ $postData['access_mode'][$id],
$postData['la_mode'][$id],
$id
), __FUNCTION__, __LINE__);
@@ -274,28 +281,7 @@ 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;
- } // END - if
-
- // 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__);
@@ -311,11 +297,10 @@ LIMIT 1",
}
} // END - foreach
- // Display message
- if (!empty($message)) {
- if ($displayMessage === true) {
- displayMessage($message);
- } // END - if
+ // Display message if not empty and allowed
+ if ((!empty($message)) && ($displayMessage === true)) {
+ // Display it
+ displayMessage($message);
} // END - if
// Remove cache file
@@ -337,35 +322,88 @@ 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['access_mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
} else {
// Don't allow it
- $content['mode'] = ' ';
+ $content['access_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...
@@ -377,15 +415,15 @@ 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 `access_mode`, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1",
array($id), __FUNCTION__, __LINE__);
- // Do we have an entry?
+ // Is there an entry?
if (SQL_NUMROWS($result) == 1) {
// Entry found, so load data
$content = SQL_FETCHARRAY($result);
- $content['mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode']) . '--}';
- $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
+ $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
+ $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
// Prepare some more data
$content['id'] = $id;
@@ -433,12 +471,21 @@ 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 `access_mode`,
+ `la_mode`
+FROM
+ `{?_MYSQL_PREFIX?}_admins`
+ORDER BY
+ `login` ASC', __FUNCTION__, __LINE__);
$OUT = '';
while ($content = SQL_FETCHARRAY($result)) {
// Compile some variables
- $content['mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode']) . '--}';
- $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
+ $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}';
+ $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}';
// Load row template and switch color
$OUT .= loadTemplate('admin_list_admins_row', true, $content);
@@ -453,7 +500,7 @@ function adminsListAdminAccounts() {
// Sends out mail to all administrators
// IMPORTANT: Please use sendAdminNotification() instead of calling this function directly
-function sendAdminsEmails ($subj, $template, $content, $userid) {
+function sendAdminsEmails ($subject, $template, $content, $userid) {
// Trim template name
$template = trim($template);
@@ -467,14 +514,18 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
// 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__);
+
+ // Select all email adresses (default)
+ $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC',
+ __FUNCTION__, __LINE__);
} else {
// Load admin ids...
// @TODO This can be, somehow, rewritten
$adminIds = array();
while ($content = SQL_FETCHARRAY($result)) {
- $adminIds[] = $content['admin_id'];
+ array_push($adminIds, $content['admin_id']);
} // END - while
// Free memory
@@ -485,15 +536,18 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
// "implode" ids and query string
$adminId = implode(',', $adminIds);
+
+ // To which admin shall we sent it?
if ($adminId == '-1') {
+ // Is an "event"
if (isExtensionActive('events')) {
// Add line to user events
- EVENTS_ADD_LINE($subj, $message, $userid);
+ EVENTS_ADD_LINE($subject, $message, $userid);
} else {
// Log error for debug
- logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,userid=%s",
+ logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension 'ext-events' missing: template=%s,subj=%s,userid=%s",
$template,
- $subj,
+ $subject,
$userid
));
}
@@ -508,9 +562,18 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
}
}
+ // Default is no special mail header
+ $mailHeader = '';
+
+ // Is the template a bug report?
+ if ($template == 'admin_report_bug') {
+ // Then set 'Reply-To:' again
+ $mailHeader = 'Reply-To: webmaster@mxchange.org' . chr(10);
+ } // END - if
+
// Load email addresses and send away
while ($content = SQL_FETCHARRAY($result)) {
- sendEmail($content['email'], $subj, $message);
+ sendEmail($content['email'], $subject, $message, 'N', $mailHeader);
} // END - while
// Free memory
@@ -595,7 +658,7 @@ function getAminsExpertWarning () {
function getAdminLoginFailures ($adminId) {
// Admin login should not be empty
if (empty($adminId)) {
- debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.');
+ reportBug(__FUNCTION__, __LINE__, 'adminId is empty.');
} // END - if
// By default no admin is found
@@ -613,7 +676,7 @@ function getAdminLoginFailures ($adminId) {
$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?
+ // Is there an entry?
if (SQL_NUMROWS($result) == 1) {
// Get it
$data = SQL_FETCHARRAY($result);
@@ -631,7 +694,7 @@ function getAdminLoginFailures ($adminId) {
function getAdminLastFailure ($adminId) {
// Admin login should not be empty
if (empty($adminId)) {
- debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.');
+ reportBug(__FUNCTION__, __LINE__, 'adminId is empty.');
} // END - if
// By default no admin is found
@@ -649,7 +712,7 @@ function getAdminLastFailure ($adminId) {
$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?
+ // Is there an entry?
if (SQL_NUMROWS($result) == 1) {
// Get it
$data = SQL_FETCHARRAY($result);
@@ -667,10 +730,15 @@ function getAdminLastFailure ($adminId) {
// Wrapper functions
//-----------------------------------------------------------------------------
-// Wrapper function to check wether expert setting warning is enabled
+// Wrapper function to check whether expert setting warning is enabled
function isAdminsExpertWarningEnabled () {
return (getAminsExpertWarning() == 'Y');
}
+// Wrapper function to check whether expert setting is enabled
+function isAdminsExpertSettingEnabled () {
+ return (getAminsExpertSettings() == 'Y');
+}
+
// [EOF]
?>