X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ffunctions.php;h=3cdabf7e3e09ff0c32816a90d0a133e6ad209b27;hb=1bf45cc4694aedce0b2fed54090c3f74cc93fe26;hp=f6fbbb1cc6ccc1ce3d72d67d3ebb296802b37c9c;hpb=0e899620c7a065952d6787c236fb2b33ae337d6a;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index f6fbbb1cc6..3cdabf7e3e 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -71,18 +71,15 @@ function OPEN_TABLE($PERCENT = "", $CLASS = "", $ALIGN="left", $VALIGN="", $td_o
 
 	// Vertical align is given
 	if (!empty($VALIGN))  $OUT .= " valign=\"".$VALIGN."\"";
-	$OUT .= ">
-<TR>
-  <TD";
+	$OUT .= ">\n<TR>\n<TD";
 	if (!empty($ALIGN)) $OUT .=" align=\"".$ALIGN."\"";
 	$OUT .= " class=\"".$CLASS."\">";
-  	OUTPUT_HTML($OUT);
+	OUTPUT_HTML($OUT);
 }
 
 // Close a table (you may want to add some footer stuff here)
 function CLOSE_TABLE($ADD="") {
-	OUTPUT_HTML("  </TD>
-</TR>");
+	OUTPUT_HTML("  </TD>\n</TR>");
 	if (!empty($ADD)) OUTPUT_HTML($ADD);
 	OUTPUT_HTML("</TABLE>");
 }
@@ -140,9 +137,9 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 		}
 
 		// Compile and run finished rendered HTML code
