Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop

ChangeLog

@@ -16,7 +16,9 @@ For users:
 - New: [ task #901 ] Add Extrafeild on Fiche Inter.
 - New: Show process id in all command line scripts.
 - New: Module mailman can subscribe/unsubscribe to ML according to categories or type of member.
-- New: New: Add object_hour as substitution tag for opendocument generation.
+- New: Add object_hour as substitution tag for opendocument generation.
+- New: Add option MEMBER_PAYONLINE_SENDEMAIL to send email when paypal or paybox payment is done.
+- New: Implement same rule for return value of all command line scripts (0 when success, <>0 if error).
 
 For translators:
 - Normalized sort order of all languages files with english ref file.

dev/skeletons/skeleton_script.php

@@ -31,7 +31,7 @@ $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;
+	exit(-1);
 }
 
 // Global variables
@@ -60,7 +60,7 @@ $user->getrights();
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 if (! isset($argv[1])) {	// Check parameters
     print "Usage: ".$script_file." param1 param2 ...\n";
-    exit;
+	exit(-1);
 }
 print '--- start'."\n";
 print 'Argument 1='.$argv[1]."\n";
@@ -163,5 +163,5 @@ else
 
 $db->close();	// Close $db database opened handler
 
-return $error;
-?>
+exit($error);
+?>

htdocs/core/class/html.form.class.php

@@ -1307,31 +1307,25 @@ class Form
         }
         if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype;
         // Add criteria on ref/label
-        if ($filterkey && $filterkey != '')
+        if ($filterkey != '')
         {
-        	$sql.=" AND (";
-            if (! empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))   // Can use index
+        	$sql.=' AND (';
+        	$prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+            // For natural search
+            $scrit = explode(' ', $filterkey);
+            $i=0;
+            if (count($scrit) > 1) $sql.="(";
+            foreach ($scrit as $crit)
             {
-                $sql.=" AND (p.ref LIKE '".$filterkey."%' OR p.label LIKE '".$filterkey."%'";
-                if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '".$filterkey."%'";
+            	if ($i > 0) $sql.=" AND ";
+                $sql.="(p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%'";
+                if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '".$prefix.$crit."%'";
                 $sql.=")";
+                $i++;
             }
-            else
-            {
-                // For natural search
-                $scrit = explode(' ', $filterkey);
-                foreach ($scrit as $crit) {
-                    $sql.=" AND (p.ref LIKE '%".$crit."%' OR p.label LIKE '%".$crit."%'";
-                    if (! empty($conf->global->MAIN_MULTILANGS)) $sql.=" OR pl.label LIKE '%".$crit."%'";
-                    $sql.=")";
-                }
-            }
-
-            if (! empty($conf->barcode->enabled))
-            {
-                $sql .= " OR p.barcode LIKE '".$filterkey."'";
-            }
-            $sql.=")";
+            if (count($scrit) > 1) $sql.=")";
+          	if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'";
+        	$sql.=')';
         }
         $sql.= $db->order("p.ref");
         $sql.= $db->plimit($limit);
@@ -1658,21 +1652,23 @@ class Form
         if (strval($filtertype) != '') $sql.=" AND p.fk_product_type=".$filtertype;
         if (! empty($filtre)) $sql.=" ".$filtre;
         // Add criteria on ref/label
