[Openinteract-commits] CVS: OpenInteract2/lib/OpenInteract2 SPOPS.pm,1.25,1.26

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26076/lib/OpenInteract2

Modified Files:
	SPOPS.pm 
Log Message:
OIN-104: if there's no request return nothing for the security scopes; also ensure that the 'install_theme' management task works properly

Index: SPOPS.pm
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/lib/OpenInteract2/SPOPS.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** SPOPS.pm	26 Feb 2004 00:58:57 -0000	1.25
--- SPOPS.pm	27 Nov 2004 20:47:21 -0000	1.26
***************
*** 267,276 ****
  
  # Override method in SPOPS::Secure since we already know the
! # user/group information from $R
  
  sub get_security_scopes {
      my ( $self, $p ) = @_;
      my $req = CTX->request;
!     return ( $req->auth_user, $req->auth_group );
  }
  
--- 267,281 ----
  
  # Override method in SPOPS::Secure since we already know the
! # user/group information from the context
  
  sub get_security_scopes {
      my ( $self, $p ) = @_;
      my $req = CTX->request;
!     if ( $req ) {
!         return ( $req->auth_user, $req->auth_group );
!     }
!     else {
!         return ( undef, [] );
!     }
  }
  
***************
*** 293,297 ****
  sub global_datasource_handle {
      my ( $self, $connect_key ) = @_;
!     $connect_key ||= $self->CONFIG->{datasource};
      return CTX->datasource( $connect_key );
  }
--- 298,302 ----
  sub global_datasource_handle {
      my ( $self, $connect_key ) = @_;
!     $connect_key ||= $self->CONFIG->{datasource_config}{spops};
      return CTX->datasource( $connect_key );
  }