Referal level is now NULL

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

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 3f28df112407f20140ab25decc065a3191e04fa8..829c80fea130af34e936297b514061d4897d51ed 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -448,15 +448,20 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
                        fetchUserData($userid, 'nickname');
                } else {
                        //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, "NO-NICK!<br />");
-                       /// Load by userid
+                       // 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 +694,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 +721,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 {
@@ -1027,7 +1032,9 @@ function createTimeSelections ($timestamp, $prefix = '', $display = '', $align =
 // Generate a list of administrative links to a given userid
 function generateMemberAdminActionLinks ($userid) {
        // Make sure userid is a number
-       if ($userid != bigintval($userid)) debug_report_bug(__FUNCTION__, __LINE__, 'userid is not a number!');
+       if ($userid != bigintval($userid)) {
+               debug_report_bug(__FUNCTION__, __LINE__, 'userid is not a number!');
+       } // END - if
 
        // Define all main targets
        $targetArray = array('del_user', 'edit_user', 'lock_user', 'add_points', 'sub_points');
@@ -1595,7 +1602,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
+function generateSelectionBoxFromArray (array $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>';
@@ -1714,6 +1721,21 @@ function displayMessage ($message, $return = false) {
        return loadTemplate('admin_settings_saved', $return, $message);
 }
 
+// Generates a selection box for (maybe) given gender
+function generateGenderSelectionBox ($selectedGender = '') {
+       // Start the HTML code
+       $out  = '<select name="gender" size="1" class="form_select">';
+
+       // Add the options
+       $out .= generateOptionList('/ARRAY/', array('M', 'F', 'C'), array('{--GENDER_M--}', '{--GENDER_F--}', '{--GENDER_C--}'), $selectedGender);
+
+       // Finish HTML code
+       $out .= '</select>';
+
+       // Return the code
+       return $out;
+}
+
 //-----------------------------------------------------------------------------
 //                      Template helper functions for EL
 //-----------------------------------------------------------------------------