X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=b326dab09832063588ebb76fd1a328c91088a55e;hb=f6ccb87413901e0352319385471134dd2d4ba966;hp=03d6b7d1ae343d0787bcc239c41a453ec84bf5bc;hpb=8c36a8c89b8231b8d03b2495ceda82a31546406b;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 03d6b7d1ae..b326dab098 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -199,7 +199,7 @@ function addFatalMessage ($message, $extra="") {
 }
 
 // Getter for total fatal message count
-function getTotalFatalMessages () {
+function getTotalFatalErrors () {
 	global $FATAL;
 
 	// Init coun
@@ -1417,133 +1417,133 @@ function CREATE_TIME_SELECTIONS ($timestamp, $prefix="", $display="", $align="ce
 	} else {
 		// Generate table
 		$OUT  = "<div align=\"".$align."\">\n";
-		$OUT .= "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
-		$OUT .= "<TR>\n";
+		$OUT .= "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_table dashed\">\n";
+		$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";
-		$OUT .= "<TR>\n";
+		$OUT .= "</tr>\n";
+		$OUT .= "<tr>\n";
 
 		if (ereg('Y', $display) || (empty($display))) {
 			// Generate year selection
-			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ye\" size=\"1\">\n";
+			$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";
 				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </select></TD>\n";
+			$OUT .= "  </select></td>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ye\" value=\"0\" />\n";
 		}
 
 		if (ereg("M", $display) || (empty($display))) {
 			// Generate month selection
-			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
+			$OUT .= "  <td align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mo\" size=\"1\">\n";
 			for ($idx = 0; $idx <= 11; $idx++)
 			{
 					$OUT .= "  <option class=\"mini_select\" value=\"".$idx."\"";
 				if ($idx == $M) $OUT .= " selected default";
 				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </select></TD>\n";
+			$OUT .= "  </select></td>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mo\" value=\"0\" />\n";
 		}
 
 		if (ereg("W", $display) || (empty($display))) {
 			// Generate week selection
-			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_we\" size=\"1\">\n";
+			$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";
 				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </select></TD>\n";
+			$OUT .= "  </select></td>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_we\" value=\"0\" />\n";
 		}
 
 		if (ereg("D", $display) || (empty($display))) {
 			// Generate day selection
-			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_da\" size=\"1\">\n";
+			$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";
 				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </select></TD>\n";
+			$OUT .= "  </select></td>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_da\" value=\"0\">\n";
 		}
 
 		if (ereg("h", $display) || (empty($display))) {
 			// Generate hour selection
-			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_ho\" size=\"1\">\n";
+			$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";
 				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </select></TD>\n";
+			$OUT .= "  </select></td>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_ho\" value=\"0\">\n";
 		}
 
 		if (ereg("m", $display) || (empty($display))) {
 			// Generate minute selection
-			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_mi\" size=\"1\">\n";
+			$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";
 				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </select></TD>\n";
+			$OUT .= "  </select></td>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_mi\" value=\"0\">\n";
 		}
 
 		if (ereg("s", $display) || (empty($display))) {
 			// Generate second selection
-			$OUT .= "  <TD align=\"center\"><select class=\"mini_select\" name=\"".$prefix."_se\" size=\"1\">\n";
+			$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";
 				$OUT .= ">".$idx."</option>\n";
 			}
-			$OUT .= "  </select></TD>\n";
+			$OUT .= "  </select></td>\n";
 		} else {
 			$OUT .= "<INPUT type=\"hidden\" name=\"".$prefix."_se\" value=\"0\">\n";
 		}
-		$OUT .= "</TR>\n";
-		$OUT .= "</TABLE>\n";
+		$OUT .= "</tr>\n";
+		$OUT .= "</table>\n";
 		$OUT .= "</div>\n";
 		// Return generated HTML code
 	}
@@ -1662,7 +1662,7 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
 	$SEP = ""; $TOP = "";
 	if (!$show_form) {
 		$TOP = " top2";
-		$SEP = "<TR><TD colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</TD></TR>";
+		$SEP = "<tr><td colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</td></tr>";
 	}
 
 	$NAV = "";
@@ -1991,9 +1991,9 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 	return $OUT;
 }
 // Function for backward-compatiblity
-function ADD_CATEGORY_TABLE ($MODE, $return=false) {
+function ADD_CATEGORY_table ($MODE, $return=false) {
 	// Load it from the register extension
-	return REGISTER_ADD_CATEGORY_TABLE ($MODE, $return);
+	return REGISTER_ADD_CATEGORY_table ($MODE, $return);
 }
 // Generate an email link
 function CREATE_EMAIL_LINK ($email, $table = "admins") {
@@ -2601,22 +2601,22 @@ function HANDLE_LOGIN_FAILTURES ($accessLevel) {
 	$OUT = "";
 
 	// Is the session data set?
-	if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failtures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
+	if ((isSessionVariableSet('mxchange_'.$accessLevel.'_failures')) && (isSessionVariableSet('mxchange_'.$accessLevel.'_last_fail'))) {
 		// Ignore zero values
-		if (get_session('mxchange_'.$accessLevel.'_failtures') > 0) {
-			// Non-guest has login failtures found, get both data and prepare it for template
+		if (get_session('mxchange_'.$accessLevel.'_failures') > 0) {
+			// Non-guest has login failures found, get both data and prepare it for template
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):accessLevel={$accessLevel}<br />\n";
 			$content = array(
-				'login_failtures' => get_session('mxchange_'.$accessLevel.'_failtures'),
-				'last_failture'   => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
+				'login_failures' => get_session('mxchange_'.$accessLevel.'_failures'),
+				'last_failure'   => MAKE_DATETIME(get_session('mxchange_'.$accessLevel.'_last_fail'), "2")
 			);
 
 			// Load template
-			$OUT = LOAD_TEMPLATE("login_failtures", true, $content);
+			$OUT = LOAD_TEMPLATE("login_failures", true, $content);
 		} // END - if
 
 		// Reset session data
-		set_session('mxchange_'.$accessLevel.'_failtures', "");
+		set_session('mxchange_'.$accessLevel.'_failures', "");
 		set_session('mxchange_'.$accessLevel.'_last_fail', "");
 	} // END - if
 
@@ -3013,6 +3013,23 @@ function READ_FILE ($FQFN, $sqlPrepare = false) {
 	return $content;
 }
 
+// Writes content to a file
+function WRITE_FILE ($FQFN, $content) {
+	// Is the function there?
+	if (function_exists('file_put_contents')) {
+		// Write it directly
+		file_put_contents($FQFN, $content);
+	} else {
+		// Write it with fopen
+		$fp = fopen($FQFN, 'w') or mxchange_die("Cannot write file ".basename($FQFN)."!");
+		fwrite($fp, $content);
+		fclose($fp);
+
+		// Set CHMOD rights
+		chmod($FQFN, 0644);
+	}
+}
+
 // Generates an error code from given account status
 function GEN_ERROR_CODE_FROM_ACCOUNT_STATUS ($status) {
 	// Default error code if unknown account status
@@ -3043,6 +3060,48 @@ function clearOutputBuffer () {
 	} // END - if
 }
 
+// "Getter" for revision/version data
+function getActualVersion ($type = 0) {
+	// By default nothing is new... ;-)
+	$new = false;
+
+	// FQFN of revision file
+	$FQFN = sprintf("%sinc/cache/.revision", PATH);
+
+	// Check for revision file
+	if (!FILE_READABLE($FQFN)) {
+		// Not found, so we need to create it
+		$new = true;
+	} else {
+		// Revision file found
+		$ins_vers = explode("\n", READ_FILE($FQFN));
+
+		// Is the content valid?
+		if ((!is_array($ins_vers)) || (count($ins_vers) <= 0) || (!isset($ins_vers[$type])) || ($ins_vers[0]) == "new") {
+			// File needs update!
+			$new = true;
+		} else {
+			// Revision-File has valid Data and isn't 'new' so return the Rev-Number
+			return trim($ins_vers[$type]);
+		}
+	}
+
+	if ($new)  {
+		// no Revision-File or has no valid Data so read the Revision from the Server.
+		$version = GET_URL("check-updates3.php");
+
+		// Prepare content
+		$akt_vers[] = trim($version[10]);
+		$akt_vers[] = trim($version[9]);
+		$akt_vers[] = trim($version[8]);
+
+		// Write file
+		WRITE_FILE($FQFN, implode("\n", $akt_vers));
+
+		// Return requested content
+		return trim($akt_vers[$type]);
+	}
+}
 //////////////////////////////////////////////////
 // AUTOMATICALLY RE-GENERATED MISSING FUNCTIONS //
 //////////////////////////////////////////////////