X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=caa72894e601397b79899555565c2e7778104e3e;hb=3eb06053f9ae59084815875654465a2fb25829a6;hp=9d8412562c1ec72d02d08e28957a32ab5531a8ae;hpb=e1ef1bcf28ab7a512037c5391249ac7d92ed48d6;p=mailer.git diff --git a/inc/template-functions.php b/inc/template-functions.php index 9d8412562c..caa72894e6 100644 --- a/inc/template-functions.php +++ b/inc/template-functions.php @@ -10,11 +10,6 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Template-Funktionen * * -------------------------------------------------------------------- * - * $Revision:: $ * - * $Date:: $ * - * $Tag:: 0.2.1-FINAL $ * - * $Author:: $ * - * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * * Copyright (c) 2009 - 2013 by Mailer Developer Team * * For more information visit: http://mxchange.org * @@ -305,7 +300,7 @@ function loadTemplate ($template, $return = FALSE, $content = array(), $compileC } // Init returned content - $ret = ''; + $templateContent = ''; // Set current template $GLOBALS['current_template'] = $template; @@ -356,11 +351,11 @@ function loadTemplate ($template, $return = FALSE, $content = array(), $compileC } elseif (substr($template, 0, 3) == 'js_') { // JavaScripts don't like entities, dollar signs and timings //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Reached!'); - $GLOBALS['template_eval']['html'][$template] = '$templateContent = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), TRUE, $compileCode) . '");'; + $GLOBALS['template_eval']['html'][$template] = '$templateContent = decodeEntities("' . escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]) . '");'; } elseif (isAjaxOutputMode()) { // AJAX (JSON content) //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Reached!'); - $GLOBALS['template_eval']['html'][$template] = '$templateContent = "' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), TRUE, $compileCode) . '";'; + $GLOBALS['template_eval']['html'][$template] = '$templateContent = "' . escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]) . '";'; } else { // Prepare eval() command, other output doesn't like entities, maybe //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Reached!'); @@ -374,11 +369,11 @@ function loadTemplate ($template, $return = FALSE, $content = array(), $compileC } elseif (isAjaxOutputMode()) { // AJAX (JSON content) //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Reached!'); - $GLOBALS['template_eval']['html'][$template] = '$templateContent = "' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), TRUE, $compileCode) . '";'; + $GLOBALS['template_eval']['html'][$template] = '$templateContent = "' . escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]) . '";'; } else { // JavaScript again //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Reached!'); - $GLOBALS['template_eval']['html'][$template] = '$templateContent = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]), TRUE, $compileCode) . '");'; + $GLOBALS['template_eval']['html'][$template] = '$templateContent = decodeEntities("' . escapeJavaScriptQuotes($GLOBALS['template_content']['html'][$template]) . '");'; } // END - if } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) { // Only admins shall see this warning or when installation mode is active @@ -649,9 +644,13 @@ function compileCode ($code, $full = TRUE, $compileCode = TRUE) { // Compiles the code function compileRawCode ($code, $full = TRUE, $compileCode = TRUE) { + //* DIE: */ reportBug(__FUNCTION__, __LINE__, 'Called with ' . strlen($code) . ' code length.'); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Called with code()=' . strlen($code) . ',full=' . intval($full) . ',compileCode=' . intval($compileCode)); + // Is the code a string or shall we not compile? if ((!is_string($code)) || ($compileCode === FALSE)) { // Silently return it + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code[]= ' . gettype($code) . ' is not a string or compileCode(' . intval($compileCode) . ') is FALSE.'); return $code; } // END - if @@ -663,17 +662,19 @@ function compileRawCode ($code, $full = TRUE, $compileCode = TRUE) { $secChars = $GLOBALS['security_chars']; } // END - if - // Compile more through a filter - $code = runFilterChain('compile_code', $code); - // First compile these chars array_unshift($secChars['to'] , '{--' , '--}'); array_unshift($secChars['from'], '{%message,', '%}' ); - // Compile QUOT and other non-HTML codes + // Replace QUOT and other non-HTML codes + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code()=' . strlen($code) . ' - before str_replace() ...'); $code = str_replace($secChars['to'], $secChars['from'], $code); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code()=' . strlen($code) . ' - after str_replace() ...'); + + // Compile the prepared code through a filter chain + $code = runFilterChain('compile_code', $code); - // Find $content[bla][blub] entries + // Find all $content[bla][blub] entries preg_match_all('/\$content((\[([a-zA-Z0-9-_]+)\])*)/', $code, $matches); //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Second regex gave ' . count($matches[0]) . ' matches.'); @@ -760,10 +761,17 @@ function compileRawCode ($code, $full = TRUE, $compileCode = TRUE) { } // END - if } // END - if - // Replace {COMPILE_DOLLAR} back to dollar sign - $code = str_replace('{COMPILE_DOLLAR}', '$', $code); + // Add 'COMPILE_DOLLAR' again + array_push($secChars['to'] , '{COMPILE_DOLLAR}'); + array_push($secChars['from'], '$'); + + // Replace QUOT and other non-HTML codes + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code()=' . strlen($code) . ' - before str_replace() ...'); + $code = str_replace($secChars['to'], $secChars['from'], $code); + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'code()=' . strlen($code) . ' - after str_replace() ...'); // Finally return it + //* NOISY-DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Exiting with code()=' . strlen($code)); return $code; } @@ -859,7 +867,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = NULL, $class = 'f case 'ho': // Hours for ($idx = 0; $idx <= 23; $idx++) { - $padded = padLeftZero($idx); + $padded = padLeftZero($idx, 2); $OUT .= '