This commit was generated by cvs2svn to compensate for changes in r3921,

[freeside.git] / rt / html / autohandler

diff --git a/rt/html/autohandler b/rt/html/autohandler
index b2a407a..b21d261 100644 (file)
--- a/rt/html/autohandler
+++ b/rt/html/autohandler
@@ -1,8 +1,14 @@
-%# BEGIN LICENSE BLOCK
+%# {{{ BEGIN BPS TAGGED BLOCK
 %# 
-%# Copyright (c) 1996-2003 Jesse Vincent <jesse@bestpractical.com>
+%# COPYRIGHT:
+%#  
+%# This software is Copyright (c) 1996-2004 Best Practical Solutions, LLC 
+%#                                          <jesse@bestpractical.com>
 %# 
-%# (Except where explictly superceded by other copyright notices)
+%# (Except where explicitly superseded by other copyright notices)
+%# 
+%# 
+%# LICENSE:
 %# 
 %# This work is made available to you under the terms of Version 2 of
 %# the GNU General Public License. A copy of that license should have
@@ -14,13 +20,29 @@
 %# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 %# General Public License for more details.
 %# 
-%# Unless otherwise specified, all modifications, corrections or
-%# extensions to this work which alter its source code become the
-%# property of Best Practical Solutions, LLC when submitted for
-%# inclusion in the work.
+%# You should have received a copy of the GNU General Public License
+%# along with this program; if not, write to the Free Software
+%# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+%# 
+%# 
+%# CONTRIBUTION SUBMISSION POLICY:
 %# 
+%# (The following paragraph is not intended to limit the rights granted
+%# to you to modify and distribute this software under the terms of
+%# the GNU General Public License and is only of importance to you if
+%# you choose to contribute your changes and enhancements to the
+%# community by submitting them to Best Practical Solutions, LLC.)
 %# 
-%# END LICENSE BLOCK
+%# By intentionally submitting any modifications, corrections or
+%# derivatives to this work, or any other work intended for use with
+%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
+%# you are the copyright holder for those contributions and you grant
+%# Best Practical Solutions,  LLC a nonexclusive, worldwide, irrevocable,
+%# royalty-free, perpetual, license to use, copy, create derivative
+%# works based on those contributions, and sublicense and distribute
+%# those contributions and any derivatives thereof.
+%# 
+%# }}} END BPS TAGGED BLOCK
 <%INIT>
 
 # Roll back any dangling transactions from a previous failed connection
@@ -64,8 +86,7 @@ unless ($session{'CurrentUser'} && $session{'CurrentUser'}->Id) {
 $r->content_type("text/html; charset=utf-8");
 
 # If it's a noauth file, don't ask for auth.
-if ($m->base_comp->path =~ '^/+NoAuth/' ||
-    $m->base_comp->path =~ '^/+REST/\d+\.\d+/NoAuth/')
+if ($m->base_comp->path =~ $RT::WebNoAuthRegex )
 {
     $m->call_next(%ARGS);
     $m->abort();
@@ -93,7 +114,7 @@ elsif ( $RT::WebExternalAuth ) {
        if ($RT::WebExternalAuto and !$session{'CurrentUser'}->Id() ) {
            # Create users on-the-fly
            
-           my $UserObj = RT::User->new(RT::CurrentUser->new('root'));
+           my $UserObj = RT::User->new(RT::CurrentUser->new('RT_System'));
            
            my ($val, $msg) = $UserObj->Create(
                                               %{ref($RT::AutoCreate) ? $RT::AutoCreate : {}},
@@ -117,6 +138,7 @@ elsif ( $RT::WebExternalAuth ) {
                                       'HomePhone', 'WorkPhone', 'MobilePhone',
                                       'PagerPhone', 'Address1', 'Address2', 'City',
                                       'State', 'Zip', 'Country') {
+               $m->comp('/Elements/Callback', %ARGS, _CallbackName => 'NewUser');
                    
                    my $method = "Set$attribute";
                    $UserObj->$method($new_user_info->{$attribute}) 
@@ -171,11 +193,15 @@ if (!$session{'CurrentUser'} && defined ($user) && defined ($pass) ){
     if (!$session{'CurrentUser'}->id() ||
         !$session{'CurrentUser'}->IsPassword($pass))
     {
+       $RT::Logger->error("FAILED LOGIN for $user from $ENV{'REMOTE_ADDR'}");
         delete $session{'CurrentUser'};
         $m->comp('/Elements/Login', %ARGS,
                  Error => loc('Your username or password is incorrect'));
         $m->abort();
     }
+    else {
+       $RT::Logger->info("Successful login for $user from $ENV{'REMOTE_ADDR'}");
+    }
 }
   
 # If we've got credentials, let's serve the file up.