-        if ($filterkey && $filterkey != '')
+        if ($filterkey != '')
         {
-            if (! empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE))
-            {
-                $sql.=" AND (pfp.ref_fourn LIKE '".$filterkey."%' OR p.ref LIKE '".$filterkey."%' OR p.label LIKE '".$filterkey."%')";
-            }
-            else
-            {
-                $sql.=" AND (pfp.ref_fourn LIKE '%".$filterkey."%' OR p.ref LIKE '%".$filterkey."%' OR p.label LIKE '%".$filterkey."%')";
-            }
-
-            if (! empty($conf->barcode->enabled))
-            {
-                $sql .= " OR p.barcode LIKE '".$filterkey."'";
-            }
+        	$sql.=' AND (';
+        	$prefix=empty($conf->global->PRODUCT_DONOTSEARCH_ANYWHERE)?'%':'';	// Can use index if PRODUCT_DONOTSEARCH_ANYWHERE is on
+        	// For natural search
+        	$scrit = explode(' ', $filterkey);
+        	$i=0;
+        	if (count($scrit) > 1) $sql.="(";
+        	foreach ($scrit as $crit)
+        	{
+        		if ($i > 0) $sql.=" AND ";
+        		$sql.="(pfp.ref_fourn LIKE '".$prefix.$crit."%' OR p.ref LIKE '".$prefix.$crit."%' OR p.label LIKE '".$prefix.$crit."%')";
+        		$i++;
+        	}
+        	if (count($scrit) > 1) $sql.=")";
+        	if (! empty($conf->barcode->enabled)) $sql.= " OR p.barcode LIKE '".$prefix.$filterkey."%'";
+        	$sql.=')';
         }
         $sql.= " ORDER BY pfp.ref_fourn DESC, pfp.quantity ASC";
 

htdocs/mailmanspip/class/mailmanspip.class.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2002-2003 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2002-2003 Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2013 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2004      Sebastien Di Cintio  <sdicintio@ressource-toi.org>
  * Copyright (C) 2004      Benoit Mortier       <benoit.mortier@opensides.be>
  * Copyright (C) 2009      Regis Houssin        <regis.houssin@capnetworks.com>
@@ -24,10 +24,11 @@
 /**
  *	\file       htdocs/mailmanspip/class/mailmanspip.class.php
  *	\ingroup    member
- *	\brief      File of class to manage members of a foundation
+ *	\brief      File of class to manage mailman and spip actions
  */
 
 require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
 

htdocs/product/ajax/products.php

@@ -157,11 +157,11 @@ else
 	$form = new Form($db);
 	if (empty($mode) || $mode == 1)
 	{
-		$arrayresult=$form->select_produits_do("",$htmlname,$type,"",$price_level,$searchkey,$status,2,$outjson);
+		$arrayresult=$form->select_produits_list("",$htmlname,$type,"",$price_level,$searchkey,$status,2,$outjson);
 	}
 	elseif ($mode == 2)
 	{
-		$arrayresult=$form->select_produits_fournisseurs_do($socid,"",$htmlname,$type,"",$searchkey,$status,$outjson);
+		$arrayresult=$form->select_produits_fournisseurs_list($socid,"",$htmlname,$type,"",$searchkey,$status,$outjson);
 	}
 
 	$db->close();

htdocs/public/paybox/paymentko.php

@@ -64,7 +64,7 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paybox');
 
 
 // Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag))
 {
 	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
@@ -79,11 +79,11 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu
 	$result=$mailfile->sendfile();
 	if ($result)
 	{
-		dol_syslog("EMail sent to ".$sendto);
+		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
 	}
 	else
 	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
 	}
 }
 

htdocs/public/paybox/paymentok.php

@@ -94,7 +94,7 @@ dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType."
 */
 
 // Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag))
 {
 	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
@@ -109,11 +109,11 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu
 	$result=$mailfile->sendfile();
 	if ($result)
 	{
-		dol_syslog("EMail sent to ".$sendto);
+		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paybox');
 	}
 	else
 	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paybox');
 	}
 }
 

htdocs/public/paypal/paymentko.php

@@ -72,7 +72,7 @@ dol_syslog("POST=".$tracepost, LOG_DEBUG, 0, '_paypal');
 
 
 // Send an email
-if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag))
 {
 	$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
 	$from=$conf->global->MAILING_EMAIL_FROM;
@@ -87,11 +87,11 @@ if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fu
 	$result=$mailfile->sendfile();
 	if ($result)
 	{
-		dol_syslog("EMail sent to ".$sendto);
+		dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
 	}
 	else
 	{
-		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+		dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
 	}
 }
 

htdocs/public/paypal/paymentok.php

@@ -127,11 +127,11 @@ if ($PAYPALTOKEN)
     // From env
     $ipaddress          = $_SESSION['ipaddress'];
 
