X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Ftemplate-functions.php;h=4da8ef31b200524115d5b34bb1e23de321738988;hb=34bd67db3a98d58e2c3aee64af4fcb2dca1029c4;hp=daed3210c6a895a9dfbf6531807e1dc27657ebb9;hpb=675778ff98b75b6c5071e2709c2d6b0af86cf79d;p=mailer.git
diff --git a/inc/template-functions.php b/inc/template-functions.php
index daed3210c6..4da8ef31b2 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -14,8 +14,6 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
* Copyright (c) 2009, 2010 by Mailer Developer Team *
@@ -185,9 +183,11 @@ function compileFinalOutput () {
} // END - if
// Compress it?
+ /**
+ * @TODO On some pages this is buggy
if (!empty($_SERVER['HTTP_ACCEPT_ENCODING']) && (strpos('gzip', $_SERVER['HTTP_ACCEPT_ENCODING']) !== null)) {
// Compress it for HTTP gzip
- $GLOBALS['output'] = gzencode($GLOBALS['output'], 9, true);
+ $GLOBALS['output'] = gzencode($GLOBALS['output'], 9);
// Add header
sendHeader('Content-Encoding: gzip');
@@ -198,6 +198,7 @@ function compileFinalOutput () {
// Add header
sendHeader('Content-Encoding: deflate');
}
+ */
// Add final length
sendHeader('Content-Length: ' . strlen($GLOBALS['output']));
@@ -223,8 +224,9 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
// Compile it
//* DEBUG: */ debugOutput('
'.linenumberCode($code).'
');
$eval = '$newContent = "' . str_replace('{DQUOTE}', '"', compileCode(escapeQuotes($code), false, true, $enableCodes)) . '";';
- //* DEBUG: */ if (!$insertComments) print(''.linenumberCode($eval).'
');
+ //* DEBUG: */ if (!$insertComments) print('EVAL='.linenumberCode($eval).'
');
eval($eval);
+ //* DEBUG: */ if (!$insertComments) print('NEW='.linenumberCode($newContent).'
');
//* DEBUG: */ die(''.encodeEntities($newContent).'
');
// Was that eval okay?
@@ -274,7 +276,6 @@ function loadTemplate ($template, $return = false, $content = array()) {
// Init some data
$ret = '';
- if (empty($GLOBALS['refid'])) $GLOBALS['refid'] = '0';
// Base directory
$basePath = sprintf("%stemplates/%s/html/", getPath(), getLanguage());
@@ -295,34 +296,34 @@ function loadTemplate ($template, $return = false, $content = array()) {
incrementConfigEntry('num_templates');
// The local file does exists so we load it. :)
- $GLOBALS['tpl_content'] = readFromFile($FQFN);
+ $GLOBALS['tpl_content'][$template] = readFromFile($FQFN);
// Do we have to compile the code?
$ret = '';
- if ((strpos($GLOBALS['tpl_content'], '$') !== false) || (strpos($GLOBALS['tpl_content'], '{--') !== false) || (strpos($GLOBALS['tpl_content'], '{?') !== false) || (strpos($GLOBALS['tpl_content'], '{%') !== false)) {
+ 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)) {
// Normal HTML output?
if (isHtmlOutputMode()) {
// Add surrounding HTML comments to help finding bugs faster
- $ret = '' . $GLOBALS['tpl_content'] . '';
+ $ret = '' . $GLOBALS['tpl_content'][$template] . '';
// Prepare eval() command
$GLOBALS['template_eval'][$template] = '$ret = "' . getColorSwitchCode($template) . compileCode(escapeQuotes($ret)) . '";';
} elseif (substr($template, 0, 3) == 'js_') {
// JavaScripts don't like entities and timings
- $GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'])) . '");';
+ $GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeJavaScriptQuotes($GLOBALS['tpl_content'][$template])) . '");';
} else {
// Prepare eval() command, other output doesn't like entities, maybe
- $GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
+ $GLOBALS['template_eval'][$template] = '$ret = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'][$template])) . '");';
}
} else {
// Add surrounding HTML comments to help finding bugs faster
- $ret = '' . $GLOBALS['tpl_content'] . '';
+ $ret = '' . $GLOBALS['tpl_content'][$template] . '';
$GLOBALS['template_eval'][$template] = '$ret = "' . getColorSwitchCode($template) . compileRawCode(escapeQuotes($ret)) . '";';
} // END - if
} elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
// Only admins shall see this warning or when installation mode is active
$ret = '
- {--TEMPLATE_404--}
+ {--TEMPLATE_404--}
(' . $template . ')
@@ -428,7 +429,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
$content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}';
} elseif (isConfigEntrySet('auto_purge')) {
// Create nice date string
- $content['expiration'] = createFancyTime(getAutoPurge());
+ $content['expiration'] = '{%pipe,getAutoPurge,createFancyTime%}';
} else {
// Missing entry
$content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}';
@@ -476,11 +477,11 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
$newContent = '';
if (isFileReadable($FQFN)) {
// The local file does exists so we load it. :)
- $GLOBALS['tpl_content'] = readFromFile($FQFN);
+ $GLOBALS['tpl_content'][$template] = readFromFile($FQFN);
// Run code
- $GLOBALS['tpl_content'] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'])) . '");';
- eval($GLOBALS['tpl_content']);
+ $GLOBALS['tpl_content'][$template] = '$newContent = decodeEntities("' . compileRawCode(escapeQuotes($GLOBALS['tpl_content'][$template])) . '");';
+ eval($GLOBALS['tpl_content'][$template]);
} elseif (!empty($template)) {
// Template file not found!
$newContent = '
@@ -494,7 +495,10 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
';
// Debug mode not active? Then remove the HTML tags
- if (!isDebugModeEnabled()) $newContent = secureString($newContent);
+ if (!isDebugModeEnabled()) {
+ // Remove HTML tags
+ $newContent = secureString($newContent);
+ } // END - if
} else {
// No template name supplied!
$newContent = '{--NO_TEMPLATE_SUPPLIED--}';
@@ -503,7 +507,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0') {
// Is there some content?
if (empty($newContent)) {
// Compiling failed
- $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'];
+ $newContent = "Compiler error for template " . $template . " !\nUncompiled content:\n" . $GLOBALS['tpl_content'][$template];
// Add last error if the required function exists
if (function_exists('error_get_last')) $newContent .= "\n--------------------------------------\nDebug:\n".print_r(error_get_last(), true)."--------------------------------------\nPlease don't alter these informations!\nThanx.";
@@ -647,7 +651,7 @@ function compileRawCode ($code, $simple = false, $constants = true, $full = true
}
//
-function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'register_select') {
+function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'form_select') {
$OUT = '';
if ($type == 'yn') {
@@ -1033,19 +1037,25 @@ function generateMemberAdminActionLinks ($userid) {
$OUT = '[';
foreach ($targetArray as $tar) {
- $OUT .= '
{--ADMIN_';
+ $OUT .= '_TITLE--}">{--ADMIN_USER_ACTION_LINK_';
if (($tar == 'lock_user') && ($status == 'LOCKED')) {
// Locked accounts shall be unlocked
$OUT .= 'UNLOCK_USER';
+ } elseif ($tar == 'del_user') {
+ // @TODO Deprecate this thing
+ $OUT .= 'DELETE_USER';
} else {
// All other status is fine
$OUT .= strtoupper($tar);
@@ -1126,7 +1136,9 @@ function displayParsingTime () {
$start = explode(' ', $GLOBALS['startTime']);
$end = explode(' ', $endTime);
$runTime = $end[0] - $start[0];
- if ($runTime < 0) $runTime = '0';
+ if ($runTime < 0) {
+ $runTime = '0';
+ } // END - if
// Prepare output
// @TODO This can be easily moved out after the merge from EL branch to this is complete
@@ -1515,21 +1527,21 @@ function sendModeMails ($mod, $modes) {
$sub_mem = '{--MEMBER_CHANGED_DATA--}';
// Output success message
- $content = '{--MEMBER_MYDATA_MAIL_SENT--}';
+ $content = '{--MEMBER_MYDATA_MAIL_SENT--}';
break;
default: // Unsupported module!
logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
- $content = '{--UNKNOWN_MODULE--}';
+ $content = '{--UNKNOWN_MODULE--}';
break;
} // END - switch
} else {
// Passwords mismatch
- $content = '{--MEMBER_PASSWORD_ERROR--}';
+ $content = '{--MEMBER_PASSWORD_ERROR--}';
}
} else {
// Could not load profile
- $content = '{--MEMBER_CANNOT_LOAD_PROFILE--}';
+ $content = '{--MEMBER_CANNOT_LOAD_PROFILE--}';
}
// Send email to user if required
@@ -1548,7 +1560,7 @@ function sendModeMails ($mod, $modes) {
$content = '{--CANNOT_SEND_ADMIN_MAILS--}';
} else {
// No mail to admin
- $content = '{--MEMBER_MYDATA_MAIL_SENT--}';
+ $content = '{--MEMBER_MYDATA_MAIL_SENT--}';
}
} // END - if
@@ -1559,7 +1571,7 @@ function sendModeMails ($mod, $modes) {
// Generates a 'selection box' from given array
function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
// Start the output
- $OUT = '