Skip to content

Commit

Permalink
Merge pull request #693 from atm-maxime/develop
Browse files Browse the repository at this point in the history
LDAP : update user sync + add groups sync and users associated to group ...
  • Loading branch information
eldy committed Feb 26, 2013
2 parents 4fd8143 + 0de4fa0 commit b8a330e
Show file tree
Hide file tree
Showing 7 changed files with 279 additions and 9 deletions.
13 changes: 13 additions & 0 deletions htdocs/fourn/commande/dispatch.php
Expand Up @@ -84,6 +84,19 @@
}
}
}

if (! $notrigger)
{
global $conf, $langs, $user;
// Appel des triggers
include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
$interface=new Interfaces($this->db);
$result_trigger=$interface->run_triggers('ORDER_SUPPLIER_DISPATCH',$this,$user,$langs,$conf);
if ($result_trigger < 0) { $error++; $this->errors=$interface->errors; }
// Fin appel triggers

$this->db->commit();
}

if ($result > 0)
{
Expand Down
2 changes: 1 addition & 1 deletion htdocs/install/mysql/migration/3.2.0-3.3.0.sql
Expand Up @@ -311,7 +311,7 @@ UPDATE llx_c_tva set localtax1 = 1, localtax1_type = '4', localtax2 = 0.4, local
ALTER TABLE llx_c_tva DROP COLUMN accountancy_code;
ALTER TABLE llx_c_tva ADD COLUMN accountancy_code_sell varchar(15) DEFAULT NULL AFTER active;
ALTER TABLE llx_c_tva ADD COLUMN accountancy_code_buy varchar(15) DEFAULT NULL AFTER accountancy_code_sell;
ALTER TABLE llx_c_chargessociales ADD COLUMN accountancy_code varchar(15) DEFAULT NULL AFTER code;
ALTER TABLE llx_c_chargesociales ADD COLUMN accountancy_code varchar(15) DEFAULT NULL AFTER code;

-- Tables for accountancy expert
DROP TABLE llx_accountingaccount;
Expand Down
2 changes: 1 addition & 1 deletion htdocs/product/price.php
Expand Up @@ -680,7 +680,7 @@

// Il doit au moins y avoir la ligne de prix initial.
// On l'ajoute donc pour remettre a niveau (pb vieilles versions)
$object->updatePrice($object->id, $object->price, 'HT', $user, $newprice_min);
$object->updatePrice($object->id, $object->price, $object->price_base_type, $user, $newprice_min);

$result = $db->query($sql);
$num = $db->num_rows($result);
Expand Down
Binary file added htdocs/theme/amarok/img/favicon.ico
Binary file not shown.
18 changes: 12 additions & 6 deletions htdocs/user/class/usergroup.class.php
Expand Up @@ -66,18 +66,24 @@ function __construct($db)
/**
* Charge un objet group avec toutes ces caracteristiques (excpet ->members array)
*
* @param int $id id du groupe a charger
* @return int <0 if KO, >0 if OK
* @param int $id id du groupe a charger
* @param string $groupname nom du groupe a charger
* @return int <0 if KO, >0 if OK
*/
function fetch($id)
function fetch($id='', $groupname='')
{
global $conf;

$this->id = $id;

$sql = "SELECT g.rowid, g.entity, g.nom as name, g.note, g.datec, g.tms as datem";
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
$sql.= " WHERE g.rowid = ".$this->id;
if ($groupname)
{
$sql.= " WHERE g.nom = '".$this->db->escape($groupname)."'";
}
else
{
$sql.= " WHERE g.rowid = ".$id;
}

dol_syslog(get_class($this)."::fetch sql=".$sql);
$result = $this->db->query($sql);
Expand Down
247 changes: 247 additions & 0 deletions scripts/user/sync_groups_ldap2dolibarr.php
@@ -0,0 +1,247 @@
#!/usr/bin/php
<?php
/**
* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006-2012 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2013 Maxime Kohlhaas <maxime@atm-consulting.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

/**
* \file scripts/user/sync_groups_ldap2dolibarr.php
* \ingroup ldap member
* \brief Script to update groups into Dolibarr from LDAP
*/

$sapi_type = php_sapi_name();
$script_file = basename(__FILE__);
$path=dirname(__FILE__).'/';

// Test if batch mode
if (substr($sapi_type, 0, 3) == 'cgi') {
echo "Error: You are using PHP for CGI. To execute ".$script_file." from command line, you must use PHP for CLI mode.\n";
exit;
}




// Main

$version='1.14';
@set_time_limit(0);
$error=0;
$forcecommit=0;

require_once($path."../../htdocs/master.inc.php");
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.php");
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");

$langs->load("main");
$langs->load("errors");

// List of fields to get from LDAP
$required_fields = array(
$conf->global->LDAP_KEY_GROUPS,
$conf->global->LDAP_GROUP_FIELD_FULLNAME,
$conf->global->LDAP_GROUP_FIELD_DESCRIPTION,
$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS
);

// Remove from required_fields all entries not configured in LDAP (empty) and duplicated
$required_fields=array_unique(array_values(array_filter($required_fields, "dolValidElement")));

if ($argv[2]) $conf->global->LDAP_SERVER_HOST=$argv[2];

print "***** $script_file ($version) *****\n";

if (! isset($argv[1])) {
//print "Usage: $script_file (nocommitiferror|commitiferror) [id_group]\n";
print "Usage: $script_file (nocommitiferror|commitiferror) [ldapserverhost]\n";
exit;
}
$groupid=$argv[3];
if ($argv[1] == 'commitiferror') $forcecommit=1;


print "Mails sending disabled (useless in batch mode)\n";
$conf->global->MAIN_DISABLE_ALL_MAILS=1; // On bloque les mails
print "\n";
print "----- Synchronize all records from LDAP database:\n";
print "host=".$conf->global->LDAP_SERVER_HOST."\n";
print "port=".$conf->global->LDAP_SERVER_PORT."\n";
print "login=".$conf->global->LDAP_ADMIN_DN."\n";
print "pass=".preg_replace('/./i','*',$conf->global->LDAP_ADMIN_PASS)."\n";
print "DN to extract=".$conf->global->LDAP_GROUP_DN."\n";
print 'Filter=('.$conf->global->LDAP_KEY_GROUPS.'=*)'."\n";
print "----- To Dolibarr database:\n";
print "type=".$conf->db->type."\n";
print "host=".$conf->db->host."\n";
print "port=".$conf->db->port."\n";
print "login=".$conf->db->user."\n";
print "database=".$conf->db->name."\n";
print "----- Options:\n";
print "commitiferror=".$forcecommit."\n";
print "Mapped LDAP fields=".join(',',$required_fields)."\n";
print "\n";
print "Press a key to confirm...";
$input = trim(fgets(STDIN));
print "Hit Enter to continue or CTRL+C to stop...\n";
$input = trim(fgets(STDIN));


if (empty($conf->global->LDAP_GROUP_DN))
{
print $langs->trans("Error").': '.$langs->trans("LDAP setup for groups not defined inside Dolibarr");
exit(1);
}


$ldap = new Ldap();
$result = $ldap->connect_bind();
if ($result >= 0)
{
$justthese=array();


// We disable synchro Dolibarr-LDAP
$conf->global->LDAP_SYNCHRO_ACTIVE=0;

$ldaprecords = $ldap->getRecords('*',$conf->global->LDAP_GROUP_DN, $conf->global->LDAP_KEY_GROUPS, $required_fields, 0, array($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS));
if (is_array($ldaprecords))
{
$db->begin();

// Warning $ldapuser has a key in lowercase
foreach ($ldaprecords as $key => $ldapgroup)
{
$group = new UserGroup($db);
$group->fetch('', $ldapgroup[$conf->global->LDAP_KEY_GROUPS]);
$group->nom = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME];
$group->note = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION];
$group->entity = $conf->entity;

//print_r($ldapgroup);

if($group->id > 0) { // Group update
print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->nom;
$res=$group->update();

if ($res > 0)
{
print ' --> Updated group id='.$group->id.' name='.$group->nom;
}
else
{
$error++;
print ' --> '.$res.' '.$group->error;
}
print "\n";
} else { // Group creation
print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->nom;
$res=$group->create();

if ($res > 0)
{
print ' --> Created group id='.$group->id.' name='.$group->nom;
}
else
{
$error++;
print ' --> '.$res.' '.$group->error;
}
print "\n";
}

//print_r($group);

// Gestion des utilisateurs associés au groupe
// 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
$userList = array();
$userIdList = array();
foreach($ldapgroup[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] as $key => $userdn) {
if($key == 'count') continue;
if(empty($userList[$userdn])) { // Récupération de l'utilisateur
$userFilter = explode(',', $userdn);
$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);

$fuser = new User($db);

if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
$fuser->fetch('','',$userKey[0]); // Chargement du user concerné par le SID
} else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
$fuser->fetch('',$userKey[0]); // Chargement du user concerné par le login
}

$userList[$userdn] = &$fuser;
} else {
$fuser = &$userList[$userdn];
}

$userIdList[$userdn] = $fuser->id;

// Ajout de l'utilisateur dans le groupe
if(!in_array($fuser->id, array_keys($group->members))) $fuser->SetInGroup($group->id, $group->entity);
}

