From e298d2b9c0f17385d224d9c8e2db174affa25e6f Mon Sep 17 00:00:00 2001
From: SJ <sj@acts.hu>
Date: Thu, 26 Sep 2013 23:20:56 +0200
Subject: [PATCH] improved google auth

---
 .../theme/default/templates/login/login.tpl   | 30 +++++++++++--------
 .../theme/mobile/templates/login/login.tpl    | 29 ++++++++++--------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/webui/view/theme/default/templates/login/login.tpl b/webui/view/theme/default/templates/login/login.tpl
index 3c1d2927..8b94ac13 100644
--- a/webui/view/theme/default/templates/login/login.tpl
+++ b/webui/view/theme/default/templates/login/login.tpl
@@ -32,27 +32,33 @@
         <div id="logo-lg"><img src="<?php print SITE_URL; ?><?php print SITE_LOGO_LG; ?>" alt="Archive Logo Image" title="Login" /></div>
 
         <form name="login" action="login.php" method="post" class="form-signin">
+
             <h2 class="form-signin-heading"><?php print $text_login; ?></h2>
+
             <?php if(isset($x)){ ?><p class="alert alert-error lead"><?php print $x; ?></p><?php } ?>
             <input type="hidden" name="relocation" value="<?php if(isset($_GET['route']) && !preg_match("/^login/", $_GET['route']) ) { if(isset($_SERVER['REDIRECT_URL'])) { print $_SERVER['REDIRECT_URL']; } else { print $_SERVER['QUERY_STRING']; } } ?>" />
 
-           <?php if(ENABLE_GOOGLE_LOGIN == 1 && $_SERVER['QUERY_STRING'] == '') { ?>
-                 <div class="info"><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></div>
-        <?php } else { ?>
-                <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">
-                <input type="password" class="input-block-level" name="password" placeholder="<?php print $text_password; ?>">
+            <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">
+            <input type="password" class="input-block-level" name="password" placeholder="<?php print $text_password; ?>">
 
-            <?php if(CAPTCHA_FAILED_LOGIN_COUNT > 0 && $failed_login_count > CAPTCHA_FAILED_LOGIN_COUNT) { ?>
-                <img src="securimage/securimage_show.php" alt="captcha image" id="captcha" />
-                <input type="text" class="input-block-level" name="captcha" placeholder="CAPTCHA" />
-            <?php } ?>
-
-                <button class="btn btn-large btn-primary" type="submit" value="<?php print $text_submit; ?>"><?php print $text_submit; ?></button>
+        <?php if(CAPTCHA_FAILED_LOGIN_COUNT > 0 && $failed_login_count > CAPTCHA_FAILED_LOGIN_COUNT) { ?>
+            <img src="securimage/securimage_show.php" alt="captcha image" id="captcha" />
+            <input type="text" class="input-block-level" name="captcha" placeholder="CAPTCHA" />
         <?php } ?>
 
+            <button class="btn btn-large btn-primary" type="submit" value="<?php print $text_submit; ?>"><?php print $text_submit; ?></button>
+
         </form>
 
-        <div id="compatibility" class="well well-large"><?php print COMPATIBILITY; ?></div>
+
+        <div id="compatibility" class="well well-large">
+
+            <?php if(ENABLE_GOOGLE_LOGIN == 1) { ?>
+               <p><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></p>
+            <?php } ?>
+
+            <p><?php print COMPATIBILITY; ?></p>
+        </div>
 
    </div>
 
diff --git a/webui/view/theme/mobile/templates/login/login.tpl b/webui/view/theme/mobile/templates/login/login.tpl
index b039c65a..801ad2a3 100644
--- a/webui/view/theme/mobile/templates/login/login.tpl
+++ b/webui/view/theme/mobile/templates/login/login.tpl
@@ -36,27 +36,32 @@
         <div id="logo-lg"><img src="<?php print SITE_URL; ?><?php print SITE_LOGO_LG; ?>" alt="Archive Logo Image" title="<?php print $text_login; ?>" /></div>
 
         <form name="login" action="login.php" method="post" class="form-signin">
+
             <h2 class="form-signin-heading"><?php print $text_login; ?></h2>
+
             <?php if(isset($x)){ ?><p class="alert alert-error lead"><?php print $x; ?></p><?php } ?>
             <input type="hidden" name="relocation" value="<?php if(isset($_GET['route']) && !preg_match("/^login/", $_GET['route']) ) { if(isset($_SERVER['REDIRECT_URL'])) { print $_SERVER['REDIRECT_URL']; } else { print $_SERVER['QUERY_STRING']; } } ?>" />
 
-           <?php if(ENABLE_GOOGLE_LOGIN == 1 && $_SERVER['QUERY_STRING'] == '') { ?>
-                 <div class="info"><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></div>
-        <?php } else { ?>
-                <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">
-                <input type="password" class="input-block-level bold" name="password" placeholder="<?php print $text_password; ?>">
+            <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">
+            <input type="password" class="input-block-level bold" name="password" placeholder="<?php print $text_password; ?>">
 
-            <?php if(CAPTCHA_FAILED_LOGIN_COUNT > 0 && $failed_login_count > CAPTCHA_FAILED_LOGIN_COUNT) { ?>
-                <img src="securimage/securimage_show.php" alt="captcha image" id="captcha" />
-                <input type="text" class="input-block-level" name="captcha" placeholder="CAPTCHA" />
-            <?php } ?>
+         <?php if(CAPTCHA_FAILED_LOGIN_COUNT > 0 && $failed_login_count > CAPTCHA_FAILED_LOGIN_COUNT) { ?>
+            <img src="securimage/securimage_show.php" alt="captcha image" id="captcha" />
+            <input type="text" class="input-block-level" name="captcha" placeholder="CAPTCHA" />
+         <?php } ?>
 
-                <button class="btn btn-large btn-primary" type="submit" value="<?php print $text_submit; ?>"><?php print $text_submit; ?></button>
-        <?php } ?>
+            <button class="btn btn-large btn-primary" type="submit" value="<?php print $text_submit; ?>"><?php print $text_submit; ?></button>
 
         </form>
 
-        <div id="compatibility" class="well well-large"><?php print COMPATIBILITY; ?></div>
+        <div id="compatibility" class="well well-large">
+
+        <?php if(ENABLE_GOOGLE_LOGIN == 1) { ?>
+            <p><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></p>
+        <?php } ?>
+
+            <p><?php print COMPATIBILITY; ?></p>
+        </div>
 
    </div>