From a8d110dd123d3321aeccd39fb80eeebc421e4cf0 Mon Sep 17 00:00:00 2001
From: unknown <Peter@.(none)>
Date: Sun, 7 Nov 2010 12:13:39 +0100
Subject: [PATCH 594/594] Modified account_prefs_inc.php so the code is now smaller

---
 account_prefs_inc.php |  168 +++++++++---------------------------------------
 1 files changed, 32 insertions(+), 136 deletions(-)

diff --git a/account_prefs_inc.php b/account_prefs_inc.php
index c51e5dc..f25a2c1 100644
--- a/account_prefs_inc.php
+++ b/account_prefs_inc.php
@@ -105,134 +105,43 @@
 	</td>
 </tr>
 <?php
+	$t_email_settings = array (
+		'email_on_new',
+		'email_on_assigned',
+		'email_on_feedback',
+		'email_on_resolved',
+		'email_on_closed',
+		'email_on_reopened',
+		'email_on_bugnote',
+		'email_on_status',
+		'email_on_priority',
+	);
+	
+	$t_email_categories = array (
+		'email_on_bugnote'  => 'email_on_bugnote_added',
+		'email_on_status'   => 'email_on_status_change',
+		'email_on_priority' => 'email_on_priority_change',
+	);
+		
 	if ( ON == config_get( 'enable_email_notification' ) ) {
+		foreach ( $t_email_settings as $t_email_setting ) {
+			$t_email_category = ( isset($t_email_categories[$t_email_setting]) ) ? $t_email_categories[$t_email_setting] : $t_email_setting;	
 ?>
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
-		<?php echo lang_get( 'email_on_new' ) ?>
+		<?php echo lang_get( $t_email_category ) ?>
 	</td>
 	<td>
-		<input type="checkbox" name="email_on_new" <?php check_checked( $t_pref->email_on_new, ON ); ?> />
+		<input type="checkbox" name="<?php echo $t_email_setting ?>" <?php check_checked( eval ( 'return $t_pref->'.$t_email_setting.';' ), ON ); ?> />
 		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_new_min_severity">
+		<select name="<?php echo $t_email_setting ?>_min_severity">
 			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
 			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_new_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_assigned' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_assigned" <?php check_checked( $t_pref->email_on_assigned, ON ); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_assigned_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_assigned_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_feedback' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_feedback" <?php check_checked( $t_pref->email_on_feedback, ON ); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_feedback_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_feedback_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_resolved' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_resolved" <?php check_checked( $t_pref->email_on_resolved, ON ); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_resolved_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_resolved_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_closed' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_closed" <?php check_checked( $t_pref->email_on_closed, ON ); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_closed_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_closed_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_reopened' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_reopened" <?php check_checked( $t_pref->email_on_reopened, ON ); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_reopened_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_reopened_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_bugnote_added' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_bugnote" <?php check_checked( $t_pref->email_on_bugnote, ON ); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_bugnote_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_bugnote_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_status_change' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_status" <?php check_checked( $t_pref->email_on_status, ON ); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_status_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_status_min_severity ) ?>
-		</select>
-	</td>
-</tr>
-<tr <?php echo helper_alternate_class() ?>>
-	<td class="category">
-		<?php echo lang_get( 'email_on_priority_change' ) ?>
-	</td>
-	<td>
-		<input type="checkbox" name="email_on_priority" <?php check_checked( $t_pref->email_on_priority , ON); ?> />
-		<?php echo lang_get( 'with_minimum_severity' ) ?>
-		<select name="email_on_priority_min_severity">
-			<option value="<?php echo OFF ?>"><?php echo lang_get( 'any' ) ?></option>
-			<option disabled="disabled">-----</option>
-			<?php print_enum_string_option_list( 'severity', $t_pref->email_on_priority_min_severity ) ?>
+			<?php print_enum_string_option_list( 'severity', eval ( 'return $t_pref->'.$t_email_setting.'_min_severity;' ) ) ?>
 		</select>
 	</td>
 </tr>
+<?php  } ?>
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
 		<?php echo lang_get( 'email_bugnote_limit' ) ?>
@@ -241,27 +150,14 @@
 		<input type="text" name="email_bugnote_limit" maxlength="2" size="2" value="<?php echo $t_pref->email_bugnote_limit ?>" />
 	</td>
 </tr>
-<?php } else { ?>
-		<input type="hidden" name="email_on_new"      value="<?php echo $t_pref->email_on_new ?>" />
-		<input type="hidden" name="email_on_assigned" value="<?php echo $t_pref->email_on_assigned ?>" />
-		<input type="hidden" name="email_on_feedback" value="<?php echo $t_pref->email_on_feedback ?>" />
-		<input type="hidden" name="email_on_resolved" value="<?php echo $t_pref->email_on_resolved ?>" />
-		<input type="hidden" name="email_on_closed"   value="<?php echo $t_pref->email_on_closed ?>" />
-		<input type="hidden" name="email_on_reopened" value="<?php echo $t_pref->email_on_reopened ?>" />
-		<input type="hidden" name="email_on_bugnote"  value="<?php echo $t_pref->email_on_bugnote ?>" />
-		<input type="hidden" name="email_on_status"   value="<?php echo $t_pref->email_on_status ?>" />
-		<input type="hidden" name="email_on_priority" value="<?php echo $t_pref->email_on_priority ?>" />
-		<input type="hidden" name="email_on_new_min_severity"      value="<?php echo $t_pref->email_on_new_min_severity ?>" />
-		<input type="hidden" name="email_on_assigned_min_severity" value="<?php echo $t_pref->email_on_assigned_min_severity ?>" />
-		<input type="hidden" name="email_on_feedback_min_severity" value="<?php echo $t_pref->email_on_feedback_min_severity ?>" />
-		<input type="hidden" name="email_on_resolved_min_severity" value="<?php echo $t_pref->email_on_resolved_min_severity ?>" />
-		<input type="hidden" name="email_on_closed_min_severity"   value="<?php echo $t_pref->email_on_closed_min_severity ?>" />
-		<input type="hidden" name="email_on_reopened_min_severity" value="<?php echo $t_pref->email_on_reopened_min_severity ?>" />
-		<input type="hidden" name="email_on_bugnote_min_severity"  value="<?php echo $t_pref->email_on_bugnote_min_severity ?>" />
-		<input type="hidden" name="email_on_status_min_severity"   value="<?php echo $t_pref->email_on_status_min_severity ?>" />
-		<input type="hidden" name="email_on_priority_min_severity" value="<?php echo $t_pref->email_on_priority_min_severity ?>" />
+<?php } else { 
+		foreach ( $t_email_settings as $t_email_setting ) {
+?>
+		<input type="hidden" name="<?php echo $t_email_setting ?>" value="<?php eval ( 'echo $t_pref->'.$t_email_setting.';' ) ?>" />
+		<input type="hidden" name="<?php echo $t_email_setting.'_min_severity' ?>" value="<?php eval ( 'echo $t_pref->'.$t_email_setting.';' ) ?>" />
 		<input type="hidden" name="email_bugnote_limit" value="<?php echo $t_pref->email_bugnote_limit ?>" />
-<?php } ?>
+<?php 	}
+	} ?>
 <tr <?php echo helper_alternate_class() ?>>
 	<td class="category">
 		<?php echo lang_get( 'timezone' ) ?>
-- 
1.6.2.msysgit.0.186.gf7512