-	dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+	dol_syslog("Call newpaymentok with token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
 
 
 	// Send an email
-	if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=',$fulltag))
+	if (! empty($conf->global->MEMBER_PAYONLINE_SENDEMAIL) && preg_match('/MEM=/',$fulltag))
 	{
 		$sendto=$conf->global->MEMBER_PAYONLINE_SENDEMAIL;
 		$from=$conf->global->MAILING_EMAIL_FROM;
@@ -146,11 +146,11 @@ if ($PAYPALTOKEN)
 		$result=$mailfile->sendfile();
 		if ($result)
 		{
-			dol_syslog("EMail sent to ".$sendto);
+			dol_syslog("EMail sent to ".$sendto, LOG_DEBUG, 0, '_paypal');
 		}
 		else
 		{
-			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR);
+			dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_paypal');
 		}
 	}
 
@@ -158,11 +158,11 @@ if ($PAYPALTOKEN)
 	// Validate record
     if (! empty($paymentType))
     {
-        dol_syslog("We call GetExpressCheckoutDetails");
+        dol_syslog("We call GetExpressCheckoutDetails", LOG_DEBUG, 0, '_paypal');
         $resArray=getDetails($token);
         //var_dump($resarray);
 
-        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag);
+        dol_syslog("We call DoExpressCheckoutPayment token=".$token." paymentType=".$paymentType." currencyCodeType=".$currencyCodeType." payerID=".$payerID." ipaddress=".$ipaddress." FinalPaymentAmt=".$FinalPaymentAmt." fulltag=".$fulltag, LOG_DEBUG, 0, '_paypal');
         $resArray=confirmPayment($token, $paymentType, $currencyCodeType, $payerID, $ipaddress, $FinalPaymentAmt, $fulltag);
 
         $ack = strtoupper($resArray["ACK"]);

scripts/bank/export-bank-receipts.php

@@ -30,7 +30,7 @@ $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;
+	exit(-1);
 }
 
 require_once($path."../../htdocs/master.inc.php");
@@ -62,8 +62,8 @@ $error=0;
 print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 if (! isset($argv[3]) || ! $argv[3]) {
-	print "Usage: $script_file bank_ref bank_receipt_number (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
-	exit;
+	print "Usage: ".$script_file." bank_ref bank_receipt_number (csv|tsv|excel|excel2007) [lang=xx_XX]\n";
+	exit(-1);
 }
 $bankref=$argv[1];
 $num=$argv[2];
@@ -120,7 +120,7 @@ $result=$acct->fetch('',$bankref);
 if ($result <= 0)
 {
 	print "Failed to find bank account with ref ".$bankref.".\n";
-	exit;
+	exit(-1);
 }
 else
 {
@@ -135,7 +135,7 @@ $classname = "Export".$model;
 if (! dol_is_file($dir.$file))
 {
 	print "No driver to export with format ".$model."\n";
-	exit;
+	exit(-1);
 }
 require_once $dir.$file;
 $objmodel = new $classname($db);
@@ -247,7 +247,7 @@ if ($resql)
 			else
 			{
 				dol_print_error($db);
-				exit;
+				exit(-1);
 			}
 
 			$total = $balancebefore[$objp->num_releve];
@@ -439,5 +439,5 @@ else
 
 $db->close();
 
-return $ret;
+exit($ret);
 ?>

scripts/company/export-contacts-xls-example.php

@@ -31,12 +31,12 @@ $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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
 	print "Usage: $script_file now\n";
-	exit;
+	exit(-1);
 }
 $now=$argv[1];
 
@@ -120,4 +120,5 @@ $objWriter->save($fname);
 
 print 'File '.$fname.' was generated.'."\n";
 
+exit(0);
 ?>

scripts/company/sync_contacts_dolibarr2ldap.php

@@ -31,12 +31,12 @@ $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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now\n";
-    exit;
+	exit(-1);
 }
 $now=$argv[1];
 
@@ -87,7 +87,7 @@ $input = trim(fgets(STDIN));
 if (! $conf->global->LDAP_CONTACT_ACTIVE)
 {
 	print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
-	exit 1;
+	exit(-1);
 }
 */
 
@@ -147,5 +147,5 @@ else
 	dol_print_error($db);
 }
 
-return $error;
+exit($error);
 ?>

scripts/contracts/email_expire_services_to_customers.php

@@ -33,7 +33,7 @@ $path=dirname(__FILE__).'/';
 $sapi_type = php_sapi_name();
 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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')))
@@ -43,7 +43,7 @@ if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm
 	print "Send an email to customers to remind all all contracts services to expire.\n";
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add a delay (nb of days), only services with expired date < today + delay are included.\n";
-	exit;
+	exit(-1);
 }
 $mode=$argv[1];
 
@@ -157,11 +157,15 @@ if ($resql)
     {
         print "No unpaid invoices found\n";
     }
+
+    exit(0);
 }
 else
 {
     dol_print_error($db);
     dol_syslog("email_expire_services_to_customers.php: Error");
+
+    exit(-1);
 }
 
 
@@ -269,5 +273,4 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldcustomer,$dura
     }
 }
 
-
-?>
+?>

scripts/contracts/email_expire_services_to_representatives.php

@@ -33,7 +33,7 @@ $path=dirname(__FILE__).'/';
 $sapi_type = php_sapi_name();
 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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')))
@@ -43,7 +43,7 @@ if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm
 	print "Send an email to remind all contracts services to expire, to users that are sale representative for.\n";
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add a delay (nb of days), only services with expired date < today + delay are included.\n";
-	exit;
+	exit(-1);
 }
 $mode=$argv[1];
 
@@ -154,14 +154,18 @@ if ($resql)
         }
     }
     else
-    {
+	{
         print "No services to expire (for companies linked to a particular commercial dolibarr user) found\n";
     }
+
+    exit(0);
 }
 else
 {
     dol_print_error($db);
     dol_syslog("email_expire_services_to_representatives.php: Error");
+
+    exit(-1);
 }
 
 
@@ -268,5 +272,4 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
     }
 }
 
-
-?>
+?>

scripts/cron/cron_run_jobs.php

@@ -1,7 +1,8 @@
 #!/usr/bin/php
 <?php
