merging 6.7.8 changes and bug fixes

This commit is contained in:
JT Smith 2005-11-30 20:33:40 +00:00
parent 4bd429bcac
commit fdfb9bf5ae
8 changed files with 95 additions and 58 deletions

View file

@ -1,41 +1,44 @@
package Hourly::SyncProfilesToLDAP;
#-------------------------------------------------------------------
#------------------------------------------------------ -------------
# WebGUI is Copyright 2001-2005 Plain Black Corporation.
#-------------------------------------------------------------------
#------------------------------------------------------ -------------
# Please read the legal notices (docs/legal.txt) and the license
# (docs/license.txt) that came with this distribution before using
# this software.
#-------------------------------------------------------------------
# http://www.plainblack.com info@plainblack.com
#-------------------------------------------------------------------
#------------------------------------------------------ -------------
# http://www.plainblack.com info@plainblack.com
#------------------------------------------------------ -------------
use Net::LDAP;
use strict;
use WebGUI::DateTime;
use WebGUI::Session;
use WebGUI::SQL;
use WebGUI::Auth;
use WebGUI::User;
#-------------------------------------------------------------------
#------------------------------------------------------ -------------
sub _alias {
my %alias = (
firstName=>"givenname",
lastName=>"sn",
email=>"mail",
companyName=>"o"
);
firstName=>"givenname",
lastName=>"sn",
email=>"mail",
companyName=>"o"
);
return $alias{$_[0]} || $_[0];
}
#-------------------------------------------------------------------
#------------------------------------------------------ -------------
sub process {
my (@date, $userId, $u, $userData, $uri, $port, %args, $fieldName, $ldap, $search, $a, $b);
@date = WebGUI::DateTime::localtime(WebGUI::DateTime::time());
if ($date[3] == $session{config}{SyncProfilesToLDAP_hour}) {
if ($date[3] == $session{config}{SyncProfilesToLDAP_hour}) {
$a = WebGUI::SQL->read("select userId from users where authMethod='LDAP'");
while (($userId) = $a->array) {
$u = WebGUI::User->new($userId);
$userData = WebGUI::Authentication::getParams($userId, 'LDAP');
my $auth = WebGUI::Auth->new("LDAP",$userId);
$userData = $auth->getParams;
$uri = URI->new($userData->{ldapUrl});
if ($uri->port < 1) {
$port = 389;
@ -48,15 +51,11 @@ sub process {
$ldap->bind;
$search = $ldap->search (base => $uri->dn, filter => $userData->{connectDN});
if (defined $search->entry(0)) {
my $user = WebGUI::User->new($userId);
$b = WebGUI::SQL->read("select fieldName from userProfileField where profileCategoryId<>4");
while (($fieldName) = $b->array) {
if ($search->entry(0)->get_value(_alias($fieldName)) ne "") {
WebGUI::SQL->write("replace into userProfileData
(userId,fieldName,fieldData) values ("
.$userId.","
.quote($fieldName).","
.quote($search->entry(0)->get_value(_alias($fieldName)))
.")");
$user->profileField($fieldName,$search->entry(0)->get_value(_alias($fieldName)));
}
}
$b->finish;
@ -71,4 +70,3 @@ sub process {
}
1;