Put login into its own function.

Utilise login form template.
Also cleaned up a couple notices.

Signed-off-by: Loui Chang <louipc.ist@gmail.com>
Signed-off-by: Simo Leone <simo@archlinux.org>

2 files changed, 25 insertions, 47 deletions

diff --git a/web/template/header.php b/web/template/header.php
index 488d290..ea8d43d 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -82,24 +82,7 @@ foreach ($SUPPORTED_LANGS as $lang => $lang_name) {
 ?>
         </ul>
         </span>
-        <span id="login_bar">
-<?php
-if (isset($_COOKIE["AURSID"])) {
-  print __("Logged-in as: %h%s%h",
-			array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
-} else {
-	if ($login_error) {
-		print "<span class='error'>" . $login_error . "</span><br />\n";
-    } ?>
-        <form method='post'>
-         <?php print __("Username:"); ?>
-          <input type='text' name='user' size='30' maxlength='64' value='<?php if (isset($_POST['user'])) { print htmlspecialchars($_POST['user'], ENT_QUOTES); } ?>'>
-         <?php print __("Password:"); ?>
-          <input type='password' name='pass' size='30' maxlength='32'>
-          <input type='submit' class='button' value='<?php  print __("Login"); ?>'>
-        </form>
-<?php } ?>
-        </span>
+	<?php include("login_form.php"); ?>
       </div>
     </div>
     <div id="maincontent">
diff --git a/web/template/login_form.php b/web/template/login_form.php
index 89f11c1..7fd40fb 100644
--- a/web/template/login_form.php
+++ b/web/template/login_form.php
@@ -1,33 +1,28 @@
+<span id="login_bar">
 <?php
-# Now present the user login stuff
-if (!isset($_COOKIE["AURSID"])):
-
-	# the user is not logged in, give them login widgets
-	#
-	if (!empty($login['error'])) {
-		print '<div class="error">' . $login['error']
-			. '</div>';
-	}
-?>
-
-	<form action="<?php print $_SERVER['PHP_SELF']; ?>" method="post">
-	<label class="lbox"><?php print __("Username"); ?><br />
-	<input type="text" name="user" size="30"
-	 maxlength="<?php print USERNAME_MAX_LEN;?>"></label>
-
-	<label class="lbox"><?php print  __("Password"); ?><br />
-	<input type="password" name="passwd" size="30"
-	 maxlength="<?php print PASSWD_MAX_LEN; ?>"></label>
-	<br />
-	<input type="submit" class="button"
-	value="<?php print __("Login"); ?>">
-	</form>
-
-<?php 
-else:
+if (isset($_COOKIE["AURSID"])) {
 	print __("Logged-in as: %h%s%h",
 		array("<b>", username_from_sid($_COOKIE["AURSID"]), "</b>"));
-endif; 
+}
+else {
+	if ($login_error) {
+		print "<span class='error'>" . $login_error . "</span><br />\n";
+	} ?>
+        <form method='post'>
+         <?php print __("Username:"); ?>
+	<input type='text' name='user' size='30'
+		maxlength="<?php print USERNAME_MAX_LEN; ?>"
+		value='<?php
+			if (isset($_POST['user'])) {
+				print htmlspecialchars($_POST['user'], ENT_QUOTES);
+			 } ?>'>
+         <?php print __("Password:"); ?>
+	<input type='password' name='passwd' size='30'
+		maxlength="<?php print PASSWD_MAX_LEN; ?>">
+	<input type='submit' class='button'
+		 value='<?php  print __("Login"); ?>'>
+</form>
+<?php } ?>
+</span>
+
 
-# vim: ts=2 sw=2 noet ft=php
-?>