-/* Copyright (C) 2012      Nicolas Villa aka Boyquotes http://informetic.fr
- * Copyright (C) 2013      Florian Henry <forian.henry@open-cocnept.pro
+/* Copyright (C) 2012 Nicolas Villa aka Boyquotes http://informetic.fr
+ * Copyright (C) 2013 Florian Henry <forian.henry@open-concept.pro
+ * Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
  *
  * 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
@@ -38,18 +39,18 @@ $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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
 	print "Usage: ".$script_file." securitykey userlogin cronjobid(optional)\n";
-	exit;
+	exit(-1);
 }
 $key=$argv[1];
 
 if (! isset($argv[2]) || ! $argv[2]) {
 	print "Usage: ".$script_file." securitykey userlogin cronjobid(optional)\n";
-	exit;
+	exit(-1);
 } else {
 	$userlogin=$argv[2];
 }
@@ -75,7 +76,7 @@ print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 if ($key != $conf->global->CRON_KEY)
 {
 	print "Error: securitykey is wrong\n";
-	exit;
+	exit(-1);
 }
 
 // Check user login
@@ -85,7 +86,7 @@ if ($result < 0)
 {
 	echo "User Error: ".$user->error;
 	dol_syslog("cron_run_jobs.php:: User Error:".$user->error, LOG_ERR);
-	exit;
+	exit(-1);
 }
 else
 {
@@ -93,7 +94,7 @@ else
 	{
 		echo " User user login: ".$userlogin." do not exists";
 		dol_syslog(" User user login:".$userlogin." do not exists", LOG_ERR);
-		exit;
+		exit(-1);
 	}
 }
 
@@ -116,7 +117,7 @@ if ($result<0)
 {
 	echo "Error: ".$object->error;
 	dol_syslog("cron_run_jobs.php:: fetch Error ".$object->error, LOG_ERR);
-	exit;
+	exit(-1);
 }
 
 // current date
@@ -135,14 +136,14 @@ if(is_array($object->lines) && (count($object->lines)>0))
 				if ($result<0) {
 					echo "Error:".$cronjob->error;
 					dol_syslog("cron_run_jobs.php:: fetch Error".$cronjob->error, LOG_ERR);
-					exit;
+					exit(-1);
 				}
 				// execute methode
 				$result=$cronjob->run_jobs($userlogin);
 				if ($result<0) {
 					echo "Error:".$cronjob->error;
 					dol_syslog("cron_run_jobs.php:: run_jobs Error".$cronjob->error, LOG_ERR);
-					exit;
+					exit(-1);
 				}
 
 					// we re-program the next execution and stores the last execution time for this job
@@ -150,7 +151,7 @@ if(is_array($object->lines) && (count($object->lines)>0))
 				if ($result<0) {
 					echo "Error:".$cronjob->error;
 					dol_syslog("cron_run_jobs.php:: reprogram_jobs Error".$cronjob->error, LOG_ERR);
-					exit;
+					exit(-1);
 				}
 
 			}
@@ -158,4 +159,6 @@ if(is_array($object->lines) && (count($object->lines)>0))
 }
 
 $db->close();
+
+exit(0);
 ?>

scripts/emailings/mailing-send.php

@@ -32,12 +32,12 @@ $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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
 	print "Usage: ".$script_file." (ID_MAILING|all)\n";
-	exit;
+	exit(-1);
 }
 $id=$argv[1];
 

scripts/invoices/email_unpaid_invoices_to_customers.php

@@ -33,7 +33,7 @@ $path=dirname(__FILE__).'/';
 $sapi_type = php_sapi_name();
 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;
+	exit(-1);
 }
 
 if (! isset($argv[2]) || ! $argv[2] || ! in_array($argv[1],array('test','confirm')) || ! in_array($argv[2],array('thirdparties','contacts')))
@@ -43,7 +43,7 @@ if (! isset($argv[2]) || ! $argv[2] || ! in_array($argv[1],array('test','confirm
 	print "Send an email to customers to remind all unpaid customer invoices.\n";
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add a delay (nb of days), only invoice with due date < today + delay are included.\n";
-	exit;
+	exit(-1);
 }
 $mode=$argv[1];
 $targettype=$argv[2];
@@ -187,14 +187,18 @@ if ($resql)
         }
     }
     else
-    {
+	{
         print "No unpaid invoices found\n";
     }
+
+    exit(0);
 }
 else
 {
     dol_print_error($db);
     dol_syslog("email_unpaid_invoices_to_customers.php: Error");
+
+    exit(-1);
 }
 
 
@@ -297,5 +301,4 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldtarget)
     }
 }
 
-
 ?>

scripts/invoices/email_unpaid_invoices_to_representatives.php

@@ -33,7 +33,7 @@ $path=dirname(__FILE__).'/';
 $sapi_type = php_sapi_name();
 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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm')))
@@ -43,7 +43,7 @@ if (! isset($argv[1]) || ! $argv[1] || ! in_array($argv[1],array('test','confirm
 	print "Send an email to users to remind all unpaid customer invoices user is sale representative for.\n";
 	print "If you choose 'test' mode, no emails are sent.\n";
 	print "If you add a delay (nb of days), only invoice with due date < today + delay are included.\n";
-	exit;
+	exit(-1);
 }
 $mode=$argv[1];
 
@@ -164,14 +164,18 @@ if ($resql)
         }
     }
     else
-    {
+	{
         print "No unpaid invoices (for companies linked to a particular commercial dolibarr user) found\n";
     }
+
+    exit(0);
 }
 else
 {
     dol_print_error($db);
     dol_syslog("email_unpaid_invoices_to_representatives.php: Error");
+
+    exit(-1);
 }
 
 
@@ -272,5 +276,4 @@ function envoi_mail($mode,$oldemail,$message,$total,$userlang,$oldsalerepresenta
     }
 }
 
-
 ?>

scripts/invoices/rebuild_merge_pdf.php

@@ -30,7 +30,7 @@ $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;
+	exit(-1);
 }
 
 // Include Dolibarr environment
@@ -62,7 +62,7 @@ print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 if (! isset($argv[1]))
 {
 	usage();
-	exit;
+	exit(-1);
 }
 
 $diroutputpdf=$conf->facture->dir_output . '/temp';
@@ -125,7 +125,7 @@ foreach ($argv as $key => $value)
 		if (empty($paymentdateafter) || empty($paymentdatebefore))
 		{
 			print 'Error: Bad date format'."\n";
-			exit;
+			exit(-1);
 		}
 		print 'Rebuild PDF for invoices with at least one payment between '.dol_print_date($paymentdateafter,'day')." and ".dol_print_date($paymentdatebefore,'day').".\n";
 	}
@@ -151,7 +151,7 @@ foreach ($argv as $key => $value)
 		if ($result <= 0)
 		{
 			print 'Error: Bank account with ref "'.$paymentonbankref.'" not found'."\n";
-			exit;
+			exit(-1);
 		}
 		$paymentonbankid=$bankaccount->id;
 		print 'Rebuild PDF for invoices with at least one payment on financial account '.$bankaccount->ref."\n";
@@ -185,7 +185,7 @@ foreach ($argv as $key => $value)
 	if (! $found && preg_match('/filter=/i',$value))
 	{
 		usage();
-		exit;
+		exit(-1);
 	}
 }
 
@@ -193,18 +193,18 @@ foreach ($argv as $key => $value)
 if (empty($option) && count($filter) <= 0)
 {
 	usage();
-	exit;
+	exit(-1);
 }
 // Check if there is no uncompatible choice
 if (in_array('payments',$filter) && in_array('nopayment',$filter))
 {
 	usage();
-	exit;
+	exit(-1);
 }
 if (in_array('bank',$filter) && in_array('nopayment',$filter))
 {
 	usage();
-	exit;
+	exit(-1);
 }
 
 
@@ -229,7 +229,7 @@ else
 
 $db->close();
 
-return $error;
+exit($error);
 
 
 

scripts/members/sync_members_dolibarr2ldap.php

@@ -31,7 +31,7 @@ $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;
+	exit(-1);
 }
 
 require_once($path."../../htdocs/master.inc.php");
@@ -55,7 +55,7 @@ print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now\n";
-    exit;
+	exit(-1);
 }
 $now=$argv[1];
 
@@ -88,7 +88,7 @@ $input = trim(fgets(STDIN));
 if (! $conf->global->LDAP_MEMBER_ACTIVE)
 {
 	print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
-	exit 1;
+	exit(-1);
 }
 */
 