// 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
foreach ($group->members as $user_id => $infos) {
if(!in_array($user_id, $userIdList)) $fuser->RemoveFromGroup($group->id, $group->entity);
}
}

if (! $error || $forcecommit)
{
if (! $error) print $langs->transnoentities("NoErrorCommitIsDone")."\n";
else print $langs->transnoentities("ErrorButCommitIsDone")."\n";
$db->commit();
}
else
{
print $langs->transnoentities("ErrorSomeErrorWereFoundRollbackIsDone",$error)."\n";
$db->rollback();
}
print "\n";
}
else
{
dol_print_error('',$ldap->error);
$error++;
}
}
else
{
dol_print_error('',$ldap->error);
$error++;
}


return $error;


/**
* Function to say if a value is empty or not
*
* @param string $element Value to test
* @return boolean True of false
*/
function dolValidElement($element)
{
return (trim($element) != '');
}

?>
6 changes: 5 additions & 1 deletion scripts/user/sync_users_ldap2dolibarr.php
Expand Up @@ -179,7 +179,11 @@
{
$fuser = new User($db);

$fuser->fetch('','',$ldapuser[$conf->global->LDAP_KEY_USERS]); // Chargement du user concerné
if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
$fuser->fetch('','',$ldapuser[$conf->global->LDAP_KEY_USERS]); // Chargement du user concerné par le SID
} else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
$fuser->fetch('',$ldapuser[$conf->global->LDAP_KEY_USERS]); // Chargement du user concerné par le login
}

// Propriete membre
$fuser->firstname=$ldapuser[$conf->global->LDAP_FIELD_FIRSTNAME];
Expand Down

0 comments on commit b8a330e

Please sign in to comment.