X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ffunctions.php;h=7b074a4a556feeb40c14ad00ef90e2e90e04129f;hb=841656d70d60cbd5f0768e12cf73a62aa643cf35;hp=fd2eab7f3dd216f1fccbe8b94ec91c072ea06f23;hpb=ab82613b0100336c0966a742c986874ec1692672;p=mailer.git

diff --git a/inc/functions.php b/inc/functions.php
index fd2eab7f3d..7b074a4a55 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -44,7 +44,8 @@ if (!defined('__SECURITY')) {
 // Output HTML code directly or 'render' it. You addionally switch the new-line character off
 function outputHtml ($htmlCode, $newLine = true) {
 	// Transfer username
-	$username = getUsername();
+	$username = getMessage('USERNAME_UNKNOWN');
+	if (isset($GLOBALS['username'])) $username = getUsername();
 
 	// Do we have HTML-Code here?
 	if (!empty($htmlCode)) {
@@ -115,12 +116,15 @@ function outputHtml ($htmlCode, $newLine = true) {
 		sendHeader('Content-language: ' . getLanguage());
 
 		// Extension 'rewrite' installed?
-		if ((isExtensionActive('rewrite')) && (getOutputMode() != '1')) {
+		if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
 			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 		} // END - if
 
+		// Init counter
+		$cnt = 0;
+
 		// Compile and run finished rendered HTML code
-		while ((strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) {
+		while (((strpos($GLOBALS['output'], '{--') > 0) || (strpos($GLOBALS['output'], '{!') > 0) || (strpos($GLOBALS['output'], '{?') > 0)) && ($cnt < 3)) {
 			// Prepare the content and eval() it...
 			$content = array();
 			$newContent = '';
@@ -132,16 +136,19 @@ function outputHtml ($htmlCode, $newLine = true) {
 			// Was that eval okay?
 			if (empty($newContent)) {
 				// Something went wrong!
-				debug_report_bug('Evaluation error:<pre>' . htmlentities($eval) . '</pre>');
+				debug_report_bug('Evaluation error:<pre>' . linenumberCode($eval) . '</pre>');
 			} // END - if
 			$GLOBALS['output'] = $newContent;
+
+			// Count round
+			$cnt++;
 		} // END - while
 
 		// Output code here, DO NOT REMOVE! ;-)
 		outputRawCode($GLOBALS['output']);
 	} elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
 		// Rewrite links when rewrite extension is active
-		if ((isExtensionActive('rewrite')) && (getOutputMode() != '1')) {
+		if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
 			$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 		} // END - if
 
@@ -191,6 +198,7 @@ function addFatalMessage ($F, $L, $message, $extra='') {
 	$GLOBALS['fatal_messages'][] = $message;
 
 	// Log fatal messages away
+	debug_report_bug($message);
 	logDebugMessage($F, $L, " message={$message}");
 }
 
@@ -233,7 +241,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
 		if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = 0;
 
 		// Generate date/time string
-		$date_time = generateDateTime(time(), '1');
+		$date_time = generateDateTime(time(), 1);
 
 		// Is content an array
 		if (is_array($content)) $content['date_time'] = $date_time;
@@ -356,8 +364,9 @@ function loadTemplate ($template, $return=false, $content=array()) {
 					$eval = '$ret = "' . compileCode(smartAddSlashes($GLOBALS['tpl_content'])) . '";';
 				}
 			} else {
-				// Simply return loaded code
-				$eval = '$ret = $GLOBALS[\'tpl_content\'];';
+				// Add surrounding HTML comments to help finding bugs faster
+				$ret = "<!-- Template " . $template . " - Start -->\n" . $GLOBALS['tpl_content'] . "<!-- Template " . $template . " - End -->\n";
+				$eval = '$ret = "' . smartAddSlashes($ret) . '";';
 			} // END - if
 
 			// Cache the eval() command here
@@ -401,7 +410,7 @@ function loadTemplate ($template, $return=false, $content=array()) {
 }
 
 // Loads an email template and compiles it
-function loadEmailTemplate ($template, $content = array(), $UID = '0') {
+function loadEmailTemplate ($template, $content = array(), $UID = 0) {
 	global $DATA;
 
 	// Our configuration is kept non-global here
@@ -551,8 +560,12 @@ function loadEmailTemplate ($template, $content = array(), $UID = '0') {
 	unset($content);
 	unset($DATA);
 
-	// Return compiled content
-	return compileCode($newContent);
+	// Compile the code and eval it
+	$eval = '$newContent = "' . compileCode(smartAddSlashes($newContent)) . '";';
+	eval($eval);
+
+	// Return content
+	return $newContent;
 }
 
 // Send mail out to an email address
@@ -587,7 +600,7 @@ function sendEmail ($toEmail, $subject, $message, $isHtml = 'N', $mailHeader = '
 			// Free result
 			SQL_FREERESULT($result_email);
 		}
-	} elseif ($toEmail == '0') {
+	} elseif ($toEmail == 0) {
 		// Is the webmaster!
 		$toEmail = getConfig('WEBMASTER');
 	}
@@ -718,7 +731,7 @@ function generatePassword ($length = 0) {
 }
 
 // Generates a human-readable timestamp from the Uni* stamp
-function generateDateTime ($time, $mode = '0') {
+function generateDateTime ($time, $mode = 0) {
 	// Filter out numbers
 	$time = bigintval($time);
 
@@ -731,10 +744,10 @@ function generateDateTime ($time, $mode = '0') {
 	switch (getLanguage()) {
 		case 'de': // German date / time format
 			switch ($mode) {
-				case '0': $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
-				case '1': $ret = strtolower(date("d.m.Y - H:i", $time)); break;
-				case '2': $ret = date("d.m.Y|H:i", $time); break;
-				case '3': $ret = date("d.m.Y", $time); break;
+				case 0: $ret = date("d.m.Y \u\m H:i \U\h\\r", $time); break;
+				case 1: $ret = strtolower(date('d.m.Y - H:i', $time)); break;
+				case 2: $ret = date('d.m.Y|H:i', $time); break;
+				case 3: $ret = date('d.m.Y', $time); break;
 				default:
 					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
 					break;
@@ -743,10 +756,10 @@ function generateDateTime ($time, $mode = '0') {
 
 		default: // Default is the US date / time format!
 			switch ($mode) {
-				case '0': $ret = date("r", $time); break;
-				case '1': $ret = date("Y-m-d - g:i A", $time); break;
-				case '2': $ret = date("y-m-d|H:i", $time); break;
-				case '3': $ret = date("y-m-d", $time); break;
+				case 0: $ret = date('r', $time); break;
+				case 1: $ret = date('Y-m-d - g:i A', $time); break;
+				case 2: $ret = date('y-m-d|H:i', $time); break;
+				case 3: $ret = date('y-m-d', $time); break;
 				default:
 					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Invalid date mode %s detected.", $mode));
 					break;
@@ -760,7 +773,7 @@ function generateDateTime ($time, $mode = '0') {
 // Translates Y/N to yes/no
 function translateYesNo ($yn) {
 	// Default
-	$translated = "??? (" . $yn.')';
+	$translated = '??? (' . $yn . ')';
 	switch ($yn) {
 		case 'Y': $translated = getMessage('YES'); break;
 		case 'N': $translated = getMessage('NO'); break;
@@ -795,7 +808,7 @@ function translatePoolType ($type) {
 // Translates the american decimal dot into a german comma
 function translateComma ($dotted, $cut = true, $max = 0) {
 	// Default is 3 you can change this in admin area "Misc -> Misc Options"
-	if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', '3');
+	if (!isConfigEntrySet('max_comma')) setConfigEntry('max_comma', 3);
 
 	// Use from config is default
 	$maxComma = getConfig('max_comma');
@@ -881,7 +894,7 @@ function generateDerefererUrl ($URL) {
 	// Don't de-refer our own links!
 	if (substr($URL, 0, strlen(getConfig('URL'))) != getConfig('URL')) {
 		// De-refer this link
-		$URL = 'modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
+		$URL = '{?URL?}/modules.php?module=loader&amp;url=' . encodeString(compileUriCode($URL));
 	} // END - if
 
 	// Return link
@@ -922,18 +935,25 @@ function countSelection ($array) {
 
 // Generate XHTML code for the CAPTCHA
 function generateCaptchaCode ($code, $type, $DATA, $userid) {
-	return '<IMG border="0" alt="Code" src="{?URL?}/mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '" />';
+	return '<img border="0" alt="Code ' . $code . '" src="{?URL?}/mailid_top.php?userid=' . $userid . '&amp;' . $type . '=' . $DATA . '&amp;mode=img&amp;code=' . $code . '" />';
 }
 
 // Generates a timestamp (some wrapper for mktime())
-function makeTime ($H, $M, $S, $stamp) {
+function makeTime ($hours, $minutes, $seconds, $stamp) {
 	// Extract day, month and year from given timestamp
-	$day   = date('d', $stamp);
-	$month = date('m', $stamp);
-	$year  = date('Y', $stamp);
+	$days   = date('d', $stamp);
+	$months = date('m', $stamp);
+	$years  = date('Y', $stamp);
 
 	// Create timestamp for wished time which depends on extracted date
-	return mktime($H, $M, $S, $month, $day, $year);
+	return mktime(
+		$hours,
+		$minutes,
+		$seconds,
+		$months,
+		$days,
+		$years
+	);
 }
 
 // Redirects to an URL and if neccessarry extends it with own base URL
@@ -1145,7 +1165,7 @@ function array_pk_sort (&$array, $a_sort, $primary_key = 0, $order = -1, $nums =
 }
 
 //
-function addSelectionBox ($type, $default, $prefix = '', $id = '0') {
+function addSelectionBox ($type, $default, $prefix = '', $id = 0) {
 	$OUT = '';
 
 	if ($type == 'yn') {
@@ -1230,7 +1250,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0') {
 		case 'sec':
 		case 'min':
 			for ($idx = 0; $idx < 60; $idx+=5) {
-				if (strlen($idx) == 1) $idx = '0' . $idx;
+				if (strlen($idx) == 1) $idx = 0 . $idx;
 				$OUT .= "<option value=\"" . $idx."\"";
 				if ($default == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">" . $idx."</option>\n";
@@ -1239,7 +1259,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0') {
 
 		case 'hour':
 			for ($idx = 0; $idx < 24; $idx++) {
-				if (strlen($idx) == 1) $idx = '0' . $idx;
+				if (strlen($idx) == 1) $idx = 0 . $idx;
 				$OUT .= "<option value=\"" . $idx."\"";
 				if ($default == $idx) $OUT .= ' selected="selected"';
 				$OUT .= ">" . $idx."</option>\n";
@@ -1317,7 +1337,7 @@ function generateRandomCode ($length, $code, $userid, $DATA = '') {
 // Does only allow numbers
 function bigintval ($num, $castValue = true) {
 	// Filter all numbers out
-	$ret = preg_replace("/[^0123456789]/", '', $num);
+	$ret = preg_replace('/[^0123456789]/', '', $num);
 
 	// Shall we cast?
 	if ($castValue) $ret = (double)$ret;
@@ -1642,7 +1662,7 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
 	$NAV = '';
 	for ($page = 1; $page <= $PAGES; $page++) {
 		// Is the page currently selected or shall we generate a link to it?
-		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == '1'))) {
+		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
 			// Is currently selected, so only highlight it
 			$NAV .= '<strong>-';
 		} else {
@@ -1656,7 +1676,7 @@ function addEmailNavigation ($PAGES, $offset, $show_form, $colspan, $return=fals
 			$NAV .= '">';
 		}
 		$NAV .= $page;
-		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == '1'))) {
+		if (($page == getRequestElement('page')) || ((!isGetRequestElementSet('page')) && ($page == 1))) {
 			// Is currently selected, so only highlight it
 			$NAV .= '-</strong>';
 		} else {
@@ -1722,10 +1742,25 @@ function extractHostnameFromUrl (&$script) {
 }
 
 // Send a GET request
-function sendGetRequest ($script) {
+function sendGetRequest ($script, $data = array()) {
 	// Extract host name from script
 	$host = extractHostnameFromUrl($script);
 
+	// Add data
+	$scriptData = http_build_query($data, '', '&');
+
+	// Do we have a question-mark in the script?
+	if (strpos($script, '?') === false) {
+		// No, so first char must be question mark
+		$scriptData = '?' . $scriptData;
+	} else {
+		// Ok, add &
+		$scriptData = '&' . $scriptData;
+	}
+
+	// Add script data
+	$script .= $scriptData;
+
 	// Generate GET request header
 	$request  = 'GET /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
 	$request .= 'Host: ' . $host . getConfig('HTTP_EOL');
@@ -1762,7 +1797,7 @@ function sendPostRequest ($script, $postData) {
 	$host = extractHostnameFromUrl($script);
 
 	// Construct request
-	$data = http_build_query($postData, '','&');
+	$data = http_build_query($postData, '', '&');
 
 	// Generate POST request header
 	$request  = 'POST /' . trim($script) . ' HTTP/1.1' . getConfig('HTTP_EOL');
@@ -2146,7 +2181,7 @@ function generatePassString ($passHash) {
 				$mod = dechex(sqrt(($part2 - $part1) * getConfig('_PRIME') / pi()));
 			}
 			$mod = substr(round($mod), 0, 4);
-			$mod = str_repeat('0', 4-strlen($mod)) . $mod;
+			$mod = str_repeat(0, 4-strlen($mod)) . $mod;
 			//* DEBUG: */ outputHtml("*" . $start.'=' . $mod."*<br />");
 			$start += 4;
 			$newHash .= $mod;
@@ -2641,7 +2676,7 @@ function getMessageFromErrorCode ($code) {
 		case getCode('OVERLENGTH')       : $message = getMessage('MEMBER_TEXT_OVERLENGTH'); break;
 		case getCode('URL_FOUND')        : $message = getMessage('MEMBER_TEXT_CONTAINS_URL'); break;
 		case getCode('SUBJ_URL')         : $message = getMessage('MEMBER_SUBJ_CONTAINS_URL'); break;
-		case getCode('BLIST_URL')        : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), '0'); break;
+		case getCode('BLIST_URL')        : $message = "{--MEMBER_URL_BLACK_LISTED--}<br />\n{--MEMBER_BLIST_TIME--}: ".generateDateTime(getRequestElement('blist'), 0); break;
 		case getCode('NO_RECS_LEFT')     : $message = getMessage('MEMBER_SELECTED_MORE_RECS'); break;
 		case getCode('INVALID_TAGS')     : $message = getMessage('MEMBER_HTML_INVALID_TAGS'); break;
 		case getCode('MORE_POINTS')      : $message = getMessage('MEMBER_MORE_POINTS_NEEDED'); break;
@@ -2672,7 +2707,7 @@ function getMessageFromErrorCode ($code) {
 
 			// Load timestamp from last order
 			list($timestamp) = SQL_FETCHROW($result);
-			$timestamp = generateDateTime($timestamp, '1');
+			$timestamp = generateDateTime($timestamp, 1);
 
 			// Free memory
 			SQL_FREERESULT($result);
@@ -2899,7 +2934,7 @@ function changeDataInFile ($FQFN, $comment, $prefix, $suffix, $DATA, $seek=0) {
 	return false;
 }
 // Send notification to admin
-function sendAdminNotification ($subject, $templateName, $content=array(), $userid = '0') {
+function sendAdminNotification ($subject, $templateName, $content=array(), $userid = 0) {
 	if (getExtensionVersion('admins') >= '0.4.1') {
 		// Send new way
 		sendAdminsEmails($subject, $templateName, $content, $userid);
@@ -3027,7 +3062,7 @@ function handleLoginFailtures ($accessLevel) {
 			//* DEBUG: */ outputHtml(__FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):accessLevel={$accessLevel}<br />");
 			$content = array(
 				'login_failures' => getSession('mxchange_' . $accessLevel.'_failures'),
-				'last_failure'   => generateDateTime(getSession('mxchange_' . $accessLevel.'_last_fail'), '2')
+				'last_failure'   => generateDateTime(getSession('mxchange_' . $accessLevel.'_last_fail'), 2)
 			);
 
 			// Load template
@@ -3053,7 +3088,7 @@ function rebuildCacheFile ($cache, $inc = '', $force = false) {
 		// Rebuild cache
 		if ($GLOBALS['cache_instance']->loadCacheFile($cache)) {
 			// Destroy it
-			$GLOBALS['cache_instance']->removeCacheFile(false, $force);
+			$GLOBALS['cache_instance']->removeCacheFile($force);
 		} // END - if
 
 		// Include file given?
@@ -3136,7 +3171,7 @@ function addNewBonusMail ($data, $mode = '', $output=true) {
 // Determines referal id and sets it
 function determineReferalId () {
 	// Skip this in non-html-mode
-	if (getOutputMode() != '0') return false;
+	if (getOutputMode() != 0) return false;
 
 	// Check if refid is set
 	if ((isset($GLOBALS['refid'])) && ($GLOBALS['refid'] > 0)) {
@@ -3168,7 +3203,7 @@ function determineReferalId () {
 	}
 
 	// Set cookie when default refid > 0
-	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == '0') && (getConfig('def_refid') > 0))) {
+	if (!isSessionVariableSet('refid') || (!empty($GLOBALS['refid'])) || ((getSession('refid') == 0) && (getConfig('def_refid') > 0))) {
 		// Set cookie
 		setSession('refid', $GLOBALS['refid']);
 	} // END - if
@@ -3501,89 +3536,31 @@ function getMessageFromIndexedArray ($message, $pos, $array) {
 	return $ret;
 }
 
-// Handles fatal errors
-function handleFatalErrors () {
-	// Do we have errors to handle and right output mode?
-	if ((getTotalFatalErrors() == 0) || (getOutputMode() != 0)) {
-		// Abort executing here
-		return false;
-	} // END - if
-
-	// Set content type
-	setContentType('text/html');
-
-	// Load config here
-	loadIncludeOnce('inc/load_config.php');
-
-	// Set unset variable
-	if (empty($check)) $check = '';
-
-	// Default is none
-	$content = '';
-
-	// Installation phase or regular mode?
-	if ((isInstallationPhase())) {
-		// While we are installing ouput other header than while it is installed... :-)
-		$OUT = '';
-		foreach (getFatalArray() as $key => $value) {
-			// Prepare content for the template
-			$content = array(
-				'key'   => ($key + 1),
-				'value' => $value
-			);
+// Print code with line numbers
+function linenumberCode ($code)    {
+	if (!is_array($code)) $codeE = explode("\n", $code); else $codeE = $code;
+	$count_lines = count($codeE);
 
-			// Load row template
-			$OUT .= loadTemplate('install_fatal_row', true, $content);
-		}
-
-		// Load main template
-		$content = loadTemplate('install_fatal_table', true, $OUT);
-	} elseif (isInstalled()) {
-		// Display all runtime fatal errors
-		$OUT = '';
-		foreach (getFatalArray() as $key => $value) {
-			// Prepare content for the template
-			$content = array(
-				'key'   => ($key + 1),
-				'value' => $value
-			);
-
-			// Load row template
-			$OUT .= loadTemplate('runtime_fatal_row', true, $content);
+	$r = 'Line | Code:<br />';
+	foreach($codeE as $line => $c) {
+		$r .= '<div class="line"><span class="linenum">';
+		if ($count_lines == 1) {
+			$r .= 1;
+		} else {
+			$r .= ($line == ($count_lines - 1)) ? '' :  ($line+1);
 		}
+		$r .= '</span>|';
 
-		// Load main template
-		$content = loadTemplate('runtime_fatal_table', true, $OUT);
+		// Add code
+		$r .= '<span class="linetext">' . htmlentities($c) . '</span></div>';
 	}
 
-	// Message to regular users (non-admin)
-	$CORR = getMessage('FATAL_REPORT_ERRORS');
-
-	// PHP warnings fixed
-	if ($check == 'done') {
-		if (isAdmin()) $CORR = getMessage('FATAL_CORRECT_ERRORS');
-	} // END - if
-
-	// Remember all in array
-	$content = array(
-		'rows' => $content,
-		'corr' => $CORR
-	);
-
-	// Load footer
-	loadIncludeOnce('inc/header.php');
-
-	// Load main template
-	loadTemplate('fatal_errors', false, $content);
-
-	// Delete all to prevent double-display
-	initFatalMessages();
-
-	// Load footer
-	loadIncludeOnce('inc/footer.php');
+	return '<div class="code">' . $r . '</div>';
+}
 
-	// Abort here
-	shutdown();
+// Convert ';' to ', ' for e.g. receiver list
+function convertReceivers ($old) {
+	return str_replace(';', ', ', $old);
 }
 
 //////////////////////////////////////////////////