[prev in list] [next in list] [prev in thread] [next in thread] 

List:       bricolage-commits
Subject:    [Bricolage-Commits] Don't redirect back to login.
From:       David Wheeler <wheeler () users ! sourceforge ! net>
Date:       2004-04-29 3:22:20
Message-ID: E1BJ27w-00060V-M8 () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Log Message:
-----------
Don't redirect back to login.

Tags:
----
rev_1_8

Modified Files:
--------------
    bricolage/lib/Bric/App/Callback:
        Login.pm (r1.8 -> r1.8.2.1)


["wheeler-200442932220-diff.txt" (wheeler-200442932220-diff.txt)]

Index: Login.pm
===================================================================
RCS file: /cvsroot/bricolage/bricolage/lib/Bric/App/Callback/Login.pm,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -Llib/Bric/App/Callback/Login.pm -Llib/Bric/App/Callback/Login.pm -u -w -r1.8 -r1.8.2.1
--- lib/Bric/App/Callback/Login.pm
+++ lib/Bric/App/Callback/Login.pm
@@ -22,17 +22,18 @@
     my $un = $param->{$self->class_key . '|username'};
     my $pw = $param->{$self->class_key . '|password'};
     my ($res, $msg) = Bric::App::Auth::login($r, $un, $pw);
+    my $redir = del_redirect() || '';
+    $redir = '/' if $redir =~ m|^/login|;
     if ($res) {
 	if ($param->{$self->class_key . '|ssl'}) {
 	    # They want to use SSL. Do a simple redirect.
 	    set_state_name($self->class_key, 'ssl');
-            $self->redirect(del_redirect() || '');
+            $self->redirect($redir);
 	} else {
 	    # Redirect them back to port 80 if not using SSL.
 	    set_state_name($self->class_key, 'nossl');
             # redirect_onload() prevents any other callbacks from executing.
-	    redirect_onload('http://' . $r->hostname . $port
-                              . (del_redirect() || ''), $self);
+	    redirect_onload('http://' . $r->hostname . $port . $redir, $self);
 	}
     } else {
 	add_msg($msg);
-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click
_______________________________________________
Bricolage-Commits mailing list
Bricolage-Commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bricolage-commits

[prev in list] [next in list] [prev in thread] [next in thread]