X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=3dfc1671a36b170fa1c5c26d1da31e71bdd473c8;hb=51445737bb5073ed87307b4eb8160aee53b6a9db;hp=ac4d85671b1790e9729f2be0b4252f16a9b66f1e;hpb=32fed28f469610c8bfdec7f18089cceea9e15df0;p=mailer.git

diff --git a/inc/template-functions.php b/inc/template-functions.php
index ac4d85671b..3dfc1671a3 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -56,7 +56,7 @@ function enableTemplateHtml ($enable = true) {
 // Default: true
 function isTemplateHtml () {
 	// Is the output_mode other than 0 (HTML), then no comments are enabled
-	if (getOutputMode() != 0) {
+	if (getScriptOutputMode() != 0) {
 		// No HTML
 		return false;
 	} else {
@@ -126,7 +126,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 	// Do we have HTML-Code here?
 	if (!empty($htmlCode)) {
 		// Yes, so we handle it as you have configured
-		switch (getConfig('OUTPUT_MODE')) {
+		switch (getOutputMode()) {
 			case 'render':
 				// That's why you don't need any \n at the end of your HTML code... :-)
 				if (getPhpCaching() == 'on') {
@@ -155,7 +155,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 
 			default:
 				// Huh, something goes wrong or maybe you have edited config.php ???
-				debug_report_bug(__FUNCTION__, __LINE__, '<strong>{--FATAL_ERROR--}:</strong> {--LANG_NO_RENDER_DIRECT--}');
+				debug_report_bug(__FUNCTION__, __LINE__, '<strong>{--FATAL_ERROR--}:</strong> {--NO_RENDER_DIRECT--}');
 				break;
 		} // END - switch
 	} elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['header'])) || (count($GLOBALS['header']) == 0))) {
@@ -175,7 +175,7 @@ function outputHtml ($htmlCode, $newLine = true) {
 
 		// Output code here, DO NOT REMOVE! ;-)
 		outputRawCode($GLOBALS['output']);
-	} elseif ((getConfig('OUTPUT_MODE') == 'render') && (!empty($GLOBALS['output']))) {
+	} elseif ((getOutputMode() == 'render') && (!empty($GLOBALS['output']))) {
 		// Send all HTTP headers
 		sendHttpHeaders();
 
@@ -199,7 +199,7 @@ function compileFinalOutput () {
 	$GLOBALS['output'] = doFinalCompilation($GLOBALS['output']);
 
 	// Extension 'rewrite' installed?
-	if ((isExtensionActive('rewrite')) && (getOutputMode() != 1)) {
+	if ((isExtensionActive('rewrite')) && (getScriptOutputMode() != 1)) {
 		$GLOBALS['output'] = rewriteLinksInCode($GLOBALS['output']);
 	} // END - if
 
@@ -234,15 +234,15 @@ function doFinalCompilation ($code, $insertComments = true) {
 	$cnt = 0;
 
 	// Compile all out
-	while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($cnt < 4)) {
+	while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($cnt < 5)) {
 		// Init common variables
 		$content = array();
 		$newContent = '';
 
 		// Compile it
-		//* DEBUG: */ debugOutput('<pre>'.encodeEntities($code).'</pre>');
+		//* DEBUG: */ debugOutput('<pre>'.linenumberCode($code).'</pre>');
 		$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code))) . '";';
-		//* DEBUG: */ if ($insertComments) die('<pre>'.linenumberCode($eval).'</pre>');
+		//* DEBUG: */ if (!$insertComments) print('<pre>'.linenumberCode($eval).'</pre>');
 		eval($eval);
 		//* DEBUG: */ die('<pre>'.encodeEntities($newContent).'</pre>');
 
@@ -296,7 +296,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
 		if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0';
 
 		// Base directory
-		$basePath = sprintf("%stemplates/%s/html/", getConfig('PATH'), getLanguage());
+		$basePath = sprintf("%stemplates/%s/html/", getPath(), getLanguage());
 		$extraPath = detectExtraTemplatePath($template);;
 
 		////////////////////////
@@ -322,7 +322,7 @@ function loadTemplate ($template, $return = false, $content = array()) {
 			$ret = '';
 			if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
 				// Normal HTML output?
-				if (getOutputMode() == '0') {
+				if (getScriptOutputMode() == '0') {
 					// Add surrounding HTML comments to help finding bugs faster
 					$ret = '<!-- Template ' . $template . ' - Start //-->' . $GLOBALS['tpl_content'] . '<!-- Template ' . $template . ' - End //-->';
 
@@ -351,8 +351,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
 <div class="para">
 	{--TEMPLATE_CONTENT--}
 	<pre>' . print_r($content, true) . '</pre>
-	{--TEMPLATE_DATA--}
-	<pre>' . print_r($DATA, true) . '</pre>
 </div>';
 		} else {
 			// No file!
@@ -446,12 +444,12 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 	// Is content an array?
 	if (is_array($content)) {
 		// Add expiration to array
-		if ((isConfigEntrySet('auto_purge')) && (getConfig('auto_purge') == '0')) {
+		if ((isConfigEntrySet('auto_purge')) && (getAutoPurge() == '0')) {
 			// Will never expire!
 			$content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}';
 		} elseif (isConfigEntrySet('auto_purge')) {
 			// Create nice date string
-			$content['expiration'] = createFancyTime(getConfig('auto_purge'));
+			$content['expiration'] = createFancyTime(getAutoPurge());
 		} else {
 			// Missing entry
 			$content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}';
@@ -460,7 +458,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 
 	// Load user's data
 	//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "UID={$userid},template={$template},content[]=".gettype($content));
-	if (($userid > 0) && (is_array($content))) {
+	if ((isValidUserId($userid)) && (is_array($content))) {
 		// If nickname extension is installed, fetch nickname as well
 		if ((isExtensionActive('nickname')) && (isNicknameUsed($userid))) {
 			//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NICKNAME!<br />");
@@ -481,7 +479,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
 	} // END - if
 
 	// Base directory
-	$basePath = sprintf("%stemplates/%s/emails/", getConfig('PATH'), getLanguage());
+	$basePath = sprintf("%stemplates/%s/emails/", getPath(), getLanguage());
 
 	// Detect extra path
 	$extraPath = detectExtraTemplatePath($template);
@@ -704,7 +702,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
 
 		case 'year': // Year
 			// Get current year
-			$year = date('Y', time());
+			$year = getYear();
 
 			// Use configured min age or fixed?
 			if (isExtensionInstalledAndNewer('order', '0.2.1')) {
@@ -736,10 +734,10 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 're
 				// Calculate earliest year depending on extension version
 				if (isExtensionInstalledAndNewer('order', '0.2.1')) {
 					// Use configured minimum age
-					$year = date('Y', time()) - getConfig('min_age');
+					$year = getYear() - getConfig('min_age');
 				} else {
 					// Use fixed 16 years age
-					$year = date('Y', time()) - 16;
+					$year = getYear() - 16;
 				}
 
 				// Construct year selection list
@@ -795,7 +793,7 @@ function generateImageOrCode ($img_code, $headerSent = true) {
 
 	// Load image
 	$img = sprintf("%s/theme/%s/images/code_bg.%s",
-		getConfig('PATH'),
+		getPath(),
 		getCurrentTheme(),
 		getConfig('img_type')
 	);
@@ -856,9 +854,9 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 
 	// Do we have a leap year?
 	$SWITCH = '0';
-	$TEST = date('Y', time()) / 4;
-	$M1 = date('m', time());
-	$M2 = date('m', (time() + $timestamp));
+	$TEST = getYear() / 4;
+	$M1 = getMonth();
+	$M2 = getMonth(time() + $timestamp);
 
 	// If so and if current time is before 02/29 and estimated time is after 02/29 then add 86400 seconds (one day)
 	if ((floor($TEST) == $TEST) && ($M1 == '02') && ($M2 > '02'))  $SWITCH = getConfig('ONE_DAY');
@@ -1155,7 +1153,7 @@ function displayParsingTime () {
 	// @TODO This can be easily moved out after the merge from EL branch to this is complete
 	$content = array(
 		'run_time' => $runTime,
-		'sql_time' => translateComma(getConfig('sql_time') * 1000),
+		'sql_time' => (getConfig('sql_time') * 1000),
 	);
 
 	// Load the template
@@ -1167,7 +1165,7 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
 	// Is this already called?
 	if (isset($GLOBALS[__FUNCTION__])) {
 		// Other backtrace
-		print 'Message:'.$message.'<br />Backtrace:<pre>';
+		print 'Message:' . $message . '<br />Backtrace:<pre>';
 		debug_print_backtrace();
 		die('</pre>');
 	} // END - if
@@ -1190,7 +1188,7 @@ function debug_report_bug ($F, $L, $message = '', $sendEmail = true) {
 	} // END - if
 
 	// Add output
-	$debug .= 'Please report this bug at <a title="Direct link to the bug-tracker" href="http://bugs.mxchange.org" rel="external" target="_blank">http://bugs.mxchange.org</a> and include the logfile from <strong>' . str_replace(getConfig('PATH'), '', getConfig('CACHE_PATH')) . 'debug.log</strong> in your report (you can now attach files):<pre>';
+	$debug .= 'Please report this bug at <a title="Direct link to the bug-tracker" href="http://bugs.mxchange.org" rel="external" target="_blank">http://bugs.mxchange.org</a> and include the logfile from <strong>' . str_replace(getPath(), '', getCachePath()) . 'debug.log</strong> in your report (you can now attach files):<pre>';
 	$debug .= debug_get_printable_backtrace();
 	$debug .= '</pre>';
 	$debug .= '<div>Request-URI: ' . getRequestUri() . '</div>';
@@ -1349,7 +1347,7 @@ function determinePageTitle () {
 		$TITLE = '';
 
 		// Title decoration enabled?
-		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left')) . ' ';
+		if ((isTitleDecorationEnabled()) && (getConfig('title_left') != '')) $TITLE .= trim(getConfig('title_left')) . ' ';
 
 		// Do we have some extra title?
 		if (isExtraTitleSet()) {
@@ -1358,27 +1356,27 @@ function determinePageTitle () {
 		} // END - if
 
 		// Add main title
-		$TITLE .= getConfig('MAIN_TITLE');
+		$TITLE .= getMainTitle();
 
 		// Add title of module? (middle decoration will also be added!)
-		if ((getConfig('enable_mod_title') == 'Y') || ((!isWhatSet()) && (!isActionSet())) || (getModule() == 'admin')) {
-			$TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getModuleTitle(getModule());
+		if ((isModuleTitleEnabled()) || ((!isWhatSet()) && (!isActionSet())) || (getModule() == 'admin')) {
+			$TITLE .= ' ' . trim(getConfig('title_middle')) . ' {DQUOTE} . getModuleTitle(getModule()) . {DQUOTE}';
 		} // END - if
 
 		// Add title from what file
 		$mode = '';
 		if (getModule() == 'login') $mode = 'member';
 		elseif (getModule() == 'index') $mode = 'guest';
-		if ((!empty($mode)) && (getConfig('enable_what_title') == 'Y')) $TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getTitleFromMenu($mode, getWhat());
+		if ((!empty($mode)) && (isWhatTitleEnabled())) $TITLE .= ' ' . trim(getConfig('title_middle')) . ' ' . getTitleFromMenu($mode, getWhat());
 
 		// Add title decorations? (right)
-		if ((getConfig('enable_title_deco') == 'Y') && (getConfig('title_right') != '')) $TITLE .= ' ' . trim(getConfig('title_right'));
+		if ((isTitleDecorationEnabled()) && (getConfig('title_right') != '')) $TITLE .= ' ' . trim(getConfig('title_right'));
 
 		// Remember title in constant for the template
 		$pageTitle = $TITLE;
 	} elseif ((isInstalled()) && (isAdminRegistered())) {
 		// Installed, admin registered but no ext-sql_patches
-		$pageTitle = '[-- ' . getConfig('MAIN_TITLE') . ' - ' . getModuleTitle(getModule()) . ' --]';
+		$pageTitle = '[-- ' . getMainTitle() . ' - ' . getModuleTitle(getModule()) . ' --]';
 	} elseif ((isInstalled()) && (!isAdminRegistered())) {
 		// Installed but no admin registered
 		$pageTitle = '{--SETUP_OF_MAILER--}';
@@ -1452,6 +1450,9 @@ function escapeQuotes ($str, $single = false) {
 		// Escape all (including null)
 		$str = addslashes($str);
 	} else {
+		// Remove escaping of single quotes
+		$str = str_replace("\'", "'", $str);
+
 		// Escape only double-quotes but prevent double-quoting
 		$str = str_replace("\\\\", "\\", str_replace('"', "\\\"", $str));
 	}
@@ -1521,7 +1522,7 @@ function sendModeMails ($mod, $modes) {
 					// Load template
 					$message = loadEmailTemplate('member_mydata_notify', $content, getMemberId());
 
-					if (getConfig('admin_notify') == 'Y') {
+					if (isAdminNotificationEnabled()) {
 						// The admin needs to be notified about a profile change
 						$message_admin = 'admin_mydata_notify';
 						$sub_adm   = '{--ADMIN_CHANGED_DATA--}';
@@ -1535,7 +1536,7 @@ function sendModeMails ($mod, $modes) {
 					$sub_mem = '{--MEMBER_CHANGED_DATA--}';
 
 					// Output success message
-					$content = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
+					$content = '<span class="member_done">{--MEMBER_MYDATA_MAIL_SENT--}</span>';
 					break;
 
 				default: // Unsupported module!
@@ -1563,12 +1564,12 @@ function sendModeMails ($mod, $modes) {
 		if ((!empty($sub_adm)) && (!empty($message_admin))) {
 			// Send admin mail
 			sendAdminNotification($sub_adm, $message_admin, $content, getMemberId());
-		} elseif (getConfig('admin_notify') == 'Y') {
+		} elseif (isAdminNotificationEnabled()) {
 			// Cannot send mails to admin!
 			$content = '{--CANNOT_SEND_ADMIN_MAILS--}';
 		} else {
 			// No mail to admin
-			$content = '<span class="member_done">{--MYDATA_MAIL_SENT--}</span>';
+			$content = '<span class="member_done">{--MEMBER_MYDATA_MAIL_SENT--}</span>';
 		}
 	} // END - if
 
@@ -1600,8 +1601,6 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
 	// Prepare output
 	$content = array(
 		'selection_box' => $OUT,
-		'module'        => getModule(),
-		'what'          => getWhat()
 	);
 
 	// Load template and return it
@@ -1661,7 +1660,7 @@ function generateCacheFqfn ($template, $mode = 'html') {
 		// Generate the FQFN
 		$GLOBALS['template_cache_fqfn'][$template] = sprintf(
 			"%s_compiled/%s/%s.tpl.cache",
-			getConfig('CACHE_PATH'),
+			getCachePath(),
 			$mode,
 			$template
 		);