Qual: Uniformize script headers
This commit is contained in:
parent
3a11e0baad
commit
64ff559a80
@ -54,7 +54,10 @@ $error=0;
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
// -------------------- START OF YOUR CODE HERE --------------------
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
@set_time_limit(0);
|
@set_time_limit(0);
|
||||||
print "***** ".$script_file." (".$version.") *****\n";
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
|
|||||||
@ -40,8 +40,6 @@ if (! isset($argv[1]) || ! $argv[1]) {
|
|||||||
}
|
}
|
||||||
$now=$argv[1];
|
$now=$argv[1];
|
||||||
|
|
||||||
// Recupere env dolibarr
|
|
||||||
$version='1.10';
|
|
||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
//require_once(PHP_WRITEEXCEL_PATH."/class.writeexcel_workbook.inc.php");
|
//require_once(PHP_WRITEEXCEL_PATH."/class.writeexcel_workbook.inc.php");
|
||||||
@ -51,8 +49,18 @@ require_once(PHPEXCEL_PATH."/PHPExcel.php");
|
|||||||
//require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel2007.php");
|
//require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel2007.php");
|
||||||
require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel5.php");
|
require_once(PHPEXCEL_PATH."/PHPExcel/Writer/Excel5.php");
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
$fname = DOL_DATA_ROOT.'/export-contacts.xls';
|
$fname = DOL_DATA_ROOT.'/export-contacts.xls';
|
||||||
|
|
||||||
//$objPHPExcel = new writeexcel_workbook($fname);
|
//$objPHPExcel = new writeexcel_workbook($fname);
|
||||||
|
|||||||
@ -40,18 +40,23 @@ if (! isset($argv[1]) || ! $argv[1]) {
|
|||||||
}
|
}
|
||||||
$now=$argv[1];
|
$now=$argv[1];
|
||||||
|
|
||||||
// Recupere env dolibarr
|
|
||||||
$version='1.25';
|
|
||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/contact/class/contact.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
$error=0;
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
print "***** $script_file ($version) *****\n";
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
print "Mails sending disabled (useless in batch mode)\n";
|
print "Mails sending disabled (useless in batch mode)\n";
|
||||||
$conf->global->MAIN_DISABLE_ALL_MAILS=1; // On bloque les mails
|
$conf->global->MAIN_DISABLE_ALL_MAILS=1; // On bloque les mails
|
||||||
|
|||||||
@ -55,20 +55,27 @@ $langs->load('main');
|
|||||||
$langs->load('contracts');
|
$langs->load('contracts');
|
||||||
|
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Main
|
* Main
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
$now=dol_now('tzserver');
|
$now=dol_now('tzserver');
|
||||||
$duration_value=$argv[2];
|
$duration_value=$argv[2];
|
||||||
|
|
||||||
$error = 0;
|
|
||||||
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n";
|
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n";
|
||||||
|
|
||||||
$sql = "SELECT DISTINCT s.nom as name, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, s.email, s.default_lang";
|
$sql = "SELECT DISTINCT s.nom as name, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, s.email, s.default_lang";
|
||||||
$sql .= " FROM ".MAIN_DB_PREFIX."societe AS s";
|
$sql .= " FROM ".MAIN_DB_PREFIX."societe AS s";
|
||||||
$sql .= ", ".MAIN_DB_PREFIX."contrat AS c";
|
$sql .= ", ".MAIN_DB_PREFIX."contrat AS c";
|
||||||
$sql .= ", ".MAIN_DB_PREFIX."contratdet AS cd";
|
$sql .= ", ".MAIN_DB_PREFIX."contratdet AS cd";
|
||||||
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = cd.fk_product";
|
$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product AS p ON p.rowid = cd.fk_product";
|
||||||
$sql .= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND c.statut > 0 AND cd.statut<5";
|
$sql .= " WHERE s.rowid = c.fk_soc AND c.rowid = cd.fk_contrat AND c.statut > 0 AND cd.statut<5";
|
||||||
|
|
||||||
@ -176,7 +183,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura
|
|||||||
$newlangs->setDefaultLang($userlang);
|
$newlangs->setDefaultLang($userlang);
|
||||||
$newlangs->load("main");
|
$newlangs->load("main");
|
||||||
$newlangs->load("contracts");
|
$newlangs->load("contracts");
|
||||||
|
|
||||||
if ($duration_value)
|
if ($duration_value)
|
||||||
$title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
|
$title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
|
||||||
else
|
else
|
||||||
|
|||||||
@ -55,14 +55,21 @@ $langs->load('main');
|
|||||||
$langs->load('contracts');
|
$langs->load('contracts');
|
||||||
|
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Main
|
* Main
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
$now=dol_now('tzserver');
|
$now=dol_now('tzserver');
|
||||||
$duration_value=$argv[2];
|
$duration_value=$argv[2];
|
||||||
|
|
||||||
$error = 0;
|
|
||||||
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n";
|
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n";
|
||||||
|
|
||||||
$sql = "SELECT DISTINCT s.nom, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, c.fk_soc,u.rowid AS uid, u.lastname, u.firstname, u.email, u.lang";
|
$sql = "SELECT DISTINCT s.nom, c.ref, cd.date_fin_validite, cd.total_ttc, p.label label, c.fk_soc,u.rowid AS uid, u.lastname, u.firstname, u.email, u.lang";
|
||||||
@ -181,7 +188,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
|
|||||||
$title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
|
$title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value);
|
||||||
else
|
else
|
||||||
$title= $newlangs->transnoentities("ListOfServicesToExpire");
|
$title= $newlangs->transnoentities("ListOfServicesToExpire");
|
||||||
|
|
||||||
$subject = "[".(empty($conf->global->MAIN_APPLICATION_TITLE)?'Dolibarr':$conf->global->MAIN_APPLICATION_TITLE)."] ".$title;
|
$subject = "[".(empty($conf->global->MAIN_APPLICATION_TITLE)?'Dolibarr':$conf->global->MAIN_APPLICATION_TITLE)."] ".$title;
|
||||||
$sendto = $oldemail;
|
$sendto = $oldemail;
|
||||||
$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
$from = $conf->global->MAIN_MAIL_EMAIL_FROM;
|
||||||
|
|||||||
@ -59,10 +59,17 @@ require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php");
|
|||||||
require_once (DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
|
require_once (DOL_DOCUMENT_ROOT.'/user/class/user.class.php');
|
||||||
require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php");
|
require_once (DOL_DOCUMENT_ROOT."/cron/class/cronjob.class.php");
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
@set_time_limit(0);
|
||||||
* Main
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
*/
|
|
||||||
|
|
||||||
// Check security key
|
// Check security key
|
||||||
if ($key != $conf->global->CRON_KEY)
|
if ($key != $conf->global->CRON_KEY)
|
||||||
|
|||||||
@ -45,7 +45,19 @@ require_once ($path."../../htdocs/master.inc.php");
|
|||||||
require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
||||||
|
|
||||||
|
|
||||||
$error = 0;
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// We get list of emailing to process
|
// We get list of emailing to process
|
||||||
|
|||||||
@ -53,10 +53,18 @@ require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
|||||||
|
|
||||||
$langs->load('main');
|
$langs->load('main');
|
||||||
|
|
||||||
|
// Global variables
|
||||||
/*
|
$version=DOL_VERSION;
|
||||||
* Main
|
$error=0;
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
$now=dol_now('tzserver');
|
$now=dol_now('tzserver');
|
||||||
$duration_value=$argv[2];
|
$duration_value=$argv[2];
|
||||||
|
|||||||
@ -54,14 +54,22 @@ require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php");
|
|||||||
$langs->load('main');
|
$langs->load('main');
|
||||||
|
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Main
|
* Main
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
$now=dol_now('tzserver');
|
$now=dol_now('tzserver');
|
||||||
$duration_value=$argv[2];
|
$duration_value=$argv[2];
|
||||||
|
|
||||||
$error = 0;
|
|
||||||
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n";
|
print $script_file." launched with mode ".$mode.($duration_value?" delay=".$duration_value:"")."\n";
|
||||||
|
|
||||||
$sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
|
$sql = "SELECT f.facnumber, f.total_ttc, f.date_lim_reglement as due_date, s.nom as name, u.rowid as uid, u.lastname, u.firstname, u.email, u.lang";
|
||||||
|
|||||||
@ -50,7 +50,11 @@ $version=DOL_VERSION;
|
|||||||
$error=0;
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
// -------------------- START OF YOUR CODE HERE --------------------
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
@set_time_limit(0);
|
@set_time_limit(0);
|
||||||
print "***** ".$script_file." (".$version.") *****\n";
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
|
|||||||
@ -34,21 +34,24 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main
|
|
||||||
$version='1.11';
|
|
||||||
$path=str_replace($script_file,'',$_SERVER["PHP_SELF"]);
|
|
||||||
@set_time_limit(0);
|
|
||||||
$error=0;
|
|
||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
||||||
|
|
||||||
|
|
||||||
$langs->load("main");
|
$langs->load("main");
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
print "***** $script_file ($version) *****\n";
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
if (! isset($argv[1]) || ! $argv[1]) {
|
if (! isset($argv[1]) || ! $argv[1]) {
|
||||||
print "Usage: $script_file now\n";
|
print "Usage: $script_file now\n";
|
||||||
|
|||||||
@ -34,22 +34,29 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Main
|
|
||||||
$version='1.14';
|
|
||||||
@set_time_limit(0);
|
|
||||||
$error=0;
|
|
||||||
$forcecommit=0;
|
|
||||||
|
|
||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/lib/date.lib.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."/core/class/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php");
|
||||||
|
|
||||||
|
|
||||||
$langs->load("main");
|
$langs->load("main");
|
||||||
$langs->load("errors");
|
$langs->load("errors");
|
||||||
|
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
$forcecommit=0;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
// List of fields to get from LDAP
|
// List of fields to get from LDAP
|
||||||
$required_fields = array(
|
$required_fields = array(
|
||||||
|
|||||||
@ -40,17 +40,21 @@ if (! isset($argv[1]) || ! $argv[1]) {
|
|||||||
}
|
}
|
||||||
$now=$argv[1];
|
$now=$argv[1];
|
||||||
|
|
||||||
// Recupere env dolibarr
|
|
||||||
$version='1.10';
|
|
||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php");
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
$error=0;
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
print "***** $script_file ($version) *****\n";
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
|
if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
|
||||||
|
|||||||
@ -35,24 +35,29 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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");
|
||||||
|
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
$forcecommit=0;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
// 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
|
// List of fields to get from LDAP
|
||||||
$required_fields = array(
|
$required_fields = array(
|
||||||
@ -136,11 +141,11 @@ if ($result >= 0)
|
|||||||
$group->entity = $conf->entity;
|
$group->entity = $conf->entity;
|
||||||
|
|
||||||
//print_r($ldapgroup);
|
//print_r($ldapgroup);
|
||||||
|
|
||||||
if($group->id > 0) { // Group update
|
if($group->id > 0) { // Group update
|
||||||
print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->nom;
|
print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->nom;
|
||||||
$res=$group->update();
|
$res=$group->update();
|
||||||
|
|
||||||
if ($res > 0)
|
if ($res > 0)
|
||||||
{
|
{
|
||||||
print ' --> Updated group id='.$group->id.' name='.$group->nom;
|
print ' --> Updated group id='.$group->id.' name='.$group->nom;
|
||||||
@ -154,7 +159,7 @@ if ($result >= 0)
|
|||||||
} else { // Group creation
|
} else { // Group creation
|
||||||
print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->nom;
|
print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->nom;
|
||||||
$res=$group->create();
|
$res=$group->create();
|
||||||
|
|
||||||
if ($res > 0)
|
if ($res > 0)
|
||||||
{
|
{
|
||||||
print ' --> Created group id='.$group->id.' name='.$group->nom;
|
print ' --> Created group id='.$group->id.' name='.$group->nom;
|
||||||
@ -168,7 +173,7 @@ if ($result >= 0)
|
|||||||
}
|
}
|
||||||
|
|
||||||
//print_r($group);
|
//print_r($group);
|
||||||
|
|
||||||
// Gestion des utilisateurs associés au groupe
|
// Gestion des utilisateurs associés au groupe
|
||||||
// 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
|
// 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr
|
||||||
$userList = array();
|
$userList = array();
|
||||||
@ -179,29 +184,29 @@ if ($result >= 0)
|
|||||||
$userFilter = explode(',', $userdn);
|
$userFilter = explode(',', $userdn);
|
||||||
$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
|
$userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS);
|
||||||
if(!is_array($userKey)) continue;
|
if(!is_array($userKey)) continue;
|
||||||
|
|
||||||
$fuser = new User($db);
|
$fuser = new User($db);
|
||||||
|
|
||||||
if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
|
if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
|
||||||
$fuser->fetch('','',$userKey[0]); // Chargement du user concerné par le SID
|
$fuser->fetch('','',$userKey[0]); // Chargement du user concerné par le SID
|
||||||
} else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
|
} else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
|
||||||
$fuser->fetch('',$userKey[0]); // Chargement du user concerné par le login
|
$fuser->fetch('',$userKey[0]); // Chargement du user concerné par le login
|
||||||
}
|
}
|
||||||
|
|
||||||
$userList[$userdn] = $fuser;
|
$userList[$userdn] = $fuser;
|
||||||
} else {
|
} else {
|
||||||
$fuser = &$userList[$userdn];
|
$fuser = &$userList[$userdn];
|
||||||
}
|
}
|
||||||
|
|
||||||
$userIdList[$userdn] = $fuser->id;
|
$userIdList[$userdn] = $fuser->id;
|
||||||
|
|
||||||
// Ajout de l'utilisateur dans le groupe
|
// Ajout de l'utilisateur dans le groupe
|
||||||
if(!in_array($fuser->id, array_keys($group->members))) {
|
if(!in_array($fuser->id, array_keys($group->members))) {
|
||||||
$fuser->SetInGroup($group->id, $group->entity);
|
$fuser->SetInGroup($group->id, $group->entity);
|
||||||
echo $fuser->login.' added'."\n";
|
echo $fuser->login.' added'."\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
|
// 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP
|
||||||
foreach ($group->members as $guser) {
|
foreach ($group->members as $guser) {
|
||||||
if(!in_array($guser->id, $userIdList)) {
|
if(!in_array($guser->id, $userIdList)) {
|
||||||
|
|||||||
@ -40,17 +40,21 @@ if (! isset($argv[1]) || ! $argv[1]) {
|
|||||||
}
|
}
|
||||||
$now=$argv[1];
|
$now=$argv[1];
|
||||||
|
|
||||||
// Recupere env dolibarr
|
|
||||||
$version='1.13';
|
|
||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.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/user.class.php");
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
$error=0;
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
print "***** $script_file ($version) *****\n";
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
|
if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
|
||||||
|
|||||||
@ -34,23 +34,27 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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");
|
||||||
|
|
||||||
|
$langs->load("main");
|
||||||
|
$langs->load("errors");
|
||||||
|
|
||||||
|
|
||||||
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
// Main
|
|
||||||
|
|
||||||
$version='1.14';
|
|
||||||
@set_time_limit(0);
|
|
||||||
$error=0;
|
$error=0;
|
||||||
$forcecommit=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");
|
|
||||||
|
|
||||||
$langs->load("main");
|
/*
|
||||||
$langs->load("errors");
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
// List of fields to get from LDAP
|
// List of fields to get from LDAP
|
||||||
$required_fields = array(
|
$required_fields = array(
|
||||||
@ -178,7 +182,7 @@ if ($result >= 0)
|
|||||||
foreach ($ldaprecords as $key => $ldapuser)
|
foreach ($ldaprecords as $key => $ldapuser)
|
||||||
{
|
{
|
||||||
$fuser = new User($db);
|
$fuser = new User($db);
|
||||||
|
|
||||||
if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_SID) {
|
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
|
$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) {
|
} else if($conf->global->LDAP_KEY_USERS == $conf->global->LDAP_FIELD_LOGIN) {
|
||||||
@ -226,11 +230,11 @@ if ($result >= 0)
|
|||||||
//if ($fuser->statut > 1) $fuser->statut=1;
|
//if ($fuser->statut > 1) $fuser->statut=1;
|
||||||
|
|
||||||
//print_r($ldapuser);
|
//print_r($ldapuser);
|
||||||
|
|
||||||
if($fuser->id > 0) { // User update
|
if($fuser->id > 0) { // User update
|
||||||
print $langs->transnoentities("UserUpdate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
|
print $langs->transnoentities("UserUpdate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
|
||||||
$res=$fuser->update($user);
|
$res=$fuser->update($user);
|
||||||
|
|
||||||
if ($res < 0)
|
if ($res < 0)
|
||||||
{
|
{
|
||||||
$error++;
|
$error++;
|
||||||
@ -243,7 +247,7 @@ if ($result >= 0)
|
|||||||
} else { // User creation
|
} else { // User creation
|
||||||
print $langs->transnoentities("UserCreate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
|
print $langs->transnoentities("UserCreate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs);
|
||||||
$res=$fuser->create($user);
|
$res=$fuser->create($user);
|
||||||
|
|
||||||
if ($res > 0)
|
if ($res > 0)
|
||||||
{
|
{
|
||||||
print ' --> Created user id='.$fuser->id.' login='.$fuser->login;
|
print ' --> Created user id='.$fuser->id.' login='.$fuser->login;
|
||||||
@ -256,7 +260,7 @@ if ($result >= 0)
|
|||||||
}
|
}
|
||||||
print "\n";
|
print "\n";
|
||||||
//print_r($fuser);
|
//print_r($fuser);
|
||||||
|
|
||||||
// Gestion des groupes
|
// Gestion des groupes
|
||||||
// TODO : revoir la gestion des groupes (ou script de sync groupes)
|
// TODO : revoir la gestion des groupes (ou script de sync groupes)
|
||||||
/*if(!$error) {
|
/*if(!$error) {
|
||||||
|
|||||||
@ -34,16 +34,23 @@ if (substr($sapi_type, 0, 3) == 'cgi') {
|
|||||||
exit;
|
exit;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Recupere env dolibarr
|
|
||||||
$version='1.6';
|
|
||||||
|
|
||||||
require_once($path."../../htdocs/master.inc.php");
|
require_once($path."../../htdocs/master.inc.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/prelevement/class/bonprelevement.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/societe/class/societe.class.php");
|
||||||
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
require_once(DOL_DOCUMENT_ROOT."/compta/paiement/class/paiement.class.php");
|
||||||
|
|
||||||
$error = 0;
|
// Global variables
|
||||||
|
$version=DOL_VERSION;
|
||||||
|
$error=0;
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Main
|
||||||
|
*/
|
||||||
|
|
||||||
|
@set_time_limit(0);
|
||||||
|
print "***** ".$script_file." (".$version.") *****\n";
|
||||||
|
|
||||||
$datetimeprev = time();
|
$datetimeprev = time();
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user