X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Ftemplate-functions.php;h=0c10acd3396a0a8fbc565c25a3062d6dc93f2c4b;hb=34b1f5b69205b08c760d6dcc87ef6a2d1c291261;hp=3f28df112407f20140ab25decc065a3191e04fa8;hpb=73e9d78e610057f6c6d311328b3ad438ad017791;p=mailer.git

diff --git a/inc/template-functions.php b/inc/template-functions.php
index 3f28df1124..0c10acd339 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -455,8 +455,13 @@ function loadEmailTemplate ($template, $content = array(), $userid = '0', $loadU
 		// 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
 
@@ -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
 //-----------------------------------------------------------------------------