X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=e8bbe8171ae416d8010e76d70d0fe0dc253b22f8;hp=36212e608afb78e07ef483e34214809f9e596ff6;hb=6f9f29d5caee60a2cceae33a7a53e1b4c7319a0c;hpb=0e104a9282a1cdc7d769bbccb03bd3462aa8f4e0

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 36212e608a..e8bbe8171a 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -17,7 +17,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -182,13 +182,13 @@ function compileFinalOutput () {
 	// Compress it?
 	/**
 	 * @TODO On some pages this is buggy
-	if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
+	if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (isInStringIgnoreCase('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']))) {
 		// Compress it for HTTP gzip
 		$GLOBALS['output'] = gzencode($GLOBALS['output'], 9);
 
 		// Add header
 		sendHeader('Content-Encoding: gzip');
-	} elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
+	} elseif (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (isInStringIgnoreCase('deflate', $_SERVER['HTTP_ACCEPT_ENCODING']))) {
 		// Compress it for HTTP deflate
 		$GLOBALS['output'] = gzcompress($GLOBALS['output'], 9);
 
@@ -213,7 +213,7 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
 	$count = 0;
 
 	// Compile all out
-	while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($count < 7)) {
+	while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== false)) && ($count < 7)) {
 		// Init common variables
 		$content = array();
 		$newContent = '';
@@ -314,7 +314,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
 
 			// Do we have to compile the code?
 			$ret = '';
-			if ((strpos($GLOBALS['tpl_content'][$template], '$') !== false) || (strpos($GLOBALS['tpl_content'][$template], '{--') !== false) || (strpos($GLOBALS['tpl_content'][$template], '{?') !== false) || (strpos($GLOBALS['tpl_content'][$template], '{%') !== false)) {
+			if ((isInString('$', $GLOBALS['tpl_content'][$template])) || (isInString('{--', $GLOBALS['tpl_content'][$template])) || (isInString('{?', $GLOBALS['tpl_content'][$template])) || (isInString('{%', $GLOBALS['tpl_content'][$template]))) {
 				// Normal HTML output?
 				if (isHtmlOutputMode()) {
 					// Add surrounding HTML comments to help finding bugs faster
@@ -547,7 +547,9 @@ function getMenuCssClasses ($data) {
 	$content = explode('|', $data);
 
 	// Non-existent index 2 will happen in menu blocks
-	if (!isset($content[2])) $content[2] = '';
+	if (!isset($content[2])) {
+		$content[2] = '';
+	} // END - if
 
 	// Re-construct the array: 0=visible,1=locked,2=prefix
 	$content['visible'] = $content[0];
@@ -1253,17 +1255,17 @@ function compileUriCode ($code, $simple = true) {
 // Handle message codes from URL
 function handleCodeMessage () {
 	// Is 'code' set?
-	if (isGetRequestParameterSet('code')) {
+	if (isGetRequestElementSet('code')) {
 		// Default extension is 'unknown'
 		$ext = 'unknown';
 
 		// Is extension given?
-		if (isGetRequestParameterSet('ext')) {
-			$ext = getRequestParameter('ext');
+		if (isGetRequestElementSet('ext')) {
+			$ext = getRequestElement('ext');
 		} // END - if
 
 		// Convert the 'code' parameter from URL to a human-readable message
-		$message = getMessageFromErrorCode(getRequestParameter('code'));
+		$message = getMessageFromErrorCode(getRequestElement('code'));
 
 		// Load message template
 		loadTemplate('message', false, $message);
@@ -1542,7 +1544,7 @@ function sendModeMails ($mod, $modes) {
 		$hash = encodeHashForCookie(getUserData('password'));
 
 		// Does the hash match or should we change it?
-		if (($hash == getSession('u_hash')) || (postRequestParameter('pass1') == postRequestParameter('pass2'))) {
+		if (($hash == getSession('u_hash')) || (postRequestElement('pass1') == postRequestElement('pass2'))) {
 			// Load the data
 			$content = getUserDataArray();
 
@@ -1557,7 +1559,7 @@ function sendModeMails ($mod, $modes) {
 						switch ($mode) {
 							case 'normal': break; // Do not add any special lines
 							case 'email': // Email was changed!
-								$content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestParameter('old_email') . "\n";
+								$content['message'] = '{--MEMBER_CHANGED_EMAIL--}' . ': ' . postRequestElement('old_email') . "\n";
 								break;
 
 							case 'password': // Password was changed
@@ -1573,7 +1575,7 @@ function sendModeMails ($mod, $modes) {
 
 					if (isExtensionActive('country')) {
 						// Replace code with description
-						$content['country'] = generateCountryInfo(postRequestParameter('country_code'));
+						$content['country'] = generateCountryInfo(postRequestElement('country_code'));
 					} // END - if
 
 					// Merge content with data from POST
@@ -1707,8 +1709,8 @@ function generateMetaDescriptionCode () {
 		$GLOBALS['page_header'] .= '<meta name="description" content="' . $DESCR . '" />';
 	} // END - if
 
-	// Initialize referal system
-	initReferalSystem();
+	// Initialize referral system
+	initReferralSystem();
 }
 
 // Generates an FQFN for template cache from the given template name
@@ -1859,5 +1861,27 @@ function doTemplateNoYesSelectionBox ($template, $clear, $formField) {
 	return $OUT;
 }
 
+// Helper function to add extra content for member area (module=login)
+function doTemplateMemberFooterExtras ($template, $clear) {
+	// Is a member logged in?
+	if (!isMember()) {
+		// This shall not happen
+		debug_report_bug(__FUNCTION__, __LINE__, 'Please use this template helper only for logged-in members.');
+	} // END - if
+
+	// Init filter data
+	$filterData = array(
+		'userid'   => getMemberId(),
+		'template' => $template,
+		'output'   => '',
+	);
+
+	// Run the filter chain
+	$filterData = runFilterChain('member_footer_extras', $filterData);
+
+	// Return output
+	return $filterData['output'];
+}
+
 // [EOF]
 ?>