@@ -115,13 +115,13 @@ if ($resql)
 		if ($result < 0)
 		{
 			dol_print_error($db,$member->error);
-			exit;
+			exit(-1);
 		}
 		$result=$member->fetch_subscriptions();
 		if ($result < 0)
 		{
 			dol_print_error($db,$member->error);
-			exit;
+			exit(-1);
 		}
 
 		print $langs->transnoentities("UpdateMember")." rowid=".$member->id." ".$member->getFullName($langs);
@@ -158,5 +158,5 @@ else
 	dol_print_error($db);
 }
 
-return $error;
+exit($error);
 ?>

scripts/members/sync_members_ldap2dolibarr.php

@@ -31,7 +31,7 @@ $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;
+	exit(-1);
 }
 
 require_once($path."../../htdocs/master.inc.php");
@@ -98,7 +98,7 @@ print "***** $script_file ($version) *****\n";
 
 if (! isset($argv[2]) || ! is_numeric($argv[2])) {
     print "Usage:  $script_file (nocommitiferror|commitiferror) id_member_type [ldapserverhost]\n";
-    exit;
+	exit(-1);
 }
 $typeid=$argv[2];
 if ($argv[1] == 'commitiferror') $forcecommit=1;
@@ -128,12 +128,12 @@ print "\n";
 if (empty($conf->global->LDAP_MEMBER_DN))
 {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for members not defined inside Dolibarr")."\n";
-	exit(1);
+	exit(-1);
 }
 if ($typeid <= 0)
 {
 	print $langs->trans("Error").': Parameter id_member_type is not a valid ref of an existing member type'."\n";
-	exit(2);
+	exit(-2);
 }
 
 
