X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=5e163cb6e4420a83d37488f5d344c9cbe44b0ac0;hb=33a76a20bc94ffe95e9f13906eb7dc5cf354948d;hp=3bd31a9dc458cbed32febd25ceb3b0817d81507e;hpb=b0dabab25084e67689015614bd2a9f91b608b27a;p=mailer.git
diff --git a/inc/template-functions.php b/inc/template-functions.php
index 3bd31a9dc4..5e163cb6e4 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -16,7 +16,7 @@
* $Author:: $ *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team *
* For more information visit: http://mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -144,7 +144,7 @@ function outputHtml ($htmlCode = NULL, $newLine = TRUE) {
reportBug(__FUNCTION__, __LINE__, '{--FATAL_ERROR--}: {--NO_RENDER_DIRECT--}');
break;
} // END - switch
- } elseif ((getPhpCaching() == 'on') && ((!isset($GLOBALS['http_header'])) || (count($GLOBALS['http_header']) == 0)) && (!isRawOutputMode())) {
+ } elseif ((getPhpCaching() == 'on') && (!isFilledArray($GLOBALS['http_header'])) && (!isRawOutputMode())) {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'getPhpCaching()=' . getPhpCaching() . ',isset(http_header)=' . intval(isset($GLOBALS['http_header'])) . ',getScriptOutputMode()=' . getScriptOutputMode() . '');
// Output cached HTML code
$GLOBALS['__output'] = ob_get_contents();
@@ -235,26 +235,26 @@ function doFinalCompilation ($code, $insertComments = TRUE, $enableCodes = TRUE)
enableTemplateHtml($insertComments);
// Init counter
- $count = 0;
+ $totalCompilations = 0;
// Compile all out
- while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== FALSE)) && ($count < 7)) {
+ while (((isInString('{--', $code)) || (isInString('{DQUOTE}', $code)) || (isInString('{?', $code)) || (isInString('{%', $code) !== FALSE)) && ($totalCompilations < 7)) {
// Init common variables
$content = array();
$newContent = '';
// Compile it
- //* DEBUG: */ debugOutput('
'.linenumberCode($code).'
');
+ //* DEBUG: */ debugOutput(''.lineNumberCode($code).'
');
$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), $enableCodes)) . '";';
- //* DEBUG: */ if (!$insertComments) print('EVAL='.linenumberCode($eval).'
');
+ //* DEBUG: */ if (!$insertComments) print('EVAL='.lineNumberCode($eval).'
');
eval($eval);
- //* DEBUG: */ if (!$insertComments) print('NEW='.linenumberCode($newContent).'
');
+ //* DEBUG: */ if (!$insertComments) print('NEW='.lineNumberCode($newContent).'
');
//* DEBUG: */ die(''.encodeEntities($newContent).'
');
// Was that eval okay?
if (empty($newContent)) {
// Something went wrong!
- reportBug(__FUNCTION__, __LINE__, 'Evaluation error:' . linenumberCode($eval) . '
', FALSE);
+ reportBug(__FUNCTION__, __LINE__, 'Evaluation error:' . lineNumberCode($eval) . '
', FALSE);
} // END - if
// Use it again
@@ -267,14 +267,14 @@ function doFinalCompilation ($code, $insertComments = TRUE, $enableCodes = TRUE)
} // END - if
// Count round
- $count++;
+ $totalCompilations++;
} // END - while
// Add debugging data in HTML code, if mode is enabled
if ((isDebugModeEnabled()) && ($insertComments === TRUE) && (isHtmlOutputMode())) {
// Add loop count
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'isDebugModeEnabled()=' . intval(isDebugModeEnabled()) . ',insertComments=' . intval($insertComments) . ',isHtmlOutputMode()=' . intval(isHtmlOutputMode()));
- $code .= '';
+ $code .= '';
} // END - if
// Return the compiled code
@@ -322,17 +322,17 @@ function loadTemplate ($template, $return = FALSE, $content = array(), $compileC
$template = strtolower($template);
// Base directory
- $basePath = sprintf("%stemplates/%s/html/", getPath(), getLanguage());
+ $basePath = getTemplateBasePath('html');
$extraPath = detectExtraTemplatePath('html', $template);
// Generate FQFN
- $FQFN = $basePath . $extraPath . $template . '.tpl';
+ $FQFN = $basePath . '/' . $extraPath . $template . '.tpl';
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Template ' . $template . ' is solved to FQFN=' . $FQFN);
// Does the special template exists?
if (!isFileReadable($FQFN)) {
// Reset to default template
- $FQFN = $basePath . $template . '.tpl';
+ $FQFN = $basePath . '/' . $template . '.tpl';
} // END - if
// Now does the final template exists?
@@ -509,18 +509,18 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
unset($GLOBALS['template_eval']['email'][$template]);
} elseif (!isset($GLOBALS['template_eval']['email'][$template])) {
// Base directory
- $basePath = sprintf("%stemplates/%s/emails/", getPath(), getLanguage());
+ $basePath = getTemplateBasePath('emails');
// Detect extra path
$extraPath = detectExtraTemplatePath('email', $template);
// Generate full FQFN
- $FQFN = $basePath . $extraPath . $template . '.tpl';
+ $FQFN = $basePath . '/' . $extraPath . $template . '.tpl';
// Does the special template exists?
if (!isFileReadable($FQFN)) {
// Reset to default template
- $FQFN = $basePath . $template . '.tpl';
+ $FQFN = $basePath . '/' . $template . '.tpl';
} // END - if
// Now does the final template exists?
@@ -562,6 +562,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = NULL, $load
// Eval the code
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template=' . $template . ' - BEFORE EVAL');
//* DEBUG: */ print(''.htmlentities($GLOBALS['template_eval']['email'][$template]).'
');
+ //* DEBUG: */ die(''.print_r($content, TRUE).'
'.htmlentities($GLOBALS['template_eval']['email'][$template]).'
');
eval($GLOBALS['template_eval']['email'][$template]);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'template=' . $template . ' - AFTER EVAL');
} // END - if
@@ -677,17 +678,20 @@ function compileRawCode ($code, $full = TRUE, $compileCode = TRUE) {
//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Second regex gave ' . count($matches[0]) . ' matches.');
// Are some matches found?
- if ((count($matches) > 0) && (count($matches[0]) > 0)) {
+ if ((isFilledArray($matches)) && (isFilledArray($matches[0]))) {
// Replace all matches
$matchesFound = array();
foreach ($matches[0] as $key => $match) {
// Fuzzy look has failed by default
$fuzzyFound = FALSE;
+ // "Cache" match length
+ $matchLength = strlen($match);
+
// Fuzzy look on match if already found
foreach ($matchesFound as $found => $set) {
// Get test part
- $test = substr($found, 0, strlen($match));
+ $test = substr($found, 0, $matchLength);
// Does this entry exist?
//* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'found=' . $found . ',match=' . $match . ',set=' . $set);
@@ -734,7 +738,7 @@ function compileRawCode ($code, $full = TRUE, $compileCode = TRUE) {
preg_match_all('/\$([a-z_A-Z\[\]]){0,}/', $code, $matches);
// Are some matches found?
- if ((count($matches) > 0) && (count($matches[0]) > 0)) {
+ if ((isFilledArray($matches)) && (isFilledArray($matches[0]))) {
// Scan all matches for not $content
foreach ($matches[0] as $match) {
// Trim match
@@ -787,7 +791,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f
// Use configured min age or fixed?
if (isExtensionInstalledAndNewer('other', '0.2.1')) {
// Configured
- $startYear = $year - getConfig('min_age');
+ $startYear = $year - getMinAge();
} else {
// Fixed 16 years
$startYear = $year - 16;
@@ -829,6 +833,14 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f
} // END - for
break;
+ case 'mn': // Months, numeric
+ for ($idx = 0; $idx <= 12; $idx++) {
+ $OUT .= '';
} // END - for
break;
case 'ho': // Hours
- for ($idx = 0; $idx < 24; $idx++) {
- if (strlen($idx) == 1) $idx = 0 . $idx;
- $OUT .= '