X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=d293cc048aa7b2118497949cfa206ec0970357f7;hb=cca98f57dff720b174d21d071cee8303462485d7;hp=3de2ab98b215cf45952a0a3c490a063c89f96b25;hpb=3608f72d51e8126720024704398cf738e61f890b;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index 3de2ab98b2..d293cc048a 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -238,7 +238,7 @@ function LOAD_TEMPLATE ($template, $return=false, $content=array()) {
 	// @DEPRECATED Try to rewrite the if() condition
 	if ($template == "member_support_form") {
 		// Support request of a member
-		$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT userid, gender, surname, family, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 			array($GLOBALS['userid']), __FILE__, __LINE__);
 
 		// Is content an array?
@@ -392,7 +392,7 @@ function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML = "N", $FROM = "") {
 			return;
 		} else {
 			// Load email address
-			$result_email = SQL_QUERY_ESC("SELECT email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
+			$result_email = SQL_QUERY_ESC("SELECT email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1", array(bigintval($TO)), __FILE__, __LINE__);
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):numRows=".SQL_NUMROWS($result_email)."<br />\n";
 
 			// Does the user exist?
@@ -795,12 +795,12 @@ function LOAD_EMAIL_TEMPLATE($template, $content=array(), $UID="0") {
 		if (EXT_IS_ACTIVE("nickname")) {
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NICKNAME!<br />\n";
 			// Load nickname
-			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email, nickname FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 				array(bigintval($UID)), __FILE__, __LINE__);
 		} else {
 			//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):NO-NICK!<br />\n";
 			/// Load normal data
-			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `"._MYSQL_PREFIX."_user_data` WHERE userid=%s LIMIT 1",
+			$result = SQL_QUERY_ESC("SELECT surname, family, gender, email FROM `{!MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
 				array(bigintval($UID)), __FILE__, __LINE__);
 		}
 
@@ -1213,9 +1213,9 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0") {
 	case "yn":
 		$OUT .= "<option value=\"Y\"";
 		if ($DEFAULT == "Y") $OUT .= " selected=\"selected\"";
-		$OUT .= ">".YES."</option>\n<option value=\"N\"";
+		$OUT .= ">{!YES!}</option>\n<option value=\"N\"";
 		if ($DEFAULT == "N") $OUT .= " selected=\"selected\"";
-		$OUT .= ">".NO."</option>\n";
+		$OUT .= ">{!NO!}</option>\n";
 		break;
 	}
 	$OUT .= "    </select>\n";
@@ -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
 	}
@@ -1592,11 +1592,11 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
 	} // END - if
 
 	// Check which admin shall receive this mail
-	$result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM "._MYSQL_PREFIX."_admins_mails WHERE mail_template='%s' ORDER BY admin_id",
+	$result = SQL_QUERY_ESC("SELECT DISTINCT admin_id FROM `{!MYSQL_PREFIX!}_admins_mails` WHERE mail_template='%s' ORDER BY admin_id",
 		array($template), __FILE__, __LINE__);
 	if (SQL_NUMROWS($result) == 0) {
 		// Create new entry (to all admins)
-		SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins_mails (admin_id, mail_template) VALUES (0, '%s')",
+		SQL_QUERY_ESC("INSERT INTO `{!MYSQL_PREFIX!}_admins_mails` (admin_id, mail_template) VALUES (0, '%s')",
 			array($template), __FILE__, __LINE__);
 	} else {
 		// Load admin IDs...
@@ -1616,10 +1616,10 @@ function SEND_ADMIN_EMAILS_PRO($subj, $template, $content, $UID) {
 			return;
 		} elseif ($aid == "0") {
 			// Select all email adresses
-			$result = SQL_QUERY("SELECT email FROM "._MYSQL_PREFIX."_admins ORDER BY id", __FILE__, __LINE__);
+			$result = SQL_QUERY("SELECT email FROM `{!MYSQL_PREFIX!}_admins` ORDER BY id", __FILE__, __LINE__);
 		} else {
 			// If Admin-ID is not "to-all" select
-			$result = SQL_QUERY_ESC("SELECT email FROM "._MYSQL_PREFIX."_admins WHERE id IN (%s) ORDER BY id", array($aid), __FILE__, __LINE__);
+			$result = SQL_QUERY_ESC("SELECT email FROM `{!MYSQL_PREFIX!}_admins` WHERE id IN (%s) ORDER BY id", array($aid), __FILE__, __LINE__);
 		}
 	}
 
@@ -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 = "";
@@ -1963,7 +1963,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 	$eval = "\$OUT = \"[&nbsp;";
 
 	foreach ($TARGETS as $tar) {
-		$eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"".URL."/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"\".ADMIN_LINK_";
+		$eval .= "<span class=\\\"admin_user_link\\\"><a href=\\\"{!URL!}/modules.php?module=admin&amp;what=".$tar."&amp;u_id=".$uid."\\\" title=\\\"{!ADMIN_LINK_";
 		//* DEBUG: */ echo "*".$tar."/".$status."*<br />\n";
 		if (($tar == "lock_user") && ($status == "LOCKED")) {
 			// Locked accounts shall be unlocked
@@ -1972,7 +1972,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 			// All other status is fine
 			$eval .= strtoupper($tar);
 		}
-		$eval .= "_TITLE.\"\\\">\".ADMIN_";
+		$eval .= "_TITLE!}\\\">{!ADMIN_";
 		if (($tar == "lock_user") && ($status == "LOCKED")) {
 			// Locked accounts shall be unlocked
 			$eval .= "UNLOCK_USER";
@@ -1980,7 +1980,7 @@ function MEMBER_ACTION_LINKS($uid, $status="") {
 			// All other status is fine
 			$eval .= strtoupper($tar);
 		}
-		$eval .= ".\"</a></span>&nbsp;|&nbsp;";
+		$eval .= "!}</a></span>&nbsp;|&nbsp;";
 	}
 
 	// Finish navigation link
@@ -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") {
@@ -2962,7 +2962,7 @@ function THEME_GET_ID ($name) {
 		incrementConfigEntry('cache_hits');
 	} elseif (GET_EXT_VERSION("cache") != "0.1.8") {
 		// Check if current theme is already imported or not
-		$result = SQL_QUERY_ESC("SELECT id FROM `"._MYSQL_PREFIX."_themes` WHERE theme_path='%s' LIMIT 1",
+		$result = SQL_QUERY_ESC("SELECT id FROM `{!MYSQL_PREFIX!}_themes` WHERE theme_path='%s' LIMIT 1",
 			array($name), __FILE__, __LINE__);
 
 		// Entry found?
@@ -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 //
 //////////////////////////////////////////////////