mailer project continued:

[mailer.git] / inc / libs / admins_functions.php

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index 15f781889d7a8200bde175ae1a342b2735776c67..5f5075a574ff7e8f131933632b448db9ea4fd8cf 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -16,7 +16,7 @@
  * $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 *
@@ -164,7 +164,7 @@ LIMIT 1",
                $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
@@ -354,7 +354,17 @@ function generateAdminAccessModeSelectionBox ($adminId = NULL) {
        $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>';
@@ -369,7 +379,19 @@ function generateAdminMenuModeSelectionBox ($adminId = NULL) {
        $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>';
@@ -474,7 +496,7 @@ ORDER BY
 
 // 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);
 
@@ -490,12 +512,16 @@ function sendAdminsEmails ($subj, $template, $content, $userid) {
                // 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
@@ -506,15 +532,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
                                ));
                        }
@@ -529,9 +558,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
@@ -616,7 +654,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
@@ -652,7 +690,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
@@ -688,7 +726,7 @@ 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');
 }