X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ffunctions.php;h=8b416e865c721fa80ad535632a30afbe752e7a18;hp=6484f86506c605f8010c22e206c570b431cd0c14;hb=0369c36aaab5af6ed44da1e13a53baef285f79b4;hpb=f33497b304b5b1ab26e9b18b141f755bd97fc9c1

diff --git a/inc/functions.php b/inc/functions.php
index 6484f86506..8b416e865c 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -597,7 +597,7 @@ function FRAMETESTER($URL) {
 }
 //
 function SELECTION_COUNT($array) {
-	$ret = "0";
+	$ret = 0;
 	if (is_array($array)) {
 		foreach ($array as $key => $sel) {
 			if (!empty($sel)) $ret++;
@@ -1090,7 +1090,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 	case "day": // Day
 		for ($idx = 1; $idx < 32; $idx++)
 		{
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
@@ -1099,7 +1099,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 	case "month": // Month
 		foreach ($MONTH_DESCR as $month => $descr)
 		{
-			$OUT .= "      <OPTION value=\"".$month."\"";
+			$OUT .= "<OPTION value=\"".$month."\"";
 			if ($DEFAULT == $month) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$descr."</OPTION>\n";
 		}
@@ -1114,7 +1114,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 		{
 			for ($idx = $YEAR; $idx < ($YEAR + 11); $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\"";
+				$OUT .= "<OPTION value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
@@ -1124,17 +1124,17 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 			// Current year minus 1
 			for ($idx = 2003; $idx <= ($YEAR + 1); $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\">".$idx."</OPTION>\n";
+				$OUT .= "<OPTION value=\"".$idx."\">".$idx."</OPTION>\n";
 			}
 		}
 		 else
 		{
 			// Get current year and subtract 16 (for erotic content)
-			$OUT .= "      <OPTION value=\"1929\">&lt;1930</OPTION>\n";
+			$OUT .= "<OPTION value=\"1929\">&lt;1930</OPTION>\n";
 			$YEAR = date('Y', time()) - 16;
 			for ($idx = 1930; $idx <= $YEAR; $idx++)
 			{
-				$OUT .= "      <OPTION value=\"".$idx."\"";
+				$OUT .= "<OPTION value=\"".$idx."\"";
 				if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
@@ -1143,30 +1143,27 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 
 	case "sec":
 	case "min":
-		for ($idx = 0; $idx < 60; $idx+=5)
-		{
+		for ($idx = 0; $idx < 60; $idx+=5) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
 		break;
 
 	case "hour":
-		for ($idx = 0; $idx < 24; $idx++)
-		{
+		for ($idx = 0; $idx < 24; $idx++) {
 			if (strlen($idx) == 1) $idx = "0".$idx;
-			$OUT .= "      <OPTION value=\"".$idx."\"";
+			$OUT .= "<OPTION value=\"".$idx."\"";
 			if ($DEFAULT == $idx) $OUT .= " selected=\"selected\"";
 			$OUT .= ">".$idx."</OPTION>\n";
 		}
 		break;
 
 	case "yn":
-		$OUT .= "      <OPTION value=\"Y\"";
+		$OUT .= "<OPTION value=\"Y\"";
 		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
-		$OUT .= ">".YES."</OPTION>
-			<OPTION value=\"N\"";
+		$OUT .= ">".YES."</OPTION>\n<OPTION value=\"N\"";
 		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
 		$OUT .= ">".NO."</OPTION>\n";
 		break;
@@ -1302,17 +1299,20 @@ function GENERATE_IMAGE($img_code, $header=true) {
 	// Remove image from memory
 	imagedestroy($image);
 }
-function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false)
-{
+// Create selection box or array of splitted timestamp
+function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="center", $return_array=false) {
 	// Calculate 15-seconds timestamp (15-seconds-steps shall be fine ;) )
 	$timestamp = round($timestamp / 15) * 15;
+
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
 	$M1 = date("m", time());
 	$M2 = date("m", (time() + $timestamp));
+
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
 	if ((floor($TEST) == $TEST) && ($M1 == "02") && ($M2 > "02"))  $SWITCH = ONE_DAY;
+
 	// First of all years...
 	$Y = abs(floor($timestamp / (31536000 + $SWITCH)));
 	// Next months...
@@ -1327,11 +1327,11 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 	$m = abs(floor($timestamp / 60 - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 60 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 60) - $W * 7 * 24 * 60 - $D * 24 * 60 - $h * 60));
 	// And at last seconds...
 	$s = abs(floor($timestamp - $Y * (365 + $SWITCH / ONE_DAY) * 24 * 3600 - ($M / 12 * (365 + $SWITCH / ONE_DAY) * 24 * 3600) - $W * 7 * 24 * 3600 - $D * 24 * 3600 - $h * 3600 - $m * 60));
+
 	//
 	// Now we convert them in seconds...
 	//
-	if ($return_array)
-	{
+	if ($return_array) {
 		// Just put all data in an array for later use
 		$OUT = array(
 			'YEARS'   => $Y,
@@ -1342,61 +1342,57 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 			'MINUTES' => $m,
 			'SECONDS' => $s
 		);
-	}
-	 else
-	{
+	} else {
 		// Generate table
 		$OUT  = "<DIV align=\"".$align."\">\n";
 		$OUT .= "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
 		$OUT .= "<TR>\n";
-		if (ereg('Y', $display) || (empty($display)))
-		{
+
+		if (ereg('Y', $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._YEARS."</STRONG></TD>\n";
 		}
-		if (ereg("M", $display) || (empty($display)))
-		{
+
+		if (ereg("M", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._MONTHS."</STRONG></TD>\n";
 		}
-		if (ereg("W", $display) || (empty($display)))
-		{
+
+		if (ereg("W", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._WEEKS."</STRONG></TD>\n";
 		}
-		if (ereg("D", $display) || (empty($display)))
-		{
+
+		if (ereg("D", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._DAYS."</STRONG></TD>\n";
 		}
-		if (ereg("h", $display) || (empty($display)))
-		{
+
+		if (ereg("h", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._HOURS."</STRONG></TD>\n";
 		}
-		if (ereg("m", $display) || (empty($display)))
-		{
+
+		if (ereg("m", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._MINUTES."</STRONG></TD>\n";
 		}
-		if (ereg("s", $display) || (empty($display)))
-		{
+
+		if (ereg("s", $display) || (empty($display))) {
 			$OUT .= "  <TD align=\"center\" class=\"admin_title bottom\"><STRONG class=\"tiny\">"._SECONDS."</STRONG></TD>\n";
 		}
+
 		$OUT .= "</TR>\n";
 		$OUT .= "<TR>\n";
-		if (ereg('Y', $display) || (empty($display)))
-		{
+
+		if (ereg('Y', $display) || (empty($display))) {
 			// Generate year selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 10; $idx++)
-			{
+			for ($idx = 0; $idx <= 10; $idx++) {
 				$OUT .= "    <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $Y) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ye\" value=\"0\">\n";
 		}
-		if (ereg("M", $display) || (empty($display)))
-		{
+
+		if (ereg("M", $display) || (empty($display))) {
 			// Generate month selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 11; $idx++)
@@ -1406,89 +1402,72 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mo\" value=\"0\">\n";
 		}
-		if (ereg("W", $display) || (empty($display)))
-		{
+
+		if (ereg("W", $display) || (empty($display))) {
 			// Generate week selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 4; $idx++)
-			{
+			for ($idx = 0; $idx <= 4; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $W) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_we\" value=\"0\">\n";
 		}
-		if (ereg("D", $display) || (empty($display)))
-		{
+
+		if (ereg("D", $display) || (empty($display))) {
 			// Generate day selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 31; $idx++)
-			{
+			for ($idx = 0; $idx <= 31; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $D) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_da\" value=\"0\">\n";
 		}
-		if (ereg("h", $display) || (empty($display)))
-		{
+
+		if (ereg("h", $display) || (empty($display))) {
 			// Generate hour selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 23; $idx++)
-			{
+			for ($idx = 0; $idx <= 23; $idx++) 	{
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $h) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ho\" value=\"0\">\n";
 		}
-		if (ereg("m", $display) || (empty($display)))
-		{
+
+		if (ereg("m", $display) || (empty($display))) {
 			// Generate minute selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 59; $idx++)
-			{
+			for ($idx = 0; $idx <= 59; $idx++) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $m) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mi\" value=\"0\">\n";
 		}
-		if (ereg("s", $display) || (empty($display)))
-		{
+
+		if (ereg("s", $display) || (empty($display))) {
 			// Generate second selection
 			$OUT .= "  <TD align=\"center\"><SELECT class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
-			for ($idx = 0; $idx <= 45; $idx+=15)
-			{
+			for ($idx = 0; $idx <= 45; $idx += 15) {
 				$OUT .= "  <OPTION class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $s) $OUT .= " selected default";
 				$OUT .= ">".$idx."</OPTION>\n";
 			}
 			$OUT .= "  </SELECT></TD>\n";
-		}
-		 else
-		{
+		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_se\" value=\"0\">\n";
 		}
 		$OUT .= "</TR>\n";
@@ -1500,7 +1479,8 @@ function CREATE_TIME_SELECTIONS($timestamp, $prefix="", $display="", $align="cen
 }
 //
 function CREATE_TIMESTAMP_FROM_SELECTIONS($prefix, $POST) {
-	$ret = "0";
+	$ret = 0;
+
 	// Do we have a leap year?
 	$SWITCH = 0;
 	$TEST = date('Y', time()) / 4;
@@ -2365,7 +2345,7 @@ function GET_DIR_AS_ARRAY ($baseDir, $prefix) {
 }
 // Load more reset scripts
 function RESET_ADD_INCLUDES () {
-	global $_CONFIG, $INC_POOL;
+	global $_CONFIG;
 
 	// Is the reset set or old sql_patches?
 	if ((!isBooleanConstantAndTrue('__DAILY_RESET')) || (GET_EXT_VERSION("sql_patches") < "0.4.5")) {
@@ -2374,7 +2354,7 @@ function RESET_ADD_INCLUDES () {
 	} // END - if
 
 	// Get more daily reset scripts
-	$INC_POOL = array_merge($INC_POOL, GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_"));
+	$INC_POOL = GET_DIR_AS_ARRAY(PATH."inc/reset/", "reset_");
 
 	// Create current week mark
 	$currWeek = date("W", time());
@@ -2399,6 +2379,9 @@ function RESET_ADD_INCLUDES () {
 		// Update config
 		UPDATE_CONFIG("last_month", $currMonth);
 	} // END - if
+
+	// Return array
+	return $INC_POOL;
 }
 // Handle extra values
 function HANDLE_EXTRA_VALUES ($filterFunction, $value, $extraValue) {