X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=929c99a3783b2df5dbc2bd542b20030c99bb61cd;hb=39fbdb68ef03c3f5828b02c7676371e7b2ba5327;hp=8de9960c5362a5d237f0899a32b2656fce2acba8;hpb=4ce7fbb51bb42b10bb56bb58135127a7b53527c0;p=mailer.git

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 8de9960c53..929c99a378 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 *
@@ -110,23 +110,32 @@ function outputHtml ($htmlCode, $newLine = true) {
 					outputRawCode($htmlCode);
 
 					// That's why you don't need any \n at the end of your HTML code... :-)
-					if ($newLine === true) print("\n");
+					if ($newLine === true) {
+						print("\n");
+					} // END - if
 				} else {
 					// Render mode for old or lame servers...
 					$GLOBALS['output'] .= $htmlCode;
 
 					// That's why you don't need any \n at the end of your HTML code... :-)
-					if ($newLine === true) $GLOBALS['output'] .= "\n";
+					if ($newLine === true) {
+						$GLOBALS['output'] .= "\n";
+					} // END - if
 				}
 				break;
 
 			case 'direct':
 				// If we are switching from render to direct output rendered code
-				if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) { outputRawCode($GLOBALS['output']); $GLOBALS['output'] = ''; }
+				if ((!empty($GLOBALS['output'])) && (getPhpCaching() != 'on')) {
+					outputRawCode($GLOBALS['output']);
+					$GLOBALS['output'] = '';
+				} // END - if
 
 				// The same as above... ^
 				outputRawCode($htmlCode);
-				if ($newLine === true) print("\n");
+				if ($newLine === true) {
+					print("\n");
+				} // END - if
 				break;
 
 			default:
@@ -323,7 +332,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
 					// Prepare eval() command
 					$GLOBALS['template_eval'][$template] = '$ret = "' . getColorSwitchCode($template) . compileCode(escapeQuotes($ret), false, true, true, $compileCode) . '";';
 				} elseif (substr($template, 0, 3) == 'js_') {
-					// JavaScripts don't like entities and timings
+					// JavaScripts don't like entities, dollar signs and timings
 					$GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'][$template]), false, true, true, $compileCode) . '");';
 				} else {
 					// Prepare eval() command, other output doesn't like entities, maybe
@@ -340,7 +349,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
 		} elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
 			// Only admins shall see this warning or when installation mode is active
 			$ret = '<div class="para">
-	<span class="notice">{--TEMPLATE_404--}</span>
+	<span class="bad">{--TEMPLATE_404--}</span>
 </div>
 <div class="para">
 	(' . $template . ')
@@ -547,7 +556,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 +1264,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 +1553,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 +1568,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 +1584,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
@@ -1601,16 +1612,16 @@ function sendModeMails ($mod, $modes) {
 
 				default: // Unsupported module!
 					logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-					$content['message'] = '<span class="notice">{--UNKNOWN_MODULE--}</span>';
+					$content['message'] = '<span class="bad">{--UNKNOWN_MODULE--}</span>';
 					break;
 			} // END - switch
 		} else {
 			// Passwords mismatch
-			$content['message'] = '<span class="notice">{--MEMBER_PASSWORD_ERROR--}</span>';
+			$content['message'] = '<span class="bad">{--MEMBER_PASSWORD_ERROR--}</span>';
 		}
 	} else {
 		// Could not load profile
-		$content['message'] = '<span class="notice">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>';
+		$content['message'] = '<span class="bad">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>';
 	}
 
 	// Send email to user if required
@@ -1636,7 +1647,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '', $templateName = '') {
 	// Start the output
 	$OUT = '<select name="' . $name . '" size="1" class="form_select">
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
@@ -1645,8 +1656,14 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
 	foreach ($options as $option) {
 		// Add the <option> entry from ...
 		if (empty($optionContent)) {
-			// ... template
-			$OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
+			// Is a template name given?
+			if (empty($templateName)) {
+				// ... $name template
+				$OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
+			} else {
+				// ... $templateName template
+				$OUT .= loadTemplate('select_' . $templateName . $extraName . '_option', true, $option);
+			}
 		} else {
 			// ... direct HTML code
 			$OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
@@ -1662,7 +1679,13 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
 	);
 
 	// Load template and return it
-	return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
+	if (empty($templateName)) {
+		// Use name from $name + $extraName
+		return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
+	} else {
+		// Use name from $templateName + $extraName
+		return loadTemplate('select_' . $templateName . $extraName . '_box', true, $content);
+	}
 }
 
 // Prepares the header for HTML output
@@ -1707,8 +1730,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
@@ -1796,7 +1819,7 @@ function doTemplateColorSwitch ($template, $clear = false, $return = true) {
 // Helper function for extension registration link
 function doTemplateExtensionRegistrationLink ($template, $clear, $ext_name) {
 	// Default is all non-productive
-	$OUT = '<em style="cursor:help" class="notice" title="{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE=' . $ext_name . '%}">{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}</em>';
+	$OUT = '<div style="cursor:help" class="notice" title="{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE=' . $ext_name . '%}">{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}</div>';
 
 	// Is the given extension non-productive?
 	if (isExtensionProductive($ext_name)) {
@@ -1823,7 +1846,7 @@ function doTemplateAdminMemberMailLinks ($template, $clear, $mailId) {
 // Helper function to create a selection box for YES/NO configuration entries
 function doTemplateConfigurationYesNoSelectionBox ($template, $clear, $configEntry) {
 	// Default is a "missing entry" warning
-	$OUT = '<em style="cursor:help" class="notice" title="{%message,ADMIN_CONFIG_ENTRY_MISSING=' . $configEntry . '%}">!' . $configEntry . '!</em>';
+	$OUT = '<div class="bad" style="cursor:help" title="{%message,ADMIN_CONFIG_ENTRY_MISSING=' . $configEntry . '%}">!' . $configEntry . '!</div>';
 
 	// Generate the HTML code
 	if (isConfigEntrySet($configEntry)) {
@@ -1859,5 +1882,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]
 ?>