Removed

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 08fa2e50c288b79126e14226ac601289b3c16cb7..eeba4db76cad0d6327f1c39de93eae5f23938e0b 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -218,7 +218,7 @@ function doFinalCompilation ($code, $insertComments = true, $enableCodes = true)
        $count = 0;
 
        // Compile all out
-       while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($count < 5)) {
+       while (((strpos($code, '{--') !== false) || (strpos($code, '{DQUOTE}') !== false) || (strpos($code, '{?') !== false) || (strpos($code, '{%') !== false)) && ($count < 7)) {
                // Init common variables
                $content = array();
                $newContent = '';
@@ -431,7 +431,7 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
                        $content['expiration'] = '{--MAIL_WILL_NEVER_EXPIRE--}';
                } elseif (isConfigEntrySet('auto_purge')) {
                        // Create nice date string
-                       $content['expiration'] = '{%pipe,getAutoPurge,createFancyTime%}';
+                       $content['expiration'] = '{%config,createFancyTime=auto_purge%}';
                } else {
                        // Missing entry
                        $content['expiration'] = '{--MAIL_NO_CONFIG_AUTO_PURGE--}';
@@ -443,20 +443,28 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
        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 />");
                        // Load by nickname
+                       //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NICKNAME!<br />");
                        fetchUserData($userid, 'nickname');
+               } elseif (isNicknameUsed($userid)) {
+                       // Non-number characters entered but no ext-nickname found
+                       debug_report_bug(__FUNCTION__, __LINE__, 'userid=' . $userid . ': is no id number and ext-nickname is gone.');
                } else {
+                       // Load by userid
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NO-NICK!<br />");
-                       /// Load by userid
                        fetchUserData($userid);
                }
 
                // Merge data if valid
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - PRE<br />");
                if ((isUserDataValid()) && ($loadUserData === true)) {
+                       // It is valid
                        $content = merge_array($content, getUserDataArray());
+
+                       // But we don't like hashed passwords be mailed
+                       unset($content['password']);
                } // END - if
+
                //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "content()=".count($content)." - AFTER<br />");
        } // END - if
 
@@ -689,7 +697,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
                        $year = getYear();
 
                        // Use configured min age or fixed?
-                       if (isExtensionInstalledAndNewer('order', '0.2.1')) {
+                       if (isExtensionInstalledAndNewer('other', '0.2.1')) {
                                // Configured
                                $startYear = $year - getConfig('min_age');
                        } else {
@@ -716,7 +724,7 @@ function addSelectionBox ($type, $default, $prefix = '', $id = '0', $class = 'fo
                                // Get current year and subtract the configured minimum age
                                $OUT .= '<option value="' . ($minYear - 1) . '">&lt;' . $minYear . '</option>';
                                // Calculate earliest year depending on extension version
-                               if (isExtensionInstalledAndNewer('order', '0.2.1')) {
+                               if (isExtensionInstalledAndNewer('other', '0.2.1')) {
                                        // Use configured minimum age
                                        $year = getYear() - getConfig('min_age');
                                } else {
@@ -1067,6 +1075,12 @@ function generateMemberAdminActionLinks ($userid) {
                $OUT .= '--}</a></span>|';
        } // END - foreach
 
+       // Add special link, in case of the account is unconfirmed
+       if ($status == 'UNCONFIRMED') {
+               // Add it
+               $OUT .= '<span class="admin_user_link"><a target="_blank" title="{--ADMIN_USER_ACTION_LINK_CONFIRM_ACCOUNT_TITLE--}" href="{%url=confirm.php?hash=' . getFetchedUserData('userid', $userid, 'user_hash') . '%}">{--ADMIN_USER_ACTION_LINK_CONFIRM_ACCOUNT--}</a></span>|';
+       } // END - if
+
        // Finish navigation link
        $OUT = substr($OUT, 0, -1) . ']';
 
@@ -1255,7 +1269,7 @@ function generateExtensionOutdatedMessage ($ext_name, $ext_ver) {
        } // END - if
 
        // Default message
-       $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_OUTDATED', $ext_name);
+       $message = '{%message,EXTENSION_PROBLEM_EXTENSION_OUTDATED=' . $ext_name . '%}';
 
        // Is an admin logged in?
        if (isAdmin()) {
@@ -1276,12 +1290,12 @@ function generateExtensionInactiveMessage ($ext_name) {
        } // END - if
 
        // Default message
-       $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name);
+       $message = '{%message,EXTENSION_PROBLEM_EXTENSION_INACTIVE=' . $ext_name . '%}';
 
        // Is an admin logged in?
        if (isAdmin()) {
                // Then output admin message
-               $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE', $ext_name);
+               $message = '{%message,ADMIN_EXTENSION_PROBLEM_EXTENSION_INACTIVE=' . $ext_name . '%}';
        } // END - if
 
        // Return prepared message
@@ -1297,12 +1311,12 @@ function generateExtensionNotInstalledMessage ($ext_name) {
        } // END - if
 
        // Default message
-       $message = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
+       $message = '{%message,EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED=' . $ext_name . '%}';
 
        // Is an admin logged in?
        if (isAdmin()) {
                // Then output admin message
-               $message = getMaskedMessage('ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', $ext_name);
+               $message = '{%message,ADMIN_EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED=' . $ext_name . '%}';
        } // END - if
 
        // Return prepared message
@@ -1575,9 +1589,9 @@ function sendModeMails ($mod, $modes) {
        }
 
        // Send email to user if required
-       if ((!empty($sub_mem)) && (!empty($message)) && (!empty($content['email']))) {
+       if ((!empty($sub_mem)) && (!empty($message)) && (!empty($content['userid']))) {
                // Send member mail
-               sendEmail($content['email'], $sub_mem, $message);
+               sendEmail($content['userid'], $sub_mem, $message);
        } // END - if
 
        // Send only if no other error has occured
@@ -1597,7 +1611,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray (array $options, $name, $optionValue, $optionContent = '', $extraName = '') {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
        // Start the output
        $OUT = '<select name="' . $name . '" size="1" class="form_select">
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';