committing first round of GUID changes
This commit is contained in:
parent
0ba6b7c911
commit
48fd2d44e9
48 changed files with 9012 additions and 8870 deletions
|
|
@ -29,6 +29,7 @@ use CGI (); CGI->compile(':all');
|
|||
use CGI::Carp ();
|
||||
use CGI::Util ();
|
||||
use Date::Calc ();
|
||||
use Digest::MD5 ();
|
||||
eval "use Image::Magick ();"; # eval, may not be installed
|
||||
use File::Copy ();
|
||||
use File::Path ();
|
||||
|
|
@ -37,6 +38,7 @@ use Net::SMTP ();
|
|||
use POSIX ();
|
||||
use URI::Escape ();
|
||||
use SOAP::Lite ();
|
||||
use Time::HiRes ();
|
||||
|
||||
|
||||
#----------------------------------------
|
||||
|
|
|
|||
|
|
@ -226,20 +226,19 @@ if (eval { require SOAP::Lite }) {
|
|||
}
|
||||
}
|
||||
|
||||
print "Data::Serializer module .................. ";
|
||||
if (eval { require Data::Serializer }) {
|
||||
print "Time::HiRes module ....................... ";
|
||||
if (eval { require Time::HiRes }) {
|
||||
print "OK\n";
|
||||
} else {
|
||||
if ($< == 0 && $os eq "Linuxish") {
|
||||
print "Attempting to install...\n";
|
||||
CPAN::Shell->install("Data::Serializer");
|
||||
CPAN::Shell->install("Time::HiRes");
|
||||
} else {
|
||||
print "Please install.\n";
|
||||
$prereq = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
print "Image::Magick module (optional) .......... ";
|
||||
if (eval { require Image::Magick }) {
|
||||
print "OK\n";
|
||||
|
|
|
|||
|
|
@ -232,8 +232,13 @@ while(<FILE>) {
|
|||
$u->username($user{username});
|
||||
$u->authMethod($user{authMethod});
|
||||
$u->status($user{status});
|
||||
WebGUI::Authentication::saveParams($u->userId,"WebGUI",{identifier=>$user{identifier}});
|
||||
WebGUI::Authentication::saveParams($u->userId,"LDAP",{
|
||||
my $cmd = "WebGUI::Auth::".$authMethod;
|
||||
my $load = "use ".$cmd;
|
||||
WebGUI::ErrorHandler::fatalError("Authentication module failed to compile: $cmd.".$@) if($@);
|
||||
eval($load);
|
||||
my $auth = eval{$cmd->new($authMethod,$u->userId)};
|
||||
$auth->saveParams($u->userId,"WebGUI",{identifier=>$user{identifier}});
|
||||
$auth->saveParams($u->userId,"LDAP",{
|
||||
ldapUrl=>$user{ldapUrl},
|
||||
connectDN=>$user{connectDN}
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue