X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=6fc7d1bd973a8ba0d198ba0ee07953477b315bee;hp=2b393d7377c98e925234a84eaeb5a4322ac14169;hb=1fe7cf281be6832ba105934537aba5127892c576;hpb=08b3c51b70b6498fd92a2760979d64470ad1b586

diff --git a/inc/functions.php b/inc/functions.php
index 2b393d7377..6fc7d1bd97 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1403,31 +1403,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 +1438,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 +1452,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 +1465,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 +1478,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 +1491,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 +1504,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 +1517,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 +1559,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 +1586,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
+				USERLOG_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 +1620,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);
@@ -3238,6 +3250,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\">".ADMIN_ID_404_1.$aid.ADMIN_ID_404_2."</div>";
+		}
+	} // END - if
+
+	// Return result
+	return $admin;
+}
+
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////