From ed184ad0e5207287e9be7802a69fcb74946fe9cd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Wed, 16 Oct 2013 18:24:12 +0200
Subject: [PATCH] Reindent UsercreateTemplate and UserloginTemplate

A perceptive reviewer will note several issues with this code,
including at least one outright bug. I intend to fix them in
subsequent commit; I tried to avoid any non-whitespace changes
here to make it at all possible to review this.

This file has several lines longer than the phpcs limit of
100 characters, and several cases of the <?php } ?> pattern
phpcs complains about. I don't think it makes sense to enforce
these rules here; the code would IMO become less readable.

Change-Id: I95ab0f644fd5963878018f483f22e650867b5135
---
 includes/templates/Usercreate.php | 417 +++++++++++++++---------------
 includes/templates/Userlogin.php  | 272 ++++++++++---------
 2 files changed, 341 insertions(+), 348 deletions(-)

diff --git a/includes/templates/Usercreate.php b/includes/templates/Usercreate.php
index 50dfaecb47..a7c0a45c0f 100644
--- a/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@ -46,245 +46,242 @@ class UsercreateTemplate extends BaseTemplate {
 		$expirationDays = ceil( $wgCookieExpiration / ( 3600 * 24 ) );
 ?>
 <div class="mw-ui-container">
-	<?php
-	if ( $this->haveData( 'languages' ) ) {
-	?>
+	<?php if ( $this->haveData( 'languages' ) ) { ?>
 		<div id="languagelinks">
 			<p><?php $this->html( 'languages' ); ?></p>
 		</div>
-	<?php
-	}
-	?>
-<div id="userloginForm">
-<h2 class="createaccount-join">
-	<?php
-	$this->msg( $this->data['loggedin'] ?
-		'createacct-another-join' : 'createacct-join' );
-	?>
-</h2>
-<form name="userlogin2" id="userlogin2" class="mw-ui-vform" method="post" action="<?php $this->text( 'action' ); ?>">
-	<section class="mw-form-header">
-		<?php $this->html( 'header' ); /* extensions such as ConfirmEdit add form HTML here */ ?>
-	</section>
-	<?php
-	if ( $this->data['message'] ) {
-?>
-		<div class="<?php $this->text( 'messagetype' ); ?>box">
-		<?php if ( $this->data['messagetype'] == 'error' ) { ?>
-			<strong><?php $this->msg( 'createacct-error' ); ?></strong><br />
-		<?php } ?>
-		<?php $this->html( 'message' ); ?>
-		</div>
 	<?php } ?>
-		<div>
-			<label for='wpName2'>
-				<?php $this->msg( 'userlogin-yourname' ); ?>
+	<div id="userloginForm">
+		<h2 class="createaccount-join">
+			<?php $this->msg( $this->data['loggedin'] ? 'createacct-another-join' : 'createacct-join' ); ?>
+		</h2>
+		<form name="userlogin2" id="userlogin2" class="mw-ui-vform" method="post" action="<?php $this->text( 'action' ); ?>">
+			<section class="mw-form-header">
+				<?php $this->html( 'header' ); /* extensions such as ConfirmEdit add form HTML here */ ?>
+			</section>
+			<?php if ( $this->data['message'] ) { ?>
+				<div class="<?php $this->text( 'messagetype' ); ?>box">
+					<?php if ( $this->data['messagetype'] == 'error' ) { ?>
+						<strong><?php $this->msg( 'createacct-error' ); ?></strong>
+						<br />
+					<?php } ?>
+					<?php $this->html( 'message' ); ?>
+				</div>
+			<?php } ?>
 
-				<span class="mw-ui-flush-right"><?php echo $this->getMsg( 'createacct-helpusername' )->parse(); ?></span>
-			</label>
-			<?php
-			echo Html::input( 'wpName', $this->data['name'], 'text', array(
-				'class' => 'mw-input loginText',
-				'id' => 'wpName2',
-				'tabindex' => '1',
-				'size' => '20',
-				'required',
-				'placeholder' => $this->getMsg( $this->data['loggedin'] ?
-					'createacct-another-username-ph' : 'userlogin-yourname-ph' )->text(),
-			) );
-			?>
-		</div>
-		<div>
-		<?php if ( $this->data['createemail'] ) { ?>
-			<label class="mw-ui-checkbox-label">
-				<input name="wpCreateaccountMail" type="checkbox" value="1" id="wpCreateaccountMail" tabindex="2"
-					<?php if ( $this->data['createemailset'] ) {
-						echo 'checked="checked"';
-					} ?>
-				>
-				<?php $this->msg( 'createaccountmail' ); ?>
-			</label>
-		<?php } ?>
-		</div>
-		<div class="mw-row-password">
-			<label for='wpPassword2'><?php $this->msg( 'userlogin-yourpassword' ); ?></label>
-			<?php echo Html::input( 'wpPassword', null, 'password', array(
-				'class' => 'mw-input loginPassword',
-				'id' => 'wpPassword2',
-				'tabindex' => '3',
-				'size' => '20',
-				'required',
-				'placeholder' => $this->getMsg( 'createacct-yourpassword-ph' )->text()
-			) + User::passwordChangeInputAttribs() ); ?>
-		</div>
-	<?php if ( $this->data['usedomain'] ) {
-		$doms = "";
-		foreach ( $this->data['domainnames'] as $dom ) {
-			$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
-		}
-	?>
-		<div id="mw-user-domain-section">
-			<label for="wpDomain"><?php $this->msg( 'yourdomainname' ); ?></label>
-			<div class="mw-input">
-				<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>"
-					tabindex="4">
-					<?php echo $doms ?>
-				</select>
-			</div>
-		</div>
-	<?php } ?>
-		<div class="mw-row-password">
-			<label for='wpRetype'><?php $this->msg( 'createacct-yourpasswordagain' ); ?></label>
-			<?php
-			echo Html::input( 'wpRetype', null, 'password', array(
-				'class' => 'mw-input loginPassword',
-				'id' => 'wpRetype',
-				'tabindex' => '5',
-				'size' => '20',
-				'required',
-				'placeholder' => $this->getMsg( 'createacct-yourpasswordagain-ph' )->text()
-				) + User::passwordChangeInputAttribs() );
-			?>
-		</div>
-		<div>
-		<?php if ( $this->data['useemail'] ) { ?>
-			<label for='wpEmail'>
+			<div>
+				<label for='wpName2'>
+					<?php $this->msg( 'userlogin-yourname' ); ?>
+
+					<span class="mw-ui-flush-right"><?php echo $this->getMsg( 'createacct-helpusername' )->parse(); ?></span>
+				</label>
 				<?php
-					$this->msg( $this->data['emailrequired'] ?
-						'createacct-emailrequired' :
-						'createacct-emailoptional'
-					);
-				?>
-			</label>
-			<?php
-				echo Html::input( 'wpEmail', $this->data['email'], 'email', array(
+				echo Html::input( 'wpName', $this->data['name'], 'text', array(
 					'class' => 'mw-input loginText',
-					'id' => 'wpEmail',
-					'tabindex' => '6',
+					'id' => 'wpName2',
+					'tabindex' => '1',
 					'size' => '20',
+					'required',
 					'placeholder' => $this->getMsg( $this->data['loggedin'] ?
-						'createacct-another-email-ph' : 'createacct-email-ph' )->text()
-				) + ( $this->data['emailrequired'] ? array() : array( 'required' => '' ) ) );
-			?>
-		<?php } ?>
-		</div>
-		<?php if ( $this->data['userealname'] ) { ?>
-			<div>
-				<label for='wpRealName'><?php $this->msg( 'createacct-realname' ); ?></label>
-				<input type='text' class='mw-input loginText' name="wpRealName" id="wpRealName"
-					tabindex="7"
-					value="<?php $this->text( 'realname' ); ?>" size='20' />
-				<div class="prefsectiontip">
-					<?php $this->msgWiki( $this->data['loggedin'] ? 'createacct-another-realname-tip' : 'prefs-help-realname' ); ?>
-				</div>
-			</div>
-		<?php }
-		if ( $this->data['usereason'] ) { ?>
-			<div>
-				<label for='wpReason'><?php $this->msg( 'createacct-reason' ); ?></label>
-				<?php echo Html::input( 'wpReason', $this->data['reason'], 'text', array(
-					'class' => 'mw-input loginText',
-					'id' => 'wpReason',
-					'tabindex' => '8',
-					'size' => '20',
-					'placeholder' => $this->getMsg( 'createacct-reason-ph' )->text()
-				) ); ?>
+						'createacct-another-username-ph' : 'userlogin-yourname-ph' )->text(),
+				) );
+				?>
 			</div>
-		<?php }
-		$tabIndex = 9;
-		if ( isset( $this->data['extraInput'] ) && is_array( $this->data['extraInput'] ) ) {
-			foreach ( $this->data['extraInput'] as $inputItem ) { ?>
+
 			<div>
-				<?php
-				// If it's a checkbox, output the whole thing (assume it has a msg).
-				if ( $inputItem['type'] == 'checkbox' ) {
-				?>
+				<?php if ( $this->data['createemail'] ) { ?>
 					<label class="mw-ui-checkbox-label">
-						<input
-							name="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
-							id="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
-							type="checkbox" value="1"
-							tabindex="<?php echo $tabIndex++; ?>"
-							<?php if ( !empty( $inputItem['value'] ) ) {
+						<input name="wpCreateaccountMail" type="checkbox" value="1" id="wpCreateaccountMail" tabindex="2"
+							<?php if ( $this->data['createemailset'] ) {
 								echo 'checked="checked"';
 							} ?>
 						>
-						<?php $this->msg( $inputItem['msg'] ); ?>
+						<?php $this->msg( 'createaccountmail' ); ?>
 					</label>
+				<?php } ?>
+			</div>
+
+			<div class="mw-row-password">
+				<label for='wpPassword2'><?php $this->msg( 'userlogin-yourpassword' ); ?></label>
 				<?php
-				} else {
-					// Not a checkbox.
-					// TODO (bug 31909) support other input types, e.g. select boxes.
-					if ( !empty( $inputItem['msg'] ) ) {
-						// Output the message label
-					?>
-						<label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>">
-							<?php $this->msgWiki( $inputItem['msg'] ); ?>
-						</label>
-					<?php
-					}
-					?>
-					<input
-						type="<?php echo htmlspecialchars( $inputItem['type'] ); ?>"
-						class="mw-input"
-						name="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
-						tabindex="<?php echo $tabIndex++; ?>"
-						value="<?php echo htmlspecialchars( $inputItem['value'] ); ?>"
-						id="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
-					/>
-				<?php
-				}
-				if ( $inputItem['helptext'] !== false ) {
+				echo Html::input( 'wpPassword', null, 'password', array(
+					'class' => 'mw-input loginPassword',
+					'id' => 'wpPassword2',
+					'tabindex' => '3',
+					'size' => '20',
+					'required',
+					'placeholder' => $this->getMsg( 'createacct-yourpassword-ph' )->text()
+				) + User::passwordChangeInputAttribs() );
 				?>
-					<div class="prefsectiontip">
-						<?php $this->msgWiki( $inputItem['helptext'] ); ?>
+			</div>
+
+			<?php
+			if ( $this->data['usedomain'] ) {
+				$doms = "";
+				foreach ( $this->data['domainnames'] as $dom ) {
+					$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+				}
+			?>
+				<div id="mw-user-domain-section">
+					<label for="wpDomain"><?php $this->msg( 'yourdomainname' ); ?></label>
+					<div class="mw-input">
+						<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>" tabindex="4">
+							<?php echo $doms ?>
+						</select>
 					</div>
+				</div>
+			<?php } ?>
+
+			<div class="mw-row-password">
+				<label for='wpRetype'><?php $this->msg( 'createacct-yourpasswordagain' ); ?></label>
 				<?php
-				}
+				echo Html::input( 'wpRetype', null, 'password', array(
+					'class' => 'mw-input loginPassword',
+					'id' => 'wpRetype',
+					'tabindex' => '5',
+					'size' => '20',
+					'required',
+					'placeholder' => $this->getMsg( 'createacct-yourpasswordagain-ph' )->text()
+					) + User::passwordChangeInputAttribs() );
 				?>
+			</div>
+
+			<div>
+				<?php if ( $this->data['useemail'] ) { ?>
+					<label for='wpEmail'>
+						<?php
+							$this->msg( $this->data['emailrequired'] ?
+								'createacct-emailrequired' :
+								'createacct-emailoptional'
+							);
+						?>
+					</label>
+					<?php
+						echo Html::input( 'wpEmail', $this->data['email'], 'email', array(
+							'class' => 'mw-input loginText',
+							'id' => 'wpEmail',
+							'tabindex' => '6',
+							'size' => '20',
+							'placeholder' => $this->getMsg( $this->data['loggedin'] ?
+								'createacct-another-email-ph' : 'createacct-email-ph' )->text()
+						) + ( $this->data['emailrequired'] ? array() : array( 'required' => '' ) ) );
+					?>
+				<?php } ?>
+			</div>
+
+			<?php if ( $this->data['userealname'] ) { ?>
+				<div>
+					<label for='wpRealName'><?php $this->msg( 'createacct-realname' ); ?></label>
+					<input type='text' class='mw-input loginText' name="wpRealName" id="wpRealName"
+						tabindex="7"
+						value="<?php $this->text( 'realname' ); ?>" size='20' />
+					<div class="prefsectiontip">
+						<?php $this->msgWiki( $this->data['loggedin'] ? 'createacct-another-realname-tip' : 'prefs-help-realname' ); ?>
+					</div>
 				</div>
+			<?php } ?>
+
+			<?php if ( $this->data['usereason'] ) { ?>
+				<div>
+					<label for='wpReason'><?php $this->msg( 'createacct-reason' ); ?></label>
+					<?php echo Html::input( 'wpReason', $this->data['reason'], 'text', array(
+						'class' => 'mw-input loginText',
+						'id' => 'wpReason',
+						'tabindex' => '8',
+						'size' => '20',
+						'placeholder' => $this->getMsg( 'createacct-reason-ph' )->text()
+					) ); ?>
+				</div>
+			<?php } ?>
+
 			<?php
+			$tabIndex = 9;
+			if ( isset( $this->data['extraInput'] ) && is_array( $this->data['extraInput'] ) ) {
+				foreach ( $this->data['extraInput'] as $inputItem ) { ?>
+					<div>
+						<?php
+						// If it's a checkbox, output the whole thing (assume it has a msg).
+						if ( $inputItem['type'] == 'checkbox' ) {
+						?>
+							<label class="mw-ui-checkbox-label">
+								<input
+									name="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
+									id="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
+									type="checkbox" value="1"
+									tabindex="<?php echo $tabIndex++; ?>"
+									<?php if ( !empty( $inputItem['value'] ) ) {
+										echo 'checked="checked"';
+									} ?>
+								>
+								<?php $this->msg( $inputItem['msg'] ); ?>
+							</label>
+						<?php
+						} else {
+							// Not a checkbox.
+							// TODO (bug 31909) support other input types, e.g. select boxes.
+						?>
+							<?php if ( !empty( $inputItem['msg'] ) ) { ?>
+								<label for="<?php echo htmlspecialchars( $inputItem['name'] ); ?>">
+									<?php $this->msgWiki( $inputItem['msg'] ); ?>
+								</label>
+							<?php } ?>
+							<input
+								type="<?php echo htmlspecialchars( $inputItem['type'] ); ?>"
+								class="mw-input"
+								name="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
+								tabindex="<?php echo $tabIndex++; ?>"
+								value="<?php echo htmlspecialchars( $inputItem['value'] ); ?>"
+								id="<?php echo htmlspecialchars( $inputItem['name'] ); ?>"
+							/>
+						<?php } ?>
+						<?php if ( $inputItem['helptext'] !== false ) { ?>
+							<div class="prefsectiontip">
+								<?php $this->msgWiki( $inputItem['helptext'] ); ?>
+							</div>
+						<?php } ?>
+					</div>
+				<?php
+				}
 			}
-		}
-		// JS attempts to move the image CAPTCHA below this part of the form,
-		// so skip one index.
-		$tabIndex++;
-		?>
-		<div class="mw-submit">
+
+			// JS attempts to move the image CAPTCHA below this part of the form,
+			// so skip one index.
+			$tabIndex++;
+			?>
+			<div class="mw-submit">
+				<?php
+				echo Html::input(
+					'wpCreateaccount',
+					$this->getMsg( $this->data['loggedin'] ? 'createacct-another-submit' : 'createacct-submit' ),
+					'submit',
+					array(
+						'class' => "mw-ui-button mw-ui-big mw-ui-block mw-ui-primary",
+						'id' => 'wpCreateaccount',
+						'tabindex' => $tabIndex++
+					)
+				);
+				?>
+			</div>
+			<?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
+			<?php if ( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpCreateaccountToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?>
+		</form>
+	</div>
+	<div class="mw-createacct-benefits-container">
+		<h2><?php $this->msg( 'createacct-benefit-heading' ); ?></h2>
+		<div class="mw-createacct-benefits-list">
 			<?php
-			echo Html::input( 'wpCreateaccount',
-				$this->getMsg( $this->data['loggedin'] ?
-					'createacct-another-submit' : 'createacct-submit' ),
-				'submit',
-				array(
-					'class' => "mw-ui-button mw-ui-big mw-ui-block mw-ui-primary",
-					'id' => 'wpCreateaccount',
-					'tabindex' => $tabIndex++
-				) );
+			for ( $benefitIdx = 1; $benefitIdx <= $this->data['benefitCount']; $benefitIdx++ ) {
+				// Pass each benefit's head text (by default a number) as a parameter to the body's message for PLURAL handling.
+				$headUnescaped = $this->getMsg( "createacct-benefit-head$benefitIdx" )->text();
 			?>
+				<div class="mw-number-text <?php $this->msg( "createacct-benefit-icon$benefitIdx" ); ?>">
+					<h3><?php $this->msg( "createacct-benefit-head$benefitIdx" ); ?></h3>
+					<p><?php echo $this->getMsg( "createacct-benefit-body$benefitIdx" )->params( $headUnescaped )->escaped(); ?></p>
+				</div>
+			<?php } ?>
 		</div>
-<?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
-<?php if ( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpCreateaccountToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?>
-</form>
-</div>
-<div class="mw-createacct-benefits-container">
-	<h2><?php $this->msg( 'createacct-benefit-heading' ); ?></h2>
-	<div class="mw-createacct-benefits-list">
-	<?php
-	for ( $benefitIdx = 1; $benefitIdx <= $this->data['benefitCount']; $benefitIdx++ ) {
-		// Pass each benefit's head text (by default a number) as a parameter to the body's message for PLURAL handling.
-		$headUnescaped = $this->getMsg( "createacct-benefit-head$benefitIdx" )->text();
-	?>
-		<div class="mw-number-text <?php $this->msg( "createacct-benefit-icon$benefitIdx" ); ?>">
-			<h3><?php $this->msg( "createacct-benefit-head$benefitIdx" ); ?></h3>
-			<p><?php echo $this->getMsg( "createacct-benefit-body$benefitIdx" )->params( $headUnescaped )->escaped(); ?></p>
-		</div>
-	<?php
-	}
-	?>
 	</div>
 </div>
-</div>
 <?php
 
 	}
diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php
index 202ec55ed8..f5ae3539bf 100644
--- a/includes/templates/Userlogin.php
+++ b/includes/templates/Userlogin.php
@@ -28,163 +28,159 @@ class UserloginTemplate extends BaseTemplate {
 		$expirationDays = ceil( $wgCookieExpiration / ( 3600 * 24 ) );
 ?>
 <div class="mw-ui-container">
-	<?php
-	if ( $this->haveData( 'languages' ) ) {
-	?>
+	<?php if ( $this->haveData( 'languages' ) ) { ?>
 		<div id="languagelinks">
 			<p><?php $this->html( 'languages' ); ?></p>
 		</div>
-	<?php
-	}
-	?>
-<div id="userloginForm">
-<form name="userlogin" class="mw-ui-vform" method="post" action="<?php $this->text( 'action' ); ?>">
-	<?php if ( $this->data['loggedin'] ) { ?>
-		<div class="warningbox">
-			<?php echo $this->getMsg( 'userlogin-loggedin' )->params( $this->data['loggedinuser'] )->parse(); ?>
-		</div>
 	<?php } ?>
-	<section class="mw-form-header">
-		<?php $this->html( 'header' ); /* extensions such as ConfirmEdit add form HTML here */ ?>
-	</section>
-	<?php
+	<div id="userloginForm">
+		<form name="userlogin" class="mw-ui-vform" method="post" action="<?php $this->text( 'action' ); ?>">
+			<?php if ( $this->data['loggedin'] ) { ?>
+				<div class="warningbox">
+					<?php echo $this->getMsg( 'userlogin-loggedin' )->params( $this->data['loggedinuser'] )->parse(); ?>
+				</div>
+			<?php } ?>
+			<section class="mw-form-header">
+				<?php $this->html( 'header' ); /* extensions such as ConfirmEdit add form HTML here */ ?>
+			</section>
 
-	if ( $this->data['message'] ) {
-	?>
-		<div class="<?php $this->text( 'messagetype' ); ?>box">
-		<?php
-		if ( $this->data['messagetype'] == 'error' ) {
-		?>
-			<strong><?php $this->msg( 'loginerror' ) ?></strong><br />
-		<?php
-		}
-		$this->html( 'message' );
-		?>
-		</div>
-	<?php
-	}
-	?>
-		<div>
-			<label for='wpName1'>
-				<?php
-				$this->msg( 'userlogin-yourname' );
-				if ( $this->data['secureLoginUrl'] ) {
-					echo Html::element( 'a', array(
+			<?php if ( $this->data['message'] ) { ?>
+				<div class="<?php $this->text( 'messagetype' ); ?>box">
+					<?php if ( $this->data['messagetype'] == 'error' ) { ?>
+						<strong><?php $this->msg( 'loginerror' ); ?></strong>
+						<br />
+					<?php } ?>
+					<?php $this->html( 'message' ); ?>
+				</div>
+			<?php } ?>
+
+			<div>
+				<label for='wpName1'>
+					<?php
+					$this->msg( 'userlogin-yourname' );
+
+					if ( $this->data['secureLoginUrl'] ) {
+						echo Html::element( 'a', array(
 							'href' => $this->data['secureLoginUrl'],
 							'class' => 'mw-ui-flush-right mw-secure',
 						), $this->getMsg( 'userlogin-signwithsecure' )->text() );
-				} ?>
-			</label>
+					}
+					?>
+				</label>
+				<?php
+				$extraAttrs = array();
+				// Set focus to this field if it's blank.
+				if ( !$this->data['name'] ) {
+					$extraAttrs['autofocus'] = '';
+				}
+				echo Html::input( 'wpName', $this->data['name'], 'text', array(
+					'class' => 'loginText',
+					'id' => 'wpName1',
+					'tabindex' => '1',
+					'size' => '20',
+					// 'required' is blacklisted for now in Html.php due to browser issues.
+					// Keeping here in case that changes.
+					'required',
+					'placeholder' => $this->getMsg( 'userlogin-yourname-ph' )->text()
+				) + $extraAttrs );
+				?>
+			</div>
+
+			<div>
+				<label for='wpPassword1'>
+					<?php
+					$this->msg( 'userlogin-yourpassword' );
+
+					if ( $this->data['useemail'] && $this->data['canreset'] && $this->data['resetlink'] === true ) {
+						echo ' ' . Linker::link(
+							SpecialPage::getTitleFor( 'PasswordReset' ),
+							$this->getMsg( 'userlogin-resetpassword-link' )->parse(),
+							array( 'class' => 'mw-ui-flush-right' )
+						);
+					}
+					?>
+				</label>
+				<?php
+				$extraAttrs = array();
+				// Set focus to this field if username is filled in.
+				if ( $this->data['name'] ) {
+					$extraAttrs['autofocus'] = '';
+				}
+				echo Html::input( 'wpPassword', null, 'password', array(
+					'class' => 'loginPassword',
+					'id' => 'wpPassword1',
+					'tabindex' => '2',
+					'size' => '20',
+					'placeholder' => $this->getMsg( 'userlogin-yourpassword-ph' )->text()
+				) + $extraAttrs );
+				?>
+			</div>
+
 			<?php
-			$extraAttrs = array();
-			// Set focus to this field if its blank.
-			if ( !$this->data['name'] ) {
-				$extraAttrs['autofocus'] = '';
-			}
-			echo Html::input( 'wpName', $this->data['name'], 'text', array(
-				'class' => 'loginText',
-				'id' => 'wpName1',
-				'tabindex' => '1',
-				'size' => '20',
-				// 'required' is blacklisted for now in Html.php due to browser issues.
-				// Keeping here in case that changes
-				'required',
-				'placeholder' => $this->getMsg( 'userlogin-yourname-ph' )->text()
-			) + $extraAttrs );
+			if ( isset( $this->data['usedomain'] ) && $this->data['usedomain'] ) {
+				$doms = "";
+				foreach ( $this->data['domainnames'] as $dom ) {
+					$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
+				}
 			?>
-		</div>
-		<div>
-			<label for='wpPassword1'>
-			<?php
-			$this->msg( 'userlogin-yourpassword' );
+				<div id="mw-user-domain-section">
+					<label for='wpDomain'><?php $this->msg( 'yourdomainname' ); ?></label>
+					<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>" tabindex="3">
+						<?php echo $doms; ?>
+					</select>
+				</div>
+			<?php } ?>
 
-			if ( $this->data['useemail'] && $this->data['canreset'] && $this->data['resetlink'] === true ) {
-				echo ' ' . Linker::link(
-					SpecialPage::getTitleFor( 'PasswordReset' ),
-					$this->getMsg( 'userlogin-resetpassword-link' )->parse(),
-					array( 'class' => 'mw-ui-flush-right' )
-					);
-			}
-			?>
-			</label>
 			<?php
-			$extraAttrs = array();
-			// Set focus to this field if username is filled in.
-			if ( $this->data['name'] ) {
-				$extraAttrs['autofocus'] = '';
+			if ( $this->haveData( 'extrafields' ) ) {
+				echo $this->data['extrafields'];
 			}
-			echo Html::input( 'wpPassword', null, 'password', array(
-				'class' => 'loginPassword',
-				'id' => 'wpPassword1',
-				'tabindex' => '2',
-				'size' => '20',
-				'placeholder' => $this->getMsg( 'userlogin-yourpassword-ph' )->text()
-			) + $extraAttrs );
 			?>
-		</div>
-	<?php
-	if ( isset( $this->data['usedomain'] ) && $this->data['usedomain'] ) {
-		$doms = "";
-		foreach ( $this->data['domainnames'] as $dom ) {
-			$doms .= "<option>" . htmlspecialchars( $dom ) . "</option>";
-		}
-	?>
-		<div id="mw-user-domain-section">
-			<label for='wpDomain'><?php $this->msg( 'yourdomainname' ); ?></label>
-				<select name="wpDomain" value="<?php $this->text( 'domain' ); ?>"
-					tabindex="3">
-					<?php echo $doms ?>
-				</select>
-		</div>
-	<?php }
-
-	if ( $this->haveData( 'extrafields' ) ) {
-		echo $this->data['extrafields'];
-	} ?>
 
-		<div>
+			<div>
+				<?php if ( $this->data['canremember'] ) { ?>
+					<label class="mw-ui-checkbox-label">
+						<input name="wpRemember" type="checkbox" value="1" id="wpRemember" tabindex="4"
+							<?php if ( $this->data['remember'] ) {
+								echo 'checked="checked"';
+							} ?>
+						>
+						<?php echo $this->getMsg( 'userlogin-remembermypassword' )->numParams( $expirationDays )->escaped(); ?>
+					</label>
+				<?php } ?>
+			</div>
 
-	<?php if ( $this->data['canremember'] ) { ?>
-		<label class="mw-ui-checkbox-label">
-			<input name="wpRemember" type="checkbox" value="1" id="wpRemember" tabindex="4"
-				<?php if ( $this->data['remember'] ) {
-					echo 'checked="checked"';
-				} ?>
-			>
-			<?php echo $this->getMsg( 'userlogin-remembermypassword' )->numParams( $expirationDays )->escaped(); ?>
-		</label>
-	<?php } ?>
-		</div>
+			<div>
+				<?php
+				echo Html::input( 'wpLoginAttempt', $this->getMsg( 'login' )->text(), 'submit', array(
+					'id' => 'wpLoginAttempt',
+					'tabindex' => '6',
+					'class' => 'mw-ui-button mw-ui-big mw-ui-block mw-ui-primary'
+				) );
+				?>
+			</div>
 
-		<div>
-			<?php
-			echo Html::input( 'wpLoginAttempt', $this->getMsg( 'login' )->text(), 'submit', array(
-				'id' => 'wpLoginAttempt',
-				'tabindex' => '6',
-				'class' => 'mw-ui-button mw-ui-big mw-ui-block mw-ui-primary'
-			) );
-			?>
-		</div>
-		<div id="mw-userlogin-help">
-			<?php echo $this->getMsg( 'userlogin-helplink' )->parse(); ?>
-		</div>
-		<?php if ( $this->haveData( 'createOrLoginHref' ) ) { ?>
-			<?php if ( $this->data['loggedin'] ) { ?>
-				<div id="mw-createaccount-another">
-					<h3 id="mw-userloginlink"><a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"  class="mw-ui-button"><?php $this->msg( 'userlogin-createanother' ); ?></a></h3>
-				</div>
-			<?php } else { ?>
-				<div id="mw-createaccount-cta">
-					<h3 id="mw-userloginlink"><?php $this->msg( 'userlogin-noaccount' ); ?><a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"  class="mw-ui-button mw-ui-constructive"><?php $this->msg( 'userlogin-joinproject' ); ?></a></h3>
-				</div>
+			<div id="mw-userlogin-help">
+				<?php echo $this->getMsg( 'userlogin-helplink' )->parse(); ?>
+			</div>
+			<?php if ( $this->haveData( 'createOrLoginHref' ) ) { ?>
+				<?php if ( $this->data['loggedin'] ) { ?>
+					<div id="mw-createaccount-another">
+						<h3 id="mw-userloginlink"><a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"  class="mw-ui-button"><?php $this->msg( 'userlogin-createanother' ); ?></a></h3>
+					</div>
+				<?php } else { ?>
+					<div id="mw-createaccount-cta">
+						<h3 id="mw-userloginlink"><?php $this->msg( 'userlogin-noaccount' ); ?><a href="<?php $this->text( 'createOrLoginHref' ); ?>" id="mw-createaccount-join" tabindex="7"  class="mw-ui-button mw-ui-constructive"><?php $this->msg( 'userlogin-joinproject' ); ?></a></h3>
+					</div>
+				<?php } ?>
 			<?php } ?>
-		<?php } ?>
-<?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
-<?php if ( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpLoginToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?>
-<?php if ( $this->data['cansecurelogin'] ) {?><input type="hidden" name="wpForceHttps" value="<?php $this->text( 'stickhttps' ); ?>" /><?php } ?>
-</form>
-</div>
+			<?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
+			<?php if ( $this->haveData( 'token' ) ) { ?><input type="hidden" name="wpLoginToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?>
+			<?php if ( $this->data['cansecurelogin'] ) {?><input type="hidden" name="wpForceHttps" value="<?php $this->text( 'stickhttps' ); ?>" /><?php } ?>
+		</form>
+	</div>
 </div>
 <?php
+
 	}
 }
-- 
2.20.1