oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'v7.10.19' into WebGUI8

Browse source
This commit is contained in:
Colin Kuskie 2011-10-25 20:31:50 -07:00
commit 4fea10a1f5
52 changed files with 490 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

29
sbin/userImport.pl
View file

@ -73,7 +73,7 @@ if (!($^O =~ /^Win/i) && $> != 0 && !$override) {
print "Starting up..." unless ($quiet);
my $session = WebGUI::Session->open($configFile);
$session->user({userId=>3});
open(FILE,"<".$usersFile);
open(FILE,"<".$usersFile) || die("Could not open $usersFile for reading: $!");
print "OK\n" unless ($quiet);
my $lineNumber = 0;
@ -81,6 +81,7 @@ my @field;
my @profileFields = $session->db->buildArray("select fieldName from userProfileField");
while(my $line = <FILE>) {
$lineNumber++;
chomp $line;
next
if $line eq '';
@ -179,7 +180,25 @@ while(my $line = <FILE>) {
}
if ($user{groups}) {
my @groups = split(/,/,$user{groups});
$u->addToGroups(\@groups,$user{expireOffset});
# Groups that have : in them have unique expiration dates
$u->addToGroups([grep { !/:/ } @groups],$user{expireOffset});
for my $groupDef ( grep { /:/ } @groups ) {
my ( $groupId, $expireDate ) = split /:/, $groupDef, 2;
# Calculate expiration offset
my $dtparse = DateTime::Format::Strptime->new(
pattern => '%F %T',
on_error => 'croak',
);
eval {
my $expireOffset = $dtparse->parse_datetime( $expireDate )->epoch - time;
$u->addToGroups( [$groupId], $expireOffset );
};
if ( $@ ) {
print "Could not add user $user{username} to group $groupId: $@";
}
}
}
}
}
@ -345,6 +364,12 @@ Specify a comma separated list of WebGUI Group Ids that each loaded
user will be set to. It can be overridden in the import file for
specific users.
You can specify a unique expiration date for a group by adding it
after the group ID, seperated by a colon. The date/time should be in
"YYYY-MM-DD HH:NN:SS" format.
groupId:2000-01-01 01:00:00,groupId2:2001-01-02 02:00:00
=item B<--ldapUrl uri>
Specify the URI used to connect to the LDAP server for authentication.