projects / mailer.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Last references to now replaced with mergeConfig()
[mailer.git] / inc / functions.php
diff --git a/inc/functions.php b/inc/functions.php
index 2b393d7377c98e925234a84eaeb5a4322ac14169..591a56c702a432cd908f76714cba97d5b76506a2 100644 (file)
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -185,15 +185,17 @@ function OUTPUT_RAW ($HTML) {
 function addFatalMessage ($message, $extra="") {
        global $FATAL;
 
-       if (empty($extra)) {
-               // Regular text message to add to $FATAL
-               $FATAL[] = $message;
-       } else {
+       if (is_array($extra)) {
+               // Multiple extras for a message with masks
+               $message = call_user_func_array('sprintf', $extra);
+       } elseif (!empty($extra)) {
                // $message is text with a mask plus extras to insert into the text
                $message = sprintf($message, $extra);
-               $FATAL[] = $message;
        }
 
+       // Add message to $FATAL
+       $FATAL[] = $message;
+
        // Log fatal messages away
        DEBUG_LOG(__FUNCTION__, __LINE__, " message={$message}");
 }
@@ -1403,31 +1405,31 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                $OUT .= "<tr>\n";
 
                if (ereg('Y', $display) || (empty($display))) {
-                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._YEARS."</strong></td>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_YEARS--}</strong></td>\n";
                }
 
                if (ereg("M", $display) || (empty($display))) {
-                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MONTHS."</strong></td>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_MONTHS--}</strong></td>\n";
                }
 
                if (ereg("W", $display) || (empty($display))) {
-                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._WEEKS."</strong></td>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_WEEKS--}</strong></td>\n";
                }
 
                if (ereg("D", $display) || (empty($display))) {
-                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._DAYS."</strong></td>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_DAYS--}</strong></td>\n";
                }
 
                if (ereg("h", $display) || (empty($display))) {
-                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._HOURS."</strong></td>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_HOURS--}</strong></td>\n";
                }
 
                if (ereg("m", $display) || (empty($display))) {
-                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._MINUTES."</strong></td>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_MINUTES--}</strong></td>\n";
                }
 
                if (ereg("s", $display) || (empty($display))) {
-                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">"._SECONDS."</strong></td>\n";
+                       $OUT .= "  <td align=\"center\" class=\"admin_title bottom\"><div class=\"tiny\">{--_SECONDS--}</strong></td>\n";
                }
 
                $OUT .= "</tr>\n";
@@ -1438,7 +1440,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                        $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 10; $idx++) {
                                $OUT .= "    <option class=\"mini_select\" value=\"".$idx."\"";
-                               if ($idx == $Y) $OUT .= " selected default";
+                               if ($idx == $Y) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$idx."</option>\n";
                        }
                        $OUT .= "  </select></td>\n";
@@ -1452,7 +1454,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                        for ($idx = 0; $idx <= 11; $idx++)
                        {
                                        $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-                               if ($idx == $M) $OUT .= " selected default";
+                               if ($idx == $M) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$idx."</option>\n";
                        }
                        $OUT .= "  </select></td>\n";
@@ -1465,7 +1467,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                        $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 4; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-                               if ($idx == $W) $OUT .= " selected default";
+                               if ($idx == $W) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$idx."</option>\n";
                        }
                        $OUT .= "  </select></td>\n";
@@ -1478,7 +1480,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                        $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 31; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-                               if ($idx == $D) $OUT .= " selected default";
+                               if ($idx == $D) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$idx."</option>\n";
                        }
                        $OUT .= "  </select></td>\n";
@@ -1491,7 +1493,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                        $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 23; $idx++)      {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-                               if ($idx == $h) $OUT .= " selected default";
+                               if ($idx == $h) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$idx."</option>\n";
                        }
                        $OUT .= "  </select></td>\n";
@@ -1504,7 +1506,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                        $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 59; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-                               if ($idx == $m) $OUT .= " selected default";
+                               if ($idx == $m) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$idx."</option>\n";
                        }
                        $OUT .= "  </select></td>\n";
@@ -1517,7 +1519,7 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
                        $OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
                        for ($idx = 0; $idx <= 59; $idx++) {
                                $OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
-                               if ($idx == $s) $OUT .= " selected default";
+                               if ($idx == $s) $OUT .= " selected=\"selected\"";
                                $OUT .= ">".$idx."</option>\n";
                        }
                        $OUT .= "  </select></td>\n";
@@ -1559,9 +1561,10 @@ function CREATE_TIMESTAMP_FROM_SELECTIONS ($prefix, $POST) {
        // Return calculated value
        return $ret;
 }
+
 // Sends out mail to all administrators
 // IMPORTANT: Please use SEND_ADMIN_NOTIFCATION() for now!
-function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
+function SEND_ADMIN_EMAILS_PRO ($subj, $template, $content, $UID) {
        // Trim template name
        $template = trim($template);
 
@@ -1585,17 +1588,28 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
                $aids = array();
                while (list($aid) = SQL_FETCHROW($result)) {
                        $aids[] = $aid;
-               }
+               } // END - while
 
                // Free memory
                SQL_FREERESULT($result);
 
+               // Init result
+               $result = false;
+
                // "implode" IDs and query string
                $aid = implode(",", $aids);
                if ($aid == "-1") {
-                       // Add line to userlog
-                       USERLOG_ADD_LINE($subj, $msg, $UID);
-                       return;
+                       if (EXT_IS_ACTIVE("events")) {
+                               // Add line to user events
+                               EVENTS_ADD_LINE($subj, $msg, $UID);
+                       } else {
+                               // Log error for debug
+                               DEBUG_LOG(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,UID=%s",
+                                       $template,
+                                       $subj,
+                                       $UID
+                               ));
+                       }
                } elseif ($aid == "0") {
                        // Select all email adresses
                        $result = SQL_QUERY("SELECT email FROM `{!_MYSQL_PREFIX!}_admins` ORDER BY `id`", __FILE__, __LINE__);
@@ -1608,7 +1622,7 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
        // Load email addresses and send away
        while (list($email) = SQL_FETCHROW($result)) {
                SEND_EMAIL($email, $subj, $msg);
-       }
+       } // END - while
 
        // Free memory
        SQL_FREERESULT($result);
@@ -2821,6 +2835,12 @@ function IF_APACHE_MODULE_LOADED ($apacheModule) {
        return (((function_exists('apache_get_modules')) && (in_array($apacheModule, apache_get_modules()))) || (!function_exists('apache_get_modules')));
 }
 
+// Merges $_CONFIG with data in given array
+function mergeConfig ($newConfig) {
+       global $_CONFIG;
+       $_CONFIG = merge_array($_CONFIG, $newConfig);
+}
+
 // Getter for $_CONFIG entries
 function getConfig ($entry) {
        global $_CONFIG;
@@ -3238,6 +3258,34 @@ function REDIRCT_ON_UNINSTALLED_EXTENSION ($ext_name) {
        } // END - if
 }
 
+// Generate a "link" for the given admin id (aid)
+function GENERATE_AID_LINK ($aid) {
+       // No assigned admin is default
+       $admin = "<div class=\"admin_note\">{--ADMIN_NO_ADMIN_ASSIGNED--}</div>";
+
+       // Zero? = Not assigned
+       if ($aid == "0") {
+               // Load admin's login
+               $login = GET_ADMIN_LOGIN($aid);
+               if ($login != "***") {
+                       // Is the extension there?
+                       if (EXT_IS_ACTIVE("admins")) {
+                               // Admin found
+                               $admin = "<a href=\"".ADMINS_CREATE_EMAIL_LINK(GET_ADMIN_EMAIL($aid))."\">".$login."</a>";
+                       } else {
+                               // Extension not found
+                               $admin = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), "admins");
+                       }
+               } else {
+                       // Maybe deleted?
+                       $admin = "<div class=\"admin_note\">".sprintf(getMessage('ADMIN_ID_404'), $aid)."</div>";
+               }
+       } // END - if
+
+       // Return result
+       return $admin;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////
Mailer-Project repository