[TWiki-Dev] CVS: twiki/lib/TWiki User.pm,1.10,1.11

[sven d. <sv...@us...>]

Update of /cvsroot/twiki/twiki/lib/TWiki
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20757/lib/TWiki

Modified Files:
	User.pm 
Log Message:
PavelGoran's work from Codev.ConfigurablePasswordFileHandling genericised and
moved into the HtPasswdUser.pm package


Index: User.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki/User.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** User.pm	2 Feb 2004 05:42:47 -0000	1.10
--- User.pm	2 Feb 2004 13:01:31 -0000	1.11
***************
*** 61,110 ****
  use vars qw( %templateVars ); # init in TWiki.pm so okay for modPerl
  
! #use $userTopicImpl = "HtPasswdUser";
  
  # ===========================
- # TODO: why / what is this (docco it)
  =pod
  
! ---++ sub initialize ()
! 
! Not yet documented.
  
  =cut
- 
  sub initialize
  {
      %templateVars = ();
!     eval "use TWiki::User::HtPasswdUser";
! }
! 
! # ===========================
! # Normally writes no output, uncomment writeDebug line to get output of all RCS etc command to debug file
! =pod
! 
! ---++ sub _traceExec ()
! 
! Not yet documented.
! 
! =cut
! 
! sub _traceExec
! {
!    #my( $cmd, $result ) = @_;
!    #TWiki::writeDebug( "User exec: $cmd -> $result" );
! }
! 
! # ===========================
! =pod
! 
! ---++ sub writeDebug ()
! 
! Not yet documented.
! 
! =cut
! 
! sub writeDebug
! {
!    #TWiki::writeDebug( "User: $_[0]" );
  }
  
--- 61,85 ----
  use vars qw( %templateVars ); # init in TWiki.pm so okay for modPerl
  
! $UserImpl = "";
  
  # ===========================
  =pod
  
! ---+++ initialize ()
! | Description: | loads the selected User Implementation |
  
  =cut
  sub initialize
  {
      %templateVars = ();
! 	if ( # (-e $TWiki::htpasswdFilename ) && #<<< maybe
! 		( $TWiki::htpasswdFormatFamily eq "htpasswd" ) ) {
! 	    $UserImpl = "TWiki::User::HtPasswdUser";
! #	} elseif ($TWiki::htpasswdFormatFamily eq "something?") {
! #	    $UserImpl = "TWiki::User::SomethingUser";
! 	} else {
! 	    $UserImpl = "TWiki::User::NoPasswdUser";
! 	}
! 	eval "use ".$UserImpl;
  }
  
***************
*** 124,128 ****
     $attachment = "" if( ! $attachment );
  
!    my $handlerName = "TWiki::User::HtPasswdUser";
  
     my $handler = $handlerName->new( );
--- 99,103 ----
     $attachment = "" if( ! $attachment );
  
!    my $handlerName = $UserImpl;
  
     my $handler = $handlerName->new( );