@@ -173,7 +173,7 @@ if ($resql)
 else
 {
 	dol_print_error($db);
-	exit;
+	exit(-1);
 }
 
 
@@ -326,7 +326,7 @@ else
 }
 
 
-return $error;
+exit($error);
 
 
 /**
@@ -340,4 +340,4 @@ function dolValidElement($element)
 	return (trim($element) != '');
 }
 
-?>
+?>

scripts/user/sync_groups_dolibarr2ldap.php

@@ -31,12 +31,12 @@ $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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
-    print "Usage: $script_file now\n";
-    exit;
+    print "Usage: ".$script_file." now\n";
+	exit(-1);
 }
 $now=$argv[1];
 
@@ -60,7 +60,7 @@ print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
 {
 	print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
-	exit 1;
+	exit(-1);
 }
 */
 
@@ -120,5 +120,5 @@ else
 	dol_print_error($db);
 }
 
-return $error;
+exit($error);
 ?>

scripts/user/sync_groups_ldap2dolibarr.php

@@ -32,7 +32,7 @@ $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;
+	exit(-1);
 }
 
 require_once($path."../../htdocs/master.inc.php");
@@ -77,7 +77,7 @@ 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;
+	exit(-1);
 }
 $groupid=$argv[3];
 if ($argv[1] == 'commitiferror') $forcecommit=1;
@@ -112,7 +112,7 @@ $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);
+	exit(-1);
 }
 
 
@@ -242,7 +242,7 @@ else
 }
 
 
-return $error;
+exit($error);
 
 
 /**
@@ -256,4 +256,4 @@ function dolValidElement($element)
 	return (trim($element) != '');
 }
 
-?>
+?>

scripts/user/sync_users_dolibarr2ldap.php

@@ -31,12 +31,12 @@ $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;
+	exit(-1);
 }
 
 if (! isset($argv[1]) || ! $argv[1]) {
     print "Usage: $script_file now\n";
-    exit;
+	exit(-1);
 }
 $now=$argv[1];
 
@@ -60,7 +60,7 @@ print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n";
 if (! $conf->global->LDAP_SYNCHRO_ACTIVE)
 {
 	print $langs->trans("LDAPSynchronizationNotSetupInDolibarr");
-	exit 1;
+	exit(-1);
 }
 */
 
@@ -119,5 +119,5 @@ else
 	dol_print_error($db);
 }
 
-return $error;
-?>
+exit($error);
+?>

scripts/user/sync_users_ldap2dolibarr.php

@@ -31,7 +31,7 @@ $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;
+	exit(-1);
 }
 
 require_once($path."../../htdocs/master.inc.php");
@@ -89,7 +89,7 @@ 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;
+    exit(-1);
 }
 $groupid=$argv[3];
 if ($argv[1] == 'commitiferror') $forcecommit=1;
@@ -124,7 +124,7 @@ $input = trim(fgets(STDIN));
 if (empty($conf->global->LDAP_USER_DN))
 {
 	print $langs->trans("Error").': '.$langs->trans("LDAP setup for users not defined inside Dolibarr");
-	exit(1);
+	exit(-1);
 }
 
 
@@ -158,7 +158,7 @@ if ($resql)
 else
 {
 	dol_print_error($db);
-	exit;
+	exit(-1);
 }
 
 
@@ -296,7 +296,7 @@ else
 }
 
 
-return $error;
+exit($error);
 
 
 /**
@@ -310,4 +310,4 @@ function dolValidElement($element)
 	return (trim($element) != '');
 }
 
-?>
+?>

scripts/withdrawals/build_withdrawal_file.php

@@ -31,7 +31,7 @@ $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;
+	exit(-1);
 }
 
 require_once($path."../../htdocs/master.inc.php");
@@ -66,7 +66,7 @@ if (! isset($argv[1])) {	// Check parameters
     print "This script check invoices with a withdrawal request and\n";
     print "then create payment and build a withdraw file.\n";
 	print "Usage: ".$script_file." simu|real\n";
-    exit;
+    exit(-1);
 }
 
 
@@ -75,4 +75,6 @@ $result=$withdrawreceipt->create($conf->global->PRELEVEMENT_CODE_BANQUE,$conf->g
 
 
 $db->close();
+
+exit(0);
 ?>

test/phpunit/AllTests.php

@@ -159,6 +159,9 @@ class AllTests
         require_once dirname(__FILE__).'/ImportTest.php';
         $suite->addTestSuite('ImportTest');
 
+        require_once dirname(__FILE__).'/ScriptsTest.php';
+        $suite->addTestSuite('ScriptsTest');
+
         require_once dirname(__FILE__).'/ModulesTest.php';  // At end because it's the longer
         $suite->addTestSuite('ModulesTest');
 

test/phpunit/ScriptsTest.php

@@ -0,0 +1,178 @@
+<?php
+/* Copyright (C) 2013 Laurent Destailleur  <eldy@users.sourceforge.net>
+ *
+ * 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/>.
+ * or see http://www.gnu.org/
+ */
+
+/**
+ *      \file       test/phpunit/ScriptsTest.php
+ *		\ingroup    test
+ *      \brief      PHPUnit test
+ *		\remarks	To run this script as CLI:  phpunit filename.php
+ */
+
+global $conf,$user,$langs,$db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/security2.lib.php';
+
+if (! defined('NOREQUIREUSER'))  define('NOREQUIREUSER','1');
+if (! defined('NOREQUIREDB'))    define('NOREQUIREDB','1');
+if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
+if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');
+if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
+if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
+if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
+if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
+if (! defined("NOLOGIN"))        define("NOLOGIN",'1');       // If this page is public (can be called outside logged session)
+
+if (empty($user->id))
+{
+    print "Load permissions for admin user nb 1\n";
+    $user->fetch(1);
+    $user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS=1;
+
+
+/**
+ * Class for PHPUnit tests
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class ScriptsTest extends PHPUnit_Framework_TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return SecurityTest
+	 */
+	function __construct()
+	{
+		//$this->sharedFixture
+		global $conf,$user,$langs,$db;
+		$this->savconf=$conf;
+		$this->savuser=$user;
+		$this->savlangs=$langs;
+		$this->savdb=$db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	// Static methods
+  	public static function setUpBeforeClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->begin();	// This is to have all actions inside a transaction even if test launched without suite.
+
+    	print __METHOD__."\n";
+    }
+    public static function tearDownAfterClass()
+    {
+    	global $conf,$user,$langs,$db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * Init phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function setUp()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		print __METHOD__."\n";
+    }
+
+	/**
+	 * End phpunit tests
+	 *
+	 * @return	void
+	 */
+    protected function tearDown()
+    {
+    	print __METHOD__."\n";
+    }
+
+    /**
+     * testBank
+     *
+     * @return string
+     */
+    public function testBank()
+    {
+    	global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$script=dirname(__FILE__).'/../../scripts/bank/export-bank-receipts.php BANKDUMMY RECEIPTDUMMY excel2007 lang=fr_FR';
+		$result=exec($script, $output, $returnvar);
+
+		print __METHOD__." result=".$result."\n";
+		print __METHOD__." output=".join("\n",$output)."\n";
+		print __METHOD__." returnvar=".$returnvar."\n";
+		$this->assertEquals($result,'Failed to find bank account with ref BANKDUMMY.');
+		$this->assertEquals($returnvar,255);
+
+        return $result;
+    }
+
+    /**
+     * testInvoices
+     *
+     * @return string
+     */
+    public function testInvoices()
+    {
+    	global $conf,$user,$langs,$db;
+    	$conf=$this->savconf;
+    	$user=$this->savuser;
+    	$langs=$this->savlangs;
+    	$db=$this->savdb;
+
+    	$script=dirname(__FILE__).'/../../scripts/invoices/email_unpaid_invoices_to_customers.php test thirdparties';
+    	$result=exec($script, $output, $returnvar);
+
+    	print __METHOD__." result=".$result."\n";
+    	print __METHOD__." output=".join("\n",$output)."\n";
+    	print __METHOD__." returnvar=".$returnvar."\n";
+    	$this->assertEquals($returnvar,0);
+
+    	return $result;
+    }
+}
+?>