[Rt-commit] r3646 - in rt/branches/3.5-TESTING: . html/Elements

[trs at bestpractical.com]

Author: trs
Date: Thu Aug 11 23:12:35 2005
New Revision: 3646

Modified:
   rt/branches/3.5-TESTING/   (props changed)
   rt/branches/3.5-TESTING/html/Elements/Login
Log:
 r5835 at wintermute:  tom | 2005-08-11 23:09:53 -0400
 Cleanup of code to determine form action and actually use $goto


Modified: rt/branches/3.5-TESTING/html/Elements/Login
==============================================================================
--- rt/branches/3.5-TESTING/html/Elements/Login	(original)
+++ rt/branches/3.5-TESTING/html/Elements/Login	Thu Aug 11 23:12:35 2005
@@ -51,6 +51,17 @@
     $m->out("\n$Error\n") if $Error;
     $m->abort;
 }
+
+my $req_uri;
+
+if (UNIVERSAL::can($r, 'uri') and $r->uri =~ m{.*/(.*)}) {
+    $req_uri = $1;
+}
+
+my $form_action = defined $goto             ? $goto
+                : defined $req_uri          ? $req_uri
+                :                             $RT::WebPath
+                ;
 </%INIT>
 
 <& /Elements/Callback, %ARGS, _CallbackName => 'Header' &>
@@ -73,7 +84,7 @@
 <&| /Widgets/TitleBox, title => loc('Login'), titleright => $RT::VERSION, hideable => 0 &>
 
 % unless ($RT::WebExternalAuth and !$RT::WebFallbackToInternalAuth) {
-<form id="login" name="login" method="post" action="<% (UNIVERSAL::can($r, 'uri') && ($r->uri) =~ m!.*/(.*)!) %>">
+<form id="login" name="login" method="post" action="<% $form_action %>">
 
 <div class="input-row">
     <span class="label"><&|/l&>Username</&>:</span>