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

dev/initdata/initdemo.sh

@@ -1,13 +1,16 @@
 #!/bin/sh
 #------------------------------------------------------
 # Script to purge and init a database with demo values.
-# Note: "dialog" tool need to be available.
+# Note: "dialog" tool need to be available if no parameter provided.
+#
+# WARNING: This script erase all data of database
+# with data into dump file
 #
 # Regis Houssin       - regis@dolibarr.fr
 # Laurent Destailleur - eldy@users.sourceforge.net
 #------------------------------------------------------
-# WARNING: This script erase all data of database
+# Usage: initdemo.sh
-# with data into dump file
+# usage: initdemo.sh mysqldump_dolibarr_x.x.x.sql database port login pass
 #------------------------------------------------------
 
 
@@ -17,8 +20,6 @@ then
     export mydir="."
 fi
 export id=`id -u`;
-export dumpfile=`ls $mydir/mysqldump_dolibarr_*.sql | sort | tail -n 1`
-export dumpfile=`basename $dumpfile`
 
 
 # ----------------------------- check if root
@@ -28,6 +29,21 @@ then
 	exit
 fi
 
+
+# ----------------------------- command line params
+dumpfile=$1;
+base=$2;
+port=$3;
+admin=$4;
+passwd=$5;
+
+
+# ----------------------------- if no params on command line
+if [ "x$passwd" = "x" ]
+then
+	export dumpfile=`ls $mydir/mysqldump_dolibarr_*.sql | sort | tail -n 1`
+	export dumpfile=`basename $dumpfile`
+
 	# ----------------------------- input file
 	DIALOG=${DIALOG=dialog}
 	DIALOG="$DIALOG --ascii-lines"
@@ -145,6 +161,9 @@ case $? in
 	        255)    exit;;
 	esac
 
+fi
+
+
 # ---------------------------- run sql file
 if [ "x$passwd" != "x" ]
 then
@@ -154,6 +173,12 @@ fi
 #mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
 echo "mysql -P$port -u$admin -p***** $base < $mydir/$dumpfile"
 mysql -P$port -u$admin $passwd $base < $mydir/$dumpfile
+export res=$?
 
-echo "Dolibarr data demo has been loaded."
+if [ "x$res" = "x0" ]
+then
+	echo "Success, file successfully loaded."
+else
+	echo "Error, load failed."
+fi
 echo

htdocs/core/class/CSMSFile.class.php

@@ -1,7 +1,7 @@
 <?php
 /* Copyright (C) 2000-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
  * Copyright (C) 2003      Jean-Louis Bergamo   <jlb@j1b.org>
- * Copyright (C) 2004-2011 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2012 Laurent Destailleur  <eldy@users.sourceforge.net>
  * Copyright (C) 2005-2009 Regis Houssin        <regis@dolibarr.fr>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -28,22 +28,20 @@
  */
 
 /**
- *      \class      CSMSFile
+ *		Class to send SMS
- *      \brief      Class to send SMS
+ *      Usage: $smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
- *      \remarks    Usage: $smsfile = new CSMSFile($subject,$sendto,$replyto,$message,$filepath,$mimetype,$filename,$cc,$ccc,$deliveryreceipt,$msgishtml,$errors_to);
+ *             $smsfile->sendfile();
- *      \remarks           $smsfile->sendfile();
  */
 class CSMSFile
 {
     var $error='';
 
-    var $message;
 	var $addr_from;
 	var $addr_to;
-	var $deliveryreceipt;
 	var $deferred;
 	var $priority;
 	var $class;
+	var $message;
 
 
 	/**
@@ -52,7 +50,7 @@ class CSMSFile
 	 *	@param	string	$to                 Recipients SMS
 	 *	@param 	string	$from               Sender SMS
 	 *	@param 	string	$msg                Message
-	 *	@param 	int		$deliveryreceipt	Ask a delivery receipt
+	 *	@param 	int		$deliveryreceipt	Not used
 	 *	@param 	int		$deferred			Deferred or not
 	 *	@param 	int		$priority			Priority
 	 *	@param 	int		$class				Class
@@ -75,16 +73,15 @@ class CSMSFile
 		}
 
 		dol_syslog("CSMSFile::CSMSFile: MAIN_SMS_SENDMODE=".$conf->global->MAIN_SMS_SENDMODE." charset=".$conf->file->character_set_client." from=".$from.", to=".$to.", msg length=".count($msg), LOG_DEBUG);
-		dol_syslog("CSMSFile::CSMSFile: deliveryreceipt=".$deliveryreceipt." deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
+		dol_syslog("CSMSFile::CSMSFile: deferred=".$deferred." priority=".$priority." class=".$class, LOG_DEBUG);
 
 		// Action according to choosed sending method
 	    $this->addr_from=$from;
 	    $this->addr_to=$to;
-        $this->message=$msg;
-        $this->deliveryreceipt=$deliveryreceipt;
         $this->deferred=$deferred;
         $this->priority=$priority;
         $this->class=$class;
+        $this->message=$msg;
 	}
 
 
@@ -147,10 +144,10 @@ class CSMSFile
 		            $sms = new $classname($this->db);
 		            $sms->expe=$this->addr_from;
 		            $sms->dest=$this->addr_to;
-		            $sms->message=$this->message;
 		            $sms->deferred=$this->deferred;
 		            $sms->priority=$this->priority;
 		            $sms->class=$this->class;
+		            $sms->message=$this->message;
 
                     $res=$sms->SmsSend();
     				if ($res <= 0)
@@ -205,7 +202,12 @@ class CSMSFile
 			$outputfile=$dolibarr_main_data_root."/dolibarr_sms.log";
 			$fp = fopen($outputfile,"w");
 
-			fputs($fp, $this->message);
+			fputs($fp, "From: ".$this->addr_from."\n");
+			fputs($fp, "To: ".$this->addr_to."\n");
+			fputs($fp, "Priority: ".$this->priority."\n");
+			fputs($fp, "Class: ".$this->class."\n");
+			fputs($fp, "Deferred: ".$this->deferred."\n");
+			fputs($fp, "Message:\n".$this->message);
 
 			fclose($fp);
 			if (! empty($conf->global->MAIN_UMASK))