-		while (strpos($OUTPUT, "{!") > 0) {
+		while (strpos($OUTPUT, '{!') > 0) {
 			$eval = "\$OUTPUT = \"" . COMPILE_CODE(addslashes($OUTPUT)) . "\";";
-			@eval($eval);
+			eval($eval);
 		}
 
 		// Output code here, DO NOT REMOVE! ;-)
@@ -154,9 +151,9 @@ function OUTPUT_HTML($HTML, $NEW_LINE = true) {
 		}
 
 		// Compile and run finished rendered HTML code
-		while (strpos($OUTPUT, "{!") > 0) {
+		while (strpos($OUTPUT, '{!') > 0) {
 			$eval = "\$OUTPUT = \"" . COMPILE_CODE(addslashes($OUTPUT)) . "\";";
-			@eval($eval);
+			eval($eval);
 		}
 
 		// Output code here, DO NOT REMOVE! ;-)
@@ -179,8 +176,7 @@ function OUTPUT_RAW ($HTML) {
 }
 
 // Add a fatal error message to the queue array
-function ADD_FATAL ($message, $extra="")
-{
+function ADD_FATAL ($message, $extra="") {
 	global $FATAL;
 	if (empty($extra)) {
 		// Regular text message to add to $FATAL
@@ -284,12 +280,12 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 		$tmpl_file = implode("", file($file));
 
 		// Replace ' to our own chars to preventing them being quoted
-		while (strpos($tmpl_file, "\'") !== false) { $tmpl_file = str_replace("\'", "{QUOT}", $tmpl_file); }
+		while (strpos($tmpl_file, "\'") !== false) { $tmpl_file = str_replace("\'", '{QUOT}', $tmpl_file); }
 
 		// Do we have to compile the code?
 		if ((strpos($tmpl_file, "\$") !== false) || (strpos($tmpl_file, '{--') !== false) || (strpos($tmpl_file, '--}') > 0)) {
 			// Okay, compile it!
-			$tmpl_file = "\$ret=\"".COMPILE_CODE(addslashes($tmpl_file))."\";";
+			$tmpl_file = "\$ret=\"" . COMPILE_CODE(addslashes($tmpl_file)) . "\";";
 			eval($tmpl_file);
 		} else {
 			// Simply return loaded code
@@ -329,7 +325,7 @@ function LOAD_TEMPLATE($template, $return=false, $content="") {
 // Send mail out to an email address
 function SEND_EMAIL($TO, $SUBJECT, $MSG, $HTML='N', $FROM="") {
 	// Compile subject line (for POINTS constant etc.)
-	$eval = "\$SUBJECT = \"".COMPILE_CODE(addslashes($SUBJECT))."\";";
+	$eval = "\$SUBJECT = \"" . COMPILE_CODE(addslashes($SUBJECT)) . "\";";
 	eval($eval);
 	$SUBJECT = html_entity_decode($SUBJECT);
 
@@ -660,6 +656,9 @@ function GET_LANGUAGE() {
 	} elseif (!isSessionVariableSet('mx_lang')) {
 		// Return stored value from cookie
 		$ret = get_session('mx_lang');
+
+		// Fixes a warning before the session has the mx_lang constant
+		if (empty($ret)) $ret = DEFAULT_LANG;
 	}
 	return $ret;
 }
@@ -674,8 +673,7 @@ function SET_LANGUAGE($lang) {
 	set_session("mx_lang", $lang);
 }
 //
-function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
-{
+function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0") {
 	global $DATA, $_CONFIG, $REPLACER;
 
 	// Keept for backward-compatiblity (please replace these variables against our new {--CONST--} syntax!)
@@ -696,21 +694,17 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 	}
 
 	// Expiration in a nice output format
-	if ($_CONFIG['auto_purge'] == 0)
-	{
+	if ($_CONFIG['auto_purge'] == 0) {
 		// Will never expire!
 		$EXPIRATION = MAIL_WILL_NEVER_EXPIRE;
-	}
-	 elseif (function_exists('CREATE_FANCY_TIME'))
-	{
+	} elseif (function_exists('CREATE_FANCY_TIME')) {
 		// Create nice date string
 		$EXPIRATION = CREATE_FANCY_TIME($_CONFIG['auto_purge']);
-	}
-	 else
-	{
+	} else {
 		// Display days only
 		$EXPIRATION = round($_CONFIG['auto_purge']/60/60/24)." "._DAYS;
 	}
+
 	switch ($template)
 	{
 	case "bonus-mail": // Load data for the bonus mail
@@ -788,11 +782,11 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 
 	case "back-admin":
 	case "back-member":
-		$points     = TRANSLATE_COMMA($DATA[10]);
+		$points		= TRANSLATE_COMMA($DATA[10]);
 		break;
 
 	case "add-points":
-		$points = bigintval($_POST['points']);
+		$points		= bigintval($_POST['points']);
 		break;
 
 	case "guest_request_confirm":
@@ -801,18 +795,14 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 	}
 
 	// Load user's data
-	if ($UID > 0)
-	{
-		if (EXT_IS_ACTIVE("nickname"))
-		{
+	if ($UID > 0) {
+		if (EXT_IS_ACTIVE("nickname")) {
 			// Load nickname
 			$result = SQL_QUERY_ESC("SELECT surname, family, sex, email, nickname FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
 			 array(bigintval($UID)), __FILE__, __LINE__);
 			list($surname, $family, $sex, $email, $nick) = SQL_FETCHROW($result);
 			SQL_FREERESULT($result);
-		}
-		 else
-		{
+		} else {
 			// Load normal data
 			$result = SQL_QUERY_ESC("SELECT surname, family, sex, email FROM "._MYSQL_PREFIX."_user_data WHERE userid=%d LIMIT 1",
 			 array(bigintval($UID)), __FILE__, __LINE__);
@@ -820,9 +810,7 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 			SQL_FREERESULT($result);
 			$nick = "---";
 		}
-	}
-	 else
-	{
+	} else {
 		// Neutral sex and email address is default
 		$sex = 'N';
 		$email = WEBMASTER;
@@ -838,40 +826,29 @@ function LOAD_EMAIL_TEMPLATE($template, $content="", $UID="0")
 	$BASE = PATH."templates/".GET_LANGUAGE()."/emails/";
 
 	// Check for admin/guest/member templates
-	if (strpos($template, "admin_") > -1)
-	{
+	if (strpos($template, "admin_") > -1) {
 		// Admin template found
 		$file = $BASE."admin/".$template.".tpl";
-	}
-	 elseif (strpos($template, "guest_") > -1)
-	{
+	} elseif (strpos($template, "guest_") > -1) {
 		// Guest template found
 		$file = $BASE."guest/".$template.".tpl";
-	}
-	 elseif (strpos($template, "member_") > -1)
-	{
+	} elseif (strpos($template, "member_") > -1) {
 		// Member template found
 		$file = $BASE."member/".$template.".tpl";
-	}
-	 else
-	{
+	} else {
 		// Test for extension
 		$test = substr($template, 0, strpos($template, "_"));
-		if (EXT_IS_ACTIVE($test))
-		{
+		if (EXT_IS_ACTIVE($test)) {
 			// Set extra path to extension's name
 			$file = $BASE.$test."/".$template.".tpl";
-		}
-		 else
-		{
+		} else {
 			// No special filename
 			$file = $BASE.$template.".tpl";
 		}
 	}
 
 	// Does the special template exists?
-	if (!@file_exists($file))
-	{
+	if ((!@file_exists($file)) || (!is_readable($file))) {
 		// Reset to default template
 		$file = $BASE.$template.".tpl";
 	}
@@ -953,7 +930,7 @@ function LOAD_URL($URL, $addUrlData=true) {
 	} else {
 		// Output error message
 		include(PATH."inc/header.php");
-		OUTPUT_HTML(LOAD_URL_ERROR_1.$URL.LOAD_URL_ERROR_2);
+		LOAD_TEMPLATE("redirect_url", false, str_replace("&amp;", "&", $URL));
 		include(PATH."inc/footer.php");
 	}
 	exit();
@@ -970,11 +947,11 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
 	if ($constants) {
 		// BEFORE 0.2.1 : Language and data constants
 		// WITH 0.2.1+  : Only language constants
-		$code = str_replace("{--", '".', str_replace("--}", '."', $code));
+		$code = str_replace('{--', '".', str_replace('--}', '."', $code));
 
 		// BEFORE 0.2.1 : Not used
 		// WITH 0.2.1+  : Data constants
-		$code = str_replace("{!", '".', str_replace("!}", '."', $code));
+		$code = str_replace('{!', '".', str_replace("!}", '."', $code));
 	}
 
 	// Compile QUOT and other non-HTML codes
@@ -984,7 +961,7 @@ function COMPILE_CODE($code, $simple = false, $constants = true, $full = true) {
 	}
 
 	// But shall I keep simple quotes for later use?
-	if ($simple) $code = str_replace("\'", "{QUOT}", $code);
+	if ($simple) $code = str_replace("\'", '{QUOT}', $code);
 
 	// Find $content[bla][blub] entries
 	@preg_match_all('/\$(content|DATA)((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches);
@@ -1171,7 +1148,7 @@ function ADD_SELECTION($type, $DEFAULT, $prefix="", $id="0")
 		$OUT .= "      <OPTION value=\"Y\"";
 		if ($DEFAULT == 'Y') $OUT .= " selected=\"selected\"";
 		$OUT .= ">".YES."</OPTION>
-      <OPTION value=\"N\"";
+			<OPTION value=\"N\"";
 		if ($DEFAULT == 'N') $OUT .= " selected=\"selected\"";
 		$OUT .= ">".NO."</OPTION>\n";
 		break;
@@ -1229,7 +1206,7 @@ function GEN_RANDOM_CODE($length, $code, $uid, $DATA="")
 	if ($len == 0) $len = 10;
 
 	// Cut off requested counts of number
-	$return = substr(str_replace('.', '', $rcode), 0, $len);
+	$return = substr(str_replace('.', "", $rcode), 0, $len);
 
 	// Done building code
 	return $return;
@@ -1658,7 +1635,7 @@ function ADD_EMAIL_NAV($PAGES, $offset, $show_form, $colspan, $return=false) {
 }
 
 //
-function MXCHANGE_OPEN($script) {
+function MXCHANGE_OPEN ($script) {
 	// Compile the script name
 	$script = COMPILE_CODE($script);
 
@@ -1682,8 +1659,7 @@ function MXCHANGE_OPEN($script) {
 
 	// Open connection
 	$fp = @fsockopen($host, 80, $errno, $errdesc, 30);
-	if (!$fp)
-	{
+	if (!$fp) {
 		// Failed!
 		return array("", "", "");
 	}
@@ -1702,7 +1678,7 @@ function MXCHANGE_OPEN($script) {
 
 	// Read response
 	while(!feof($fp)) {
-		$response[] = fgets($fp, 1024);
+		$response[] = trim(fgets($fp, 1024));
 	}
 
 	// Close socket
@@ -1961,7 +1937,7 @@ function ADD_URL_DATA($URL)
 		if ((!empty($_GET['refid'])) && (strpos($URL, "refid=") == 0)) {
 			// Cookie found in URL
 			$ADD .= $BIND."refid=".bigintval($_GET['refid']);
-		} elseif ((GET_EXT_VERSION("sql_patches") != "") && ($_CONFIG['def_refid'] > 0)) {
+		} elseif ((GET_EXT_VERSION("sql_patches") != '') && ($_CONFIG['def_refid'] > 0)) {
 			// Not found! So let's set default here
 			$ADD .= $BIND."refid=".$_CONFIG['def_refid'];
 		}
@@ -2069,7 +2045,7 @@ function DISPLAY_PARSING_TIME_FOOTER() {
 	);
 
 	// Load the template
-	LOAD_TEMPLATE("footer_stats", false, $content);
+	LOAD_TEMPLATE("show_timings", false, $content);
 }
 
 // Unset/set session variables
@@ -2087,7 +2063,7 @@ function set_session ($var, $value) {
 		//* DEBUG: */ echo "UNSET:".$var."=".get_session($var)."<br />\n";
 		unset($_SESSION[$var]);
 		return session_unregister($var);
-	} elseif (("".$value."" != "") && (!isSessionVariableSet($var))) {
+	} elseif (("".$value."" != '') && (!isSessionVariableSet($var))) {
 		// Set session
 		//* DEBUG: */ echo "SET:".$var."=".$value."<br />\n";
 		$_SESSION[$var] =  $value;