[Socialtext-commits] SF.net SVN: socialtext: [1005] branches/rug/lib/Socialtext

[<pet...@us...>]

Revision: 1005
          http://svn.sourceforge.net/socialtext/?rev=1005&view=rev
Author:   petdance
Date:     2007-02-01 08:50:12 -0800 (Thu, 01 Feb 2007)

Log Message:
-----------
Fixed all the connection->user to be ->user

Modified Paths:
--------------
    branches/rug/lib/Socialtext/Apache/AuthenHandler.pm
    branches/rug/lib/Socialtext/Apache/User.pm
    branches/rug/lib/Socialtext/AuthzHandler.pm
    branches/rug/lib/Socialtext/Handler/REST.pm
    branches/rug/lib/Socialtext/Rug/MP1.pm
    branches/rug/lib/Socialtext/Rug/MP2.pm

Modified: branches/rug/lib/Socialtext/Apache/AuthenHandler.pm
===================================================================
--- branches/rug/lib/Socialtext/Apache/AuthenHandler.pm	2007-01-30 23:07:33 UTC (rev 1004)
+++ branches/rug/lib/Socialtext/Apache/AuthenHandler.pm	2007-02-01 16:50:12 UTC (rev 1005)
@@ -10,7 +10,7 @@
  <Location /foo>
    PerlAddVar SocialtextAuthenActions check_basic
    PerlAddVar SocialtextAuthenActions http_401
-   PerlAuthenHandler Socialtext::Apache::AuthenHandler-
+   PerlAuthenHandler Socialtext::Apache::AuthenHandler
  </Location>
 
 =head1 DESCRIPTION
