make both google and normal login possible

This commit is contained in:
SJ 2013-09-26 14:44:12 +02:00
parent ff32283695
commit 5b2f444790
2 changed files with 2 additions and 2 deletions

View File

@ -36,7 +36,7 @@
<?php if(isset($x)){ ?><p class="alert alert-error lead"><?php print $x; ?></p><?php } ?> <?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']; } } ?>" /> <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) { ?> <?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> <div class="info"><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></div>
<?php } else { ?> <?php } else { ?>
<input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>"> <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">

View File

@ -40,7 +40,7 @@
<?php if(isset($x)){ ?><p class="alert alert-error lead"><?php print $x; ?></p><?php } ?> <?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']; } } ?>" /> <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) { ?> <?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> <div class="info"><a href="<?php print $auth_url; ?>"><?php print $text_login_via_google; ?></a></div>
<?php } else { ?> <?php } else { ?>
<input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>"> <input type="text" class="input-block-level" name="username" placeholder="<?php print $text_email; ?>">