From: Art Cancro <ajc@citadel.org>
Date: Tue, 11 Jan 2011 16:42:01 +0000 (-0500)
Subject: For closed systems, still handle login through the modal
X-Git-Tag: v8.01~252^2~181
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=5b80fe56a7e2e31c254a7ff6e95e8241c83d72a8

For closed systems, still handle login through the modal
---

diff --git a/webcit/auth.c b/webcit/auth.c
index e50652601..26f63a06c 100644
--- a/webcit/auth.c
+++ b/webcit/auth.c
@@ -1077,7 +1077,7 @@ InitModule_AUTH
 	WebcitAddUrlHandler(HKEY("finalize_openid_login"), "", 0, finalize_openid_login, ANONYMOUS);
 	WebcitAddUrlHandler(HKEY("openid_manual_create"), "", 0, openid_manual_create, ANONYMOUS);
 	WebcitAddUrlHandler(HKEY("do_logout"), "", 0, do_logout, ANONYMOUS|COOKIEUNNEEDED|FORCE_SESSIONCLOSE);
-	WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX);
+	WebcitAddUrlHandler(HKEY("ajax_login_username_password"), "", 0, ajax_login_username_password, AJAX|ANONYMOUS);
 	WebcitAddUrlHandler(HKEY("validate"), "", 0, validate, 0);
 	WebcitAddUrlHandler(HKEY("do_welcome"), "", 0, do_welcome, 0);
 	WebcitAddUrlHandler(HKEY("display_reg"), "", 0, _display_reg, 0);
diff --git a/webcit/static/styles/login.css b/webcit/static/styles/login.css
index 8de9516d4..e90502b06 100644
--- a/webcit/static/styles/login.css
+++ b/webcit/static/styles/login.css
@@ -39,6 +39,7 @@
 #login_form br { clear: left }
 
 .login_infos {
+	bottom: 0;
 	display: block;
 	margin: 20px auto 0 auto;
 	width: 80%;
diff --git a/webcit/static/t/login.html b/webcit/static/t/login.html
index a138e2816..22c3cc567 100644
--- a/webcit/static/t/login.html
+++ b/webcit/static/t/login.html
@@ -10,42 +10,13 @@
 <?!("COND:IMPMSG", 1)>
 <div class="login_message"><?IMPORTANTMESSAGE></div>
 <?!("X", 1)>
-<div class="login_image"><img src="image?name=hello" alt=""></div>
-<form action="login" method="POST"  class="box" id="login_form">
-<div>
-        <label for="uname"><?_("User name:")></label>
-        <input type="text" name="name" id="uname" > <br>
-        <label for="pname"><?_("Password:")></label>
-        <input type="password" name="pass" id="pname" > <br>
-        <label for="lname"><?_("Language:")></label>
-        <?LANG:SELECT> <br>
-</div>
-        <div class="logbuttons">
-        <input type="submit" name="login_action" value="<?_("Log in")>" class="button">
-	<??("COND:SERV:NEWU", 1)>
-        <input name="newuser_action" value="<?_("New User")>" class="button" type="submit">
-	<??("X", 1)>
-        <input type="submit" name="exit_action" value="<?_("Exit")>" class="button">
-        <br>
-        </div>
-</form>
-<?!("COND:SERV:OPENID", 3)>
-  <div id="openid" class="login_using_openid_link">
-  <a href="display_openid_login">
-  <img src="static/openid-small.gif" alt="" border="0" valign="middle">
-  <?_("Log in using OpenID")></a>
-  </div>
-<??("X", 3)>
-<div class="login_infos">
-<ul><li><b><?_("If you already have an account on")> <?SERV:HUMANNODE></b>,
-<?_("enter your user name and password and click &quot;Log in.&quot;")></li>
-<li><?_("<b>If you are a new user</b>, enter the name and password you wish to use, and click &quot;New User.&quot; ")></li>
-<li><?_("Please log off properly when finished. ")></li>
-<li><?_("See the")> <a href="http://www.citadel.org/doku.php/faq:everydayuse:webcit_browser"><?_("recommended browser list")></a> <?_("if you have trouble using Webcit.</li> <li>You must have <i>cookies</i> turned on. ")></li>
-<li><?_("Also keep in mind that if your browser is configured to block pop-up windows, you will not be able to receive any instant messages.")></li></ul>
- 
+<div class="login_image"><img src="image?name=hello" alt="">
+<span class=\"button_link\"><a href="javascript:GetLoggedInFirst('do_welcome');"><?_("Log in")></a></span>
 </div>
 </div>
 <!-- end login.html -->
 <?=("endbox")>
+<script type="text/javascript">
+	GetLoggedInFirst('do_welcome');
+</script>
 <?=("trailing")>
diff --git a/webcit/webcit.c b/webcit/webcit.c
index 3c094cd1e..5d213a5f0 100644
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -511,7 +511,7 @@ void push_destination(void) {
 void pop_destination(void) {
 	wcsession *WCC = WC;
 
-	if (!WCC) {
+	if ( (!WCC) || (WCC->PushedDestination == NULL) || (StrLength(WCC->PushedDestination) == 0) ) {
 		do_welcome();
 		return;
 	}