@@ -85,7 +85,7 @@
 # not.
 sub _authenticate_with {
     my ( $r, $password ) = @_;
-    my $username = $r->connection->user;
+    my $username = $r->user;
 
     if ( $username eq '' ) {
         $r->log_reason( "$SERVICE - no username given", $r->uri );
@@ -122,12 +122,12 @@
 =cut
 
 # Return 1 if able to authenticate via the cookie mechanism, 0 if not.  Sets
-# $r->connection->user to the username as a side effect.
+# $r->user to the username as a side effect.
 sub check_cookie {
     my ($r) = @_;
 
     if ( my $user = Socialtext::Apache::User::current_user($r) ) {
-        $r->connection->user( $user->username );
+        $r->user( $user->username );
         return 1;
     }
 
@@ -155,7 +155,7 @@
 
 =head1 COPYRIGHT & LICENSE
 
-Copyright 2006 Socialtext, Inc., all rights reserved.
+Copyright 2006-2007 Socialtext, Inc., all rights reserved.
 
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

Modified: branches/rug/lib/Socialtext/Apache/User.pm
===================================================================
--- branches/rug/lib/Socialtext/Apache/User.pm	2007-01-30 23:07:33 UTC (rev 1004)
+++ branches/rug/lib/Socialtext/Apache/User.pm	2007-02-01 16:50:12 UTC (rev 1005)
@@ -46,7 +46,7 @@
 
     return unless $name_or_id;
 
-    # XXX: user_id() can return things like $r->connection->user, which is
+    # XXX: user_id() can return things like $r->user, which is
     # not a valid id, so use username. This seems blech
     my $user;
     if ($name_or_id =~ /\D+/) {
@@ -55,7 +55,7 @@
     else {
         $user = Socialtext::User->new( user_id => $name_or_id );
     }
-    $r->connection->user($user->username) unless $r->connection->user();
+    $r->user( $user->username ) unless $r->user();
 
     return $user;
 }
@@ -65,15 +65,15 @@
     my $always_check_apache = shift;
 
     if ( $ENV{SET_GENERIC_USER} ) {
-        $r->connection->user($ENV{SET_GENERIC_USER});
+        $r->user( $ENV{SET_GENERIC_USER} );
         return $ENV{SET_GENERIC_USER};
     }
 
     # prefer user name set by basic auth or other mechanism (client
     # cert, for example) to cookie
-    return $r->connection->user
+    return $r->user
         if ($always_check_apache || Socialtext::AppConfig->check_apache_authen)
-           && $r->connection->user;
+           && $r->user;
 
     my %user_data = _get_cookie_value($r, COOKIE_NAME);
 

Modified: branches/rug/lib/Socialtext/AuthzHandler.pm
===================================================================
--- branches/rug/lib/Socialtext/AuthzHandler.pm	2007-01-30 23:07:33 UTC (rev 1004)
+++ branches/rug/lib/Socialtext/AuthzHandler.pm	2007-02-01 16:50:12 UTC (rev 1005)
@@ -18,17 +18,17 @@
 
 sub handler ($$) {
     my $class = shift;
-    my $r     = shift;
+    my $rug   = shift;
 
-    my $requires = $r->requires;
-    my $user = $r->connection->user;
-    my $filename = $r->filename;
+    my $user = $rug->user;
+    my $filename = $rug->filename;
 
     st_log->debug( "checking authorization for $user : $filename" );
 
+    my $requires = $rug->requires;
     return DECLINED unless $requires;
 
-    my $nlw   = $class->get_cool_nlw($r);
+    my $nlw   = $class->get_cool_nlw( $rug );
 
     if( ! $nlw ) {
         st_log->error( "can't get nlw for $user - $filename" );
@@ -71,9 +71,9 @@
 </body>
 </html>
 END
-    $r->custom_response( AUTH_REQUIRED, $explanation );
-    $r->log_reason( "user $user: not authorized", $filename );
-    $r->note_basic_auth_failure;
+    $rug->custom_response( AUTH_REQUIRED, $explanation );
+    $rug->log_reason( "user $user: not authorized", $filename );
+    $rug->note_basic_auth_failure;
     return AUTH_REQUIRED;
 }
 

Modified: branches/rug/lib/Socialtext/Handler/REST.pm
===================================================================
--- branches/rug/lib/Socialtext/Handler/REST.pm	2007-01-30 23:07:33 UTC (rev 1004)
+++ branches/rug/lib/Socialtext/Handler/REST.pm	2007-02-01 16:50:12 UTC (rev 1005)
@@ -182,8 +182,7 @@
 sub _get_user {
     my $self = shift;
 
-    return Socialtext::User->new(
-        username => $self->request->connection->user );
+    return Socialtext::User->new( username => $self->request->user );
 }
 
 sub do_test {

Modified: branches/rug/lib/Socialtext/Rug/MP1.pm
===================================================================
--- branches/rug/lib/Socialtext/Rug/MP1.pm	2007-01-30 23:07:33 UTC (rev 1004)
+++ branches/rug/lib/Socialtext/Rug/MP1.pm	2007-02-01 16:50:12 UTC (rev 1005)
@@ -30,8 +30,6 @@
 
 sub req { $_[0]->{_r} }
 
-sub user { shift->req->connection()->user(@_) }
-
 sub get_config { shift->req->dir_config->get(@_) }
 
 

Modified: branches/rug/lib/Socialtext/Rug/MP2.pm
===================================================================
--- branches/rug/lib/Socialtext/Rug/MP2.pm	2007-01-30 23:07:33 UTC (rev 1004)
+++ branches/rug/lib/Socialtext/Rug/MP2.pm	2007-02-01 16:50:12 UTC (rev 1005)
@@ -65,23 +65,28 @@
 }
 
 sub err_header_out {
-    return shift->_recall( 'err_headers_out', @_ );
+    my $self = shift;
+    return $self->_recall( 'err_headers_out', @_ );
 }
 
 sub get_config {
-    return shift->dir_config->get( @_ );
+    my $self = shift;
+    return $self->dir_config->get( @_ );
 }
 
 sub header_in {
-    return shift->_recall( 'headers_in', @_ );
+    my $self = shift;
+    return $self->_recall( 'headers_in', @_ );
 }
 
 sub header_out {
-    return shift->_recall( 'headers_out', @_ );
+    my $self = shift;
+    return $self->_recall( 'headers_out', @_ );
 }
 
 sub log_error {
-    return shift->req->log_error( @_ );
+    my $self = shift;
+    return $self->req->log_error( @_ );
 }
 
 sub send_http_header {
@@ -90,7 +95,8 @@
 }
 
 sub user {
-    return shift->req->connection()->user( @_ );
+    my $self = shift;
+    return $self->req->user( @_ );
 }
 
 1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.