Whitespace

mantisbt · Apr 5, 2015 · 71057a4 · 71057a4
1 parent 692ab72
commit 71057a4
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 45 deletions.
diff --git a/lost_pwd_page.php b/lost_pwd_page.php
@@ -60,16 +60,19 @@
 <div id="lost-password-div" class="form-container">
 	<form id="lost-password-form" method="post" action="lost_pwd.php">
 		<fieldset>
-			<legend><span><?php echo lang_get( 'lost_password_title' ); ?></span></legend>
-			 <ul id="login-links">
+			<legend>
+				<span><?php echo lang_get( 'lost_password_title' ); ?></span>
+			</legend>
+			<ul id="login-links">
 				<li><a href="login_page.php"><?php echo lang_get( 'login_link' ); ?></a></li>
 				<li><a href="signup_page.php"><?php echo lang_get( 'signup_link' ); ?></a></li>
-            </ul>
-			<?php
-			echo form_security_field( 'lost_pwd' );
+			</ul>
+<?php
+	echo form_security_field( 'lost_pwd' );
 
-			$t_allow_passwd = helper_call_custom_function( 'auth_can_change_password', array() );
-			if( $t_allow_passwd ) { ?>
+	$t_allow_passwd = helper_call_custom_function( 'auth_can_change_password', array() );
+	if( $t_allow_passwd ) {
+?>
 			<div class="field-container">
 				<label for="username"><span><?php echo lang_get( 'username' ) ?></span></label>
 				<span class="input"><input id="username" type="text" name="username" size="32" maxlength="<?php echo DB_FIELD_SIZE_USERNAME;?>" class="autofocus" /></span>
@@ -80,15 +83,20 @@
 				<span class="input"><?php print_email_input( 'email', '' ) ?></span>
 				<span class="label-style"></span>
 			</div>
+
 			<span class="info-text"><?php echo lang_get( 'lost_password_info' ); ?></span>
-			<span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'submit_button' ) ?>" /></span><?php
-			} else {
-				echo '<span class="info-text">';
-				echo lang_get( 'no_password_request' );
-				echo '</span>';
-			} ?>
+
+			<span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'submit_button' ) ?>" /></span>
+<?php
+	} else {
+?>
+			<span class="info-text"><?php echo lang_get( 'no_password_request' ); ?></span>
+<?php
+	}
+?>
 		</fieldset>
 	</form>
-</div><?php
+</div>
 
+<?php
 html_page_bottom1a( __FILE__ );
diff --git a/signup_page.php b/signup_page.php
@@ -71,15 +71,15 @@
 			<ul id="login-links">
 				<li><a href="login_page.php"><?php echo lang_get( 'login_link' ); ?></a></li>
 <?php
-			# lost password feature disabled or reset password via email disabled
-			if( ( LDAP != config_get_global( 'login_method' ) ) &&
-				( ON == config_get( 'lost_password_feature' ) ) &&
-				( ON == config_get( 'send_reset_password' ) ) &&
-				( ON == config_get( 'enable_email_notification' ) ) ) {
+	# lost password feature disabled or reset password via email disabled
+	if( ( LDAP != config_get_global( 'login_method' ) ) &&
+		( ON == config_get( 'lost_password_feature' ) ) &&
+		( ON == config_get( 'send_reset_password' ) ) &&
+		( ON == config_get( 'enable_email_notification' ) ) ) {
 ?>
 				<li><a href="lost_pwd_page.php"><?php echo lang_get( 'lost_password_link' ); ?></a></li>
 <?php
-			}
+	}
 ?>
 			</ul>
 
@@ -96,25 +96,26 @@
 			</div>
 
 <?php
-			$t_allow_passwd_change = helper_call_custom_function( 'auth_can_change_password', array() );
-			# captcha image requires GD library and related option to ON
-			if( ON == config_get( 'signup_use_captcha' ) && get_gd_version() > 0 && $t_allow_passwd_change ) {
-				$t_securimage_path = 'library/securimage';
-				$t_securimage_show = $t_securimage_path . '/securimage_show.php';
-				$t_securimage_play = $t_securimage_path . '/securimage_play.swf?'
-					. http_build_query( array(
-						'audio_file' => $t_securimage_path . '/securimage_play.php',
-						'bgColor1=' => '#fff',
-						'bgColor2=' => '#fff',
-						'iconColor=' => '#777',
-						'borderWidth=' => 1,
-						'borderColor=' => '#000',
-					) );
+	$t_allow_passwd_change = helper_call_custom_function( 'auth_can_change_password', array() );
+
+	# captcha image requires GD library and related option to ON
+	if( ON == config_get( 'signup_use_captcha' ) && get_gd_version() > 0 && $t_allow_passwd_change ) {
+		$t_securimage_path = 'library/securimage';
+		$t_securimage_show = $t_securimage_path . '/securimage_show.php';
+		$t_securimage_play = $t_securimage_path . '/securimage_play.swf?'
+			. http_build_query( array(
+				'audio_file' => $t_securimage_path . '/securimage_play.php',
+				'bgColor1=' => '#fff',
+				'bgColor2=' => '#fff',
+				'iconColor=' => '#777',
+				'borderWidth=' => 1,
+				'borderColor=' => '#000',
+			) );
 ?>
 			<div class="field-container">
-				<label for="captcha-field"><span><?php
-					echo lang_get( 'signup_captcha_request_label' );
-				?></span></label>
+				<label for="captcha-field">
+					<span><?php echo lang_get( 'signup_captcha_request_label' ); ?></span>
+				</label>
 				<span id="captcha-input" class="input">
 					<?php print_captcha_input( 'captcha' ); ?>
 
@@ -134,19 +135,20 @@
 				<span class="label-style"></span>
 			</div>
 <?php
-			}
-			if( !$t_allow_passwd_change ) {
-				echo '<span class="info-text">';
-				echo lang_get( 'no_password_request' );
-				echo '</span>';
-			}
-?>
+	}
 
+	if( !$t_allow_passwd_change ) {
+?>
+			<span class="info-text"><?php echo lang_get( 'no_password_request' ); ?></span>
+<?php
+	}
+?>
 			<span class="info-text"><?php echo lang_get( 'signup_info' ); ?></span>
 
 			<span class="submit-button"><input type="submit" class="button" value="<?php echo lang_get( 'signup_button' ) ?>" /></span>
 		</fieldset>
 	</form>
 </div>
 
-<?php html_page_bottom1a( __FILE__ );
+<?php
+html_page_bottom1a( __FILE__ );