diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php index 72908976016..88758563815 100755 --- a/scripts/bank/export-bank-receipts.php +++ b/scripts/bank/export-bank-receipts.php @@ -54,7 +54,10 @@ $error=0; -// -------------------- START OF YOUR CODE HERE -------------------- +/* + * Main + */ + @set_time_limit(0); print "***** ".$script_file." (".$version.") *****\n"; diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php index a07813b3606..760b351df7d 100644 --- a/scripts/company/export-contacts-xls-example.php +++ b/scripts/company/export-contacts-xls-example.php @@ -40,8 +40,6 @@ if (! isset($argv[1]) || ! $argv[1]) { } $now=$argv[1]; -// Recupere env dolibarr -$version='1.10'; require_once($path."../../htdocs/master.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/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'; //$objPHPExcel = new writeexcel_workbook($fname); diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index 5cdc38537d5..a9916100218 100644 --- a/scripts/company/sync_contacts_dolibarr2ldap.php +++ b/scripts/company/sync_contacts_dolibarr2ldap.php @@ -40,18 +40,23 @@ if (! isset($argv[1]) || ! $argv[1]) { } $now=$argv[1]; -// Recupere env dolibarr -$version='1.25'; require_once($path."../../htdocs/master.inc.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."/core/class/ldap.class.php"); +// Global variables +$version=DOL_VERSION; $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"; $conf->global->MAIN_DISABLE_ALL_MAILS=1; // On bloque les mails diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php index 4a74218b843..09c71b571b1 100755 --- a/scripts/contracts/email_expire_services_to_customers.php +++ b/scripts/contracts/email_expire_services_to_customers.php @@ -55,20 +55,27 @@ $langs->load('main'); $langs->load('contracts'); +// Global variables +$version=DOL_VERSION; +$error=0; + + /* * Main */ +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; + $now=dol_now('tzserver'); $duration_value=$argv[2]; -$error = 0; 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 .= " FROM ".MAIN_DB_PREFIX."societe AS s"; -$sql .= ", ".MAIN_DB_PREFIX."contrat AS c"; -$sql .= ", ".MAIN_DB_PREFIX."contratdet AS cd"; +$sql .= ", ".MAIN_DB_PREFIX."contrat AS c"; +$sql .= ", ".MAIN_DB_PREFIX."contratdet AS cd"; $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"; @@ -176,7 +183,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura $newlangs->setDefaultLang($userlang); $newlangs->load("main"); $newlangs->load("contracts"); - + if ($duration_value) $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value); else diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index 249cfc3b195..282d38fb82a 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -55,14 +55,21 @@ $langs->load('main'); $langs->load('contracts'); +// Global variables +$version=DOL_VERSION; +$error=0; + + /* * Main */ +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; + $now=dol_now('tzserver'); $duration_value=$argv[2]; -$error = 0; 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"; @@ -181,7 +188,7 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta $title=$newlangs->transnoentities("ListOfServicesToExpireWithDuration",$duration_value); else $title= $newlangs->transnoentities("ListOfServicesToExpire"); - + $subject = "[".(empty($conf->global->MAIN_APPLICATION_TITLE)?'Dolibarr':$conf->global->MAIN_APPLICATION_TITLE)."] ".$title; $sendto = $oldemail; $from = $conf->global->MAIN_MAIL_EMAIL_FROM; diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php index 151af859fcd..386c996f137 100755 --- a/scripts/cron/cron_run_jobs.php +++ b/scripts/cron/cron_run_jobs.php @@ -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."/cron/class/cronjob.class.php"); +// Global variables +$version=DOL_VERSION; +$error=0; + + +/* + * Main + */ -/* - * Main - */ +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; // Check security key if ($key != $conf->global->CRON_KEY) diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index 1c929dec212..23830007fae 100755 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -45,7 +45,19 @@ require_once ($path."../../htdocs/master.inc.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 diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index 1c88248b2ce..81bf16a24cf 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -53,10 +53,18 @@ require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $langs->load('main'); - -/* - * Main - */ +// Global variables +$version=DOL_VERSION; +$error=0; + + + +/* + * Main + */ + +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; $now=dol_now('tzserver'); $duration_value=$argv[2]; diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index 07c181b4f93..01837c47761 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -54,14 +54,22 @@ require_once (DOL_DOCUMENT_ROOT."/core/class/CMailFile.class.php"); $langs->load('main'); +// Global variables +$version=DOL_VERSION; +$error=0; + + + /* * Main */ +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; + $now=dol_now('tzserver'); $duration_value=$argv[2]; -$error = 0; 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"; diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index 8fc5f00334d..6b13ac06849 100755 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -50,7 +50,11 @@ $version=DOL_VERSION; $error=0; -// -------------------- START OF YOUR CODE HERE -------------------- + +/* + * Main + */ + @set_time_limit(0); print "***** ".$script_file." (".$version.") *****\n"; diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index eb14a9cb6a6..7a8f3bad42c 100755 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -34,21 +34,24 @@ if (substr($sapi_type, 0, 3) == 'cgi') { 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(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/adherent.class.php"); - $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]) { print "Usage: $script_file now\n"; diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 6c72556f89f..45577cddcb0 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -34,22 +34,29 @@ if (substr($sapi_type, 0, 3) == 'cgi') { 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."/adherents/class/adherent.class.php"); require_once(DOL_DOCUMENT_ROOT."/adherents/class/cotisation.class.php"); - $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 $required_fields = array( diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index 5f0780e3f35..602673c8cce 100755 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -40,17 +40,21 @@ if (! isset($argv[1]) || ! $argv[1]) { } $now=$argv[1]; -// Recupere env dolibarr -$version='1.10'; - require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php"); +// Global variables +$version=DOL_VERSION; $error=0; -print "***** $script_file ($version) *****\n"; +/* + * Main + */ + +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; /* if (! $conf->global->LDAP_SYNCHRO_ACTIVE) diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index fd92086e77f..2c239197b41 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -35,24 +35,29 @@ if (substr($sapi_type, 0, 3) == 'cgi') { 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 $required_fields = array( @@ -136,11 +141,11 @@ if ($result >= 0) $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; @@ -154,7 +159,7 @@ if ($result >= 0) } 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; @@ -168,7 +173,7 @@ if ($result >= 0) } //print_r($group); - + // Gestion des utilisateurs associés au groupe // 1 - Association des utilisateurs du groupe LDAP au groupe Dolibarr $userList = array(); @@ -179,29 +184,29 @@ if ($result >= 0) $userFilter = explode(',', $userdn); $userKey = $ldap->getAttributeValues('('.$userFilter[0].')', $conf->global->LDAP_KEY_USERS); if(!is_array($userKey)) continue; - + $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); echo $fuser->login.' added'."\n"; } } - + // 2 - Suppression des utilisateurs du groupe Dolibarr qui ne sont plus dans le groupe LDAP foreach ($group->members as $guser) { if(!in_array($guser->id, $userIdList)) { diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php index 3b47af05053..c6a26804b40 100755 --- a/scripts/user/sync_users_dolibarr2ldap.php +++ b/scripts/user/sync_users_dolibarr2ldap.php @@ -40,17 +40,21 @@ if (! isset($argv[1]) || ! $argv[1]) { } $now=$argv[1]; -// Recupere env dolibarr -$version='1.13'; - require_once($path."../../htdocs/master.inc.php"); require_once(DOL_DOCUMENT_ROOT."/core/class/ldap.class.php"); require_once(DOL_DOCUMENT_ROOT."/user/class/user.class.php"); +// Global variables +$version=DOL_VERSION; $error=0; -print "***** $script_file ($version) *****\n"; +/* + * Main + */ + +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; /* if (! $conf->global->LDAP_SYNCHRO_ACTIVE) diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index 64bea3ca567..6f7d63c41ce 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -34,23 +34,27 @@ if (substr($sapi_type, 0, 3) == 'cgi') { 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"); + - - -// Main - -$version='1.14'; -@set_time_limit(0); +// Global variables +$version=DOL_VERSION; $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"); -$langs->load("main"); -$langs->load("errors"); +/* + * Main + */ + +@set_time_limit(0); +print "***** ".$script_file." (".$version.") *****\n"; // List of fields to get from LDAP $required_fields = array( @@ -178,7 +182,7 @@ if ($result >= 0) foreach ($ldaprecords as $key => $ldapuser) { $fuser = new User($db); - + 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) { @@ -226,11 +230,11 @@ if ($result >= 0) //if ($fuser->statut > 1) $fuser->statut=1; //print_r($ldapuser); - + if($fuser->id > 0) { // User update print $langs->transnoentities("UserUpdate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs); $res=$fuser->update($user); - + if ($res < 0) { $error++; @@ -243,7 +247,7 @@ if ($result >= 0) } else { // User creation print $langs->transnoentities("UserCreate").' # '.$key.': login='.$fuser->login.', fullname='.$fuser->getFullName($langs); $res=$fuser->create($user); - + if ($res > 0) { print ' --> Created user id='.$fuser->id.' login='.$fuser->login; @@ -256,7 +260,7 @@ if ($result >= 0) } print "\n"; //print_r($fuser); - + // Gestion des groupes // TODO : revoir la gestion des groupes (ou script de sync groupes) /*if(!$error) { diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php index c7513c48540..0afb79b55d7 100644 --- a/scripts/withdrawals/build_withdrawal_file.php +++ b/scripts/withdrawals/build_withdrawal_file.php @@ -34,16 +34,23 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit; } -// Recupere env dolibarr -$version='1.6'; - require_once($path."../../htdocs/master.inc.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."/societe/class/societe.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();