* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2011 by Mailer Developer Team *
+ * 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 *
$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.');
+ reportBug(__FUNCTION__, __LINE__, 'email[' . gettype($email) . ']=' . $email . ',mod=' . $mod . ' - This should not happen.');
}
// Return rewritten (?) email address
array(
$login,
$postData['email'][$id],
- $postData['mode'][$id],
+ $postData['access_mode'][$id],
$postData['la_mode'][$id],
$id
), __FUNCTION__, __LINE__);
// Shall we allow changing default ACL?
if ($currMode == 'allow') {
// Allow changing it
- $content['mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
+ $content['access_mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}';
} else {
// Don't allow it
- $content['mode'] = ' ';
+ $content['access_mode'] = ' ';
}
// Load row template and switch color
// Generate access mode selection box for given admin id
function generateAdminAccessModeSelectionBox ($adminId = NULL) {
// Start the selection box
- $OUT = '<select name="mode[' . $adminId . ']" size="1" class="form_select">';
+ $OUT = '<select name="access_mode[' . $adminId . ']" size="1" class="form_select">';
// Add option list
- $OUT .= generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}', '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'), getAdminDefaultAcl($adminId));
+ $OUT .= generateOptions(
+ '/ARRAY/',
+ array(
+ 'allow',
+ 'deny'
+ ), array(
+ '{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}',
+ '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'
+ ),
+ getAdminDefaultAcl($adminId)
+ );
// Finish it
$OUT .= '</select>';
// Generate menu mode selection box for given admin it
function generateAdminMenuModeSelectionBox ($adminId = NULL) {
// Start the selection box
- $OUT = '<select name="la_mode[{%pipe,makeNullToZero=' . makeZeroToNull($adminId) . '%}]" size="1" class="form_select">';
+ $OUT = '<select name="la_mode[{%pipe,convertNullToZero=' . convertZeroToNull($adminId) . '%}]" size="1" class="form_select">';
// Add option list
- $OUT .= generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMIN_ADMINS_LA_MODE_NEW--}'), getAdminMenuMode($adminId));
+ $OUT .= generateOptions(
+ '/ARRAY/',
+ array(
+ 'global',
+ 'OLD',
+ 'NEW'
+ ), array(
+ '{--ADMIN_ADMINS_LA_MODE_GLOBAL--}',
+ '{--ADMIN_ADMINS_LA_MODE_OLD--}',
+ '{--ADMIN_ADMINS_LA_MODE_NEW--}'
+ ),
+ getAdminMenuMode($adminId)
+ );
// Finish it
$OUT .= '</select>';
$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?
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;
`id`,
`login`,
`email`,
- `default_acl` AS `mode`,
+ `default_acl` AS `access_mode`,
`la_mode`
FROM
`{?_MYSQL_PREFIX?}_admins`
$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);
// 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);
// 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__);
+
+ // 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
// "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
));
}
}
}
+ // 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
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
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
// 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');
}
projects / mailer.git / blobdiff