(' . $template . ')
@@ -432,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--}';
@@ -480,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 = '
@@ -498,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--}';
@@ -507,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.";
@@ -651,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') {
@@ -1037,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);
@@ -1521,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
@@ -1554,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
@@ -1565,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 = '