alxarafe / alixar

dolibarr/htdocs/core/class/utils.class.php

Indentation +915 added lines, -915 removed lines

@@ -27,857 +27,857 @@ 
  */
 class Utils
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 
-	var $output;   // Used by Cron method to return message
-	var $result;   // Used by Cron method to return data
-
-	/**
-	 *	Constructor
-	 *
-	 *  @param	DoliDB	$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db = $db;
-	}
-
-
-	/**
-	 *  Purge files into directory of data files.
-	 *  CAN BE A CRON TASK
-	 *
-	 *  @param	string		$choice		Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile')
-	 *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	function purgeFiles($choice='tempfilesold')
-	{
-		global $conf, $langs, $dolibarr_main_data_root;
-
-		$langs->load("admin");
-
-		dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		$filesarray=array();
-		if (empty($choice)) $choice='tempfilesold';
-
-		if ($choice=='tempfiles' || $choice=='tempfilesold')
-		{
-			// Delete temporary files
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1);	// Do not follow symlinks
-				if ($choice == 'tempfilesold')
-				{
-					$now = dol_now();
-					foreach($filesarray as $key => $val)
-					{
-						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
-					}
-				}
-			}
-		}
-
-		if ($choice=='allfiles')
-		{
-			// Delete all files (except install.lock, do not follow symbolic links)
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
-			}
-		}
-
-		if ($choice=='logfile')
-		{
-			// Define files log
-			if ($dolibarr_main_data_root)
-			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
-			}
-
-			$filelog='';
-			if (! empty($conf->syslog->enabled))
-			{
-				$filelog=$conf->global->SYSLOG_FILE;
-				$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
-
-				$alreadyincluded=false;
-				foreach ($filesarray as $tmpcursor)
-				{
-					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
-				}
-				if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
-			}
-		}
-
-		$count=0;
-		$countdeleted=0;
-		$counterror=0;
-		if (count($filesarray))
-		{
-			foreach($filesarray as $key => $value)
-			{
-				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
-				if ($filesarray[$key]['type'] == 'dir')
-				{
-					$startcount=0;
-					$tmpcountdeleted=0;
-					$result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
-					$count+=$result;
-					$countdeleted+=$tmpcountdeleted;
-				}
-				elseif ($filesarray[$key]['type'] == 'file')
-				{
-					// If (file that is not logfile) or (if mode is logfile)
-					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
-					{
-						$result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
-						if ($result)
-						{
-							$count++;
-							$countdeleted++;
-						}
-						else
-						{
-							$counterror++;
-						}
-					}
-				}
-			}
-
-			// Update cachenbofdoc
-			if (! empty($conf->ecm->enabled) && $choice=='allfiles')
-			{
-				require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
-				$ecmdirstatic = new EcmDirectory($this->db);
-				$result = $ecmdirstatic->refreshcachenboffile(1);
-			}
-		}
-
-		if ($count > 0)
-		{
-			$this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
-			if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
-		}
-		else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
-
-		//return $count;
-		return 0;     // This function can be called by cron so must return 0 if OK
-	}
-
-
-	/**
-	 *  Make a backup of database
-	 *  CAN BE A CRON TASK
-	 *
-	 *  @param	string		$compression	   'gz' or 'bz' or 'none'
-	 *  @param  string      $type              'mysql', 'postgresql', ...
-	 *  @param  int         $usedefault        1=Use default backup profile (Set this to 1 when used as cron)
-	 *  @param  string      $file              'auto' or filename to build
-	 *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
-	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
-	 *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
-	 */
-	function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0, $execmethod=0)
-	{
-		global $db, $conf, $langs, $dolibarr_main_data_root;
-		global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
-
-		$langs->load("admin");
-
-		dol_syslog("Utils::dumpDatabase type=".$type." compression=".$compression." file=".$file, LOG_DEBUG);
-		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-		// Check compression parameter
-		if (! in_array($compression, array('none', 'gz', 'bz', 'zip')))
-		{
-			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
-			return -1;
-		}
-
-		// Check type parameter
-		if ($type == 'auto') $type = $db->type;
-		if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
-		{
-			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
-			return -1;
-		}
-
-		// Check file parameter
-		if ($file == 'auto')
-		{
-			$prefix='dump';
-			$ext='sql';
-			if (in_array($type, array('mysql', 'mysqli')))  { $prefix='mysqldump'; $ext='sql'; }
-			//if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
-			if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; }
-			$file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
-		}
-
-		$outputdir  = $conf->admin->dir_output.'/backup';
-		$result=dol_mkdir($outputdir);
-
-
-		// MYSQL
-		if ($type == 'mysql' || $type == 'mysqli')
-		{
-			$cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
-
-
-			$outputfile = $outputdir.'/'.$file;
-			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
-			$outputerror = $outputfile.'.err';
-			dol_mkdir($conf->admin->dir_output.'/backup');
-
-			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
-
-			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-			$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
-			$param.=" -u ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
-			if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
-			if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
-			if (GETPOST("drop_database"))        $param.=" --add-drop-database";
-			if (GETPOST("sql_structure") || $usedefault)
-			{
-				if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
-				else 							    $param.=" --add-drop-table=FALSE";
-			}
-			else
-			{
-				$param.=" -t";
-			}
-			if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
-			if (GETPOST("sql_data") || $usedefault)
-			{
-				$param.=" --tables";
-				if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
-				if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
-				else $param.=" --skip-extended-insert";
-				if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
-				if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
-				if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
-			}
-			else
-			{
-				$param.=" -d";    // No row information (no data)
-			}
-			$param.=" --default-character-set=utf8";    // We always save output into utf8 charset
-			$paramcrypted=$param;
-			$paramclear=$param;
-			if (! empty($dolibarr_main_db_pass))
-			{
-				$paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"';
-				$paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"';
-			}
-
-			$errormsg='';
-			$handle = '';
-
-			// Start call method to execute dump
-			$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
-			$fullcommandclear=$command." ".$paramclear." 2>&1";
-			if ($compression == 'none') $handle = fopen($outputfile, 'w');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
-
-			if ($handle)
-			{
-				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-				if (empty($execmethod)) $execmethod=1;
-
-				$ok=0;
-				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
-
-				// TODO Replace with executeCLI function
-				if ($execmethod == 1)
-				{
-					exec($fullcommandclear, $readt, $retval);
-					$result = $retval;
-
-					if ($retval != 0)
-					{
-						$langs->load("errors");
-						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
-						$error = 'Error '.$retval;
-						$ok=0;
-					}
-					else
-					{
-						$i=0;
-						if (!empty($readt))
-						foreach($readt as $key=>$read)
-						{
-							$i++;   // output line number
-							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-							fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
-						}
-					}
-				}
-				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
-				{
-					$handlein = popen($fullcommandclear, 'r');
-					$i=0;
-					while (!feof($handlein))
-					{
-						$i++;   // output line number
-						$read = fgets($handlein);
-						// Exclude warning line we don't want
-						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-						fwrite($handle,$read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
-					}
-					pclose($handlein);
-				}
-
-
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
-
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-			else
-			{
-				$langs->load("errors");
-				dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-				$errormsg=$langs->trans("ErrorFailedToWriteInDir");
-			}
-
-			// Get errorstring
-			if ($compression == 'none') $handle = fopen($outputfile, 'r');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
-			if ($handle)
-			{
-				// Get 2048 first chars of error message.
-				$errormsg = fgets($handle,2048);
-				// Close file
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
-				if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
-				else
-				{
-					// Renommer fichier sortie en fichier erreur
-					//print "$outputfile -> $outputerror";
-					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
-					@rename($outputfile,$outputerror);
-					// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
-					if (! $errormsg)
-					{
-						$langs->load("errors");
-						$errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
-					}
-				}
-			}
-			// Fin execution commande
-
-			$this->output = $errormsg;
-			$this->error = $errormsg;
-			$this->result = array("commandbackuplastdone" => $command." ".$paramcrypted, "commandbackuptorun" => "");
-			//if (empty($this->output)) $this->output=$this->result['commandbackuplastdone'];
-		}
-
-		// MYSQL NO BIN
-		if ($type == 'mysqlnobin')
-		{
-			$outputfile = $outputdir.'/'.$file;
-			$outputfiletemp = $outputfile.'-TMP.sql';
-			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
-			$outputerror = $outputfile.'.err';
-			dol_mkdir($conf->admin->dir_output.'/backup');
-
-			if ($compression == 'gz' or $compression == 'bz')
-			{
-				$this->backupTables($outputfiletemp);
-				dol_compress_file($outputfiletemp, $outputfile, $compression);
-				unlink($outputfiletemp);
-			}
-			else
-			{
-				$this->backupTables($outputfile);
-			}
-
-			$this->output = "";
-			$this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => "");
-		}
-
-		// POSTGRESQL
-		if ($type == 'postgresql' || $type == 'pgsql')
-		{
-			$cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
-
-			$outputfile = $outputdir.'/'.$file;
-			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
-			$outputerror = $outputfile.'.err';
-			dol_mkdir($conf->admin->dir_output.'/backup');
-
-			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
-
-			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-			//$param="-F c";
-			$param="-F p";
-			$param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
-			$param.=" -U ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
-			if (GETPOST("drop_database"))        $param.=" -c -C";
-			if (GETPOST("sql_structure"))
-			{
-				if (GETPOST("drop"))			 $param.=" --add-drop-table";
-				if (! GETPOST("sql_data"))       $param.=" -s";
-			}
-			if (GETPOST("sql_data"))
-			{
-				if (! GETPOST("sql_structure"))	 $param.=" -a";
-				if (GETPOST("showcolumns"))	     $param.=" -c";
-			}
-			$param.=' -f "'.$outputfile.'"';
-			//if ($compression == 'none')
-			if ($compression == 'gz')   $param.=' -Z 9';
-			//if ($compression == 'bz')
-			$paramcrypted=$param;
-			$paramclear=$param;
-			/*if (! empty($dolibarr_main_db_pass))
+    var $output;   // Used by Cron method to return message
+    var $result;   // Used by Cron method to return data
+
+    /**
+     *	Constructor
+     *
+     *  @param	DoliDB	$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db = $db;
+    }
+
+
+    /**
+     *  Purge files into directory of data files.
+     *  CAN BE A CRON TASK
+     *
+     *  @param	string		$choice		Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile')
+     *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+     */
+    function purgeFiles($choice='tempfilesold')
+    {
+        global $conf, $langs, $dolibarr_main_data_root;
+
+        $langs->load("admin");
+
+        dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        $filesarray=array();
+        if (empty($choice)) $choice='tempfilesold';
+
+        if ($choice=='tempfiles' || $choice=='tempfilesold')
+        {
+            // Delete temporary files
+            if ($dolibarr_main_data_root)
+            {
+                $filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1);	// Do not follow symlinks
+                if ($choice == 'tempfilesold')
+                {
+                    $now = dol_now();
+                    foreach($filesarray as $key => $val)
+                    {
+                        if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
+                    }
+                }
+            }
+        }
+
+        if ($choice=='allfiles')
+        {
+            // Delete all files (except install.lock, do not follow symbolic links)
+            if ($dolibarr_main_data_root)
+            {
+                $filesarray=dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+            }
+        }
+
+        if ($choice=='logfile')
+        {
+            // Define files log
+            if ($dolibarr_main_data_root)
+            {
+                $filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+            }
+
+            $filelog='';
+            if (! empty($conf->syslog->enabled))
+            {
+                $filelog=$conf->global->SYSLOG_FILE;
+                $filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
+
+                $alreadyincluded=false;
+                foreach ($filesarray as $tmpcursor)
+                {
+                    if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
+                }
+                if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+            }
+        }
+
+        $count=0;
+        $countdeleted=0;
+        $counterror=0;
+        if (count($filesarray))
+        {
+            foreach($filesarray as $key => $value)
+            {
+                //print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
+                if ($filesarray[$key]['type'] == 'dir')
+                {
+                    $startcount=0;
+                    $tmpcountdeleted=0;
+                    $result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
+                    $count+=$result;
+                    $countdeleted+=$tmpcountdeleted;
+                }
+                elseif ($filesarray[$key]['type'] == 'file')
+                {
+                    // If (file that is not logfile) or (if mode is logfile)
+                    if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
+                    {
+                        $result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
+                        if ($result)
+                        {
+                            $count++;
+                            $countdeleted++;
+                        }
+                        else
+                        {
+                            $counterror++;
+                        }
+                    }
+                }
+            }
+
+            // Update cachenbofdoc
+            if (! empty($conf->ecm->enabled) && $choice=='allfiles')
+            {
+                require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
+                $ecmdirstatic = new EcmDirectory($this->db);
+                $result = $ecmdirstatic->refreshcachenboffile(1);
+            }
+        }
+
+        if ($count > 0)
+        {
+            $this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
+            if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+        }
+        else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
+
+        //return $count;
+        return 0;     // This function can be called by cron so must return 0 if OK
+    }
+
+
+    /**
+     *  Make a backup of database
+     *  CAN BE A CRON TASK
+     *
+     *  @param	string		$compression	   'gz' or 'bz' or 'none'
+     *  @param  string      $type              'mysql', 'postgresql', ...
+     *  @param  int         $usedefault        1=Use default backup profile (Set this to 1 when used as cron)
+     *  @param  string      $file              'auto' or filename to build
+     *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
+     *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
+     *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
+     */
+    function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0, $execmethod=0)
+    {
+        global $db, $conf, $langs, $dolibarr_main_data_root;
+        global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
+
+        $langs->load("admin");
+
+        dol_syslog("Utils::dumpDatabase type=".$type." compression=".$compression." file=".$file, LOG_DEBUG);
+        require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+        // Check compression parameter
+        if (! in_array($compression, array('none', 'gz', 'bz', 'zip')))
+        {
+            $langs->load("errors");
+            $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
+            return -1;
+        }
+
+        // Check type parameter
+        if ($type == 'auto') $type = $db->type;
+        if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
+        {
+            $langs->load("errors");
+            $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
+            return -1;
+        }
+
+        // Check file parameter
+        if ($file == 'auto')
+        {
+            $prefix='dump';
+            $ext='sql';
+            if (in_array($type, array('mysql', 'mysqli')))  { $prefix='mysqldump'; $ext='sql'; }
+            //if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
+            if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; }
+            $file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
+        }
+
+        $outputdir  = $conf->admin->dir_output.'/backup';
+        $result=dol_mkdir($outputdir);
+
+
+        // MYSQL
+        if ($type == 'mysql' || $type == 'mysqli')
+        {
+            $cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
+
+
+            $outputfile = $outputdir.'/'.$file;
+            // for compression format, we add extension
+            $compression=$compression ? $compression : 'none';
+            if ($compression == 'gz') $outputfile.='.gz';
+            if ($compression == 'bz') $outputfile.='.bz2';
+            $outputerror = $outputfile.'.err';
+            dol_mkdir($conf->admin->dir_output.'/backup');
+
+            // Parameteres execution
+            $command=$cmddump;
+            if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+
+            //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
+            $param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
+            $param.=" -u ".$dolibarr_main_db_user;
+            if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
+            if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
+            if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
+            if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
+            if (GETPOST("drop_database"))        $param.=" --add-drop-database";
+            if (GETPOST("sql_structure") || $usedefault)
+            {
+                if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
+                else 							    $param.=" --add-drop-table=FALSE";
+            }
+            else
+            {
+                $param.=" -t";
+            }
+            if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
+            if (GETPOST("sql_data") || $usedefault)
+            {
+                $param.=" --tables";
+                if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
+                if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
+                else $param.=" --skip-extended-insert";
+                if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
+                if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
+                if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
+            }
+            else
+            {
+                $param.=" -d";    // No row information (no data)
+            }
+            $param.=" --default-character-set=utf8";    // We always save output into utf8 charset
+            $paramcrypted=$param;
+            $paramclear=$param;
+            if (! empty($dolibarr_main_db_pass))
+            {
+                $paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"';
+                $paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"';
+            }
+
+            $errormsg='';
+            $handle = '';
+
+            // Start call method to execute dump
+            $fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
+            $fullcommandclear=$command." ".$paramclear." 2>&1";
+            if ($compression == 'none') $handle = fopen($outputfile, 'w');
+            if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
+            if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
+
+            if ($handle)
+            {
+                if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+                if (empty($execmethod)) $execmethod=1;
+
+                $ok=0;
+                dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
+
+                // TODO Replace with executeCLI function
+                if ($execmethod == 1)
+                {
+                    exec($fullcommandclear, $readt, $retval);
+                    $result = $retval;
+
+                    if ($retval != 0)
+                    {
+                        $langs->load("errors");
+                        dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
+                        $error = 'Error '.$retval;
+                        $ok=0;
+                    }
+                    else
+                    {
+                        $i=0;
+                        if (!empty($readt))
+                        foreach($readt as $key=>$read)
+                        {
+                            $i++;   // output line number
+                            if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+                            fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
+                            if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+                            elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+                        }
+                    }
+                }
+                if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+                {
+                    $handlein = popen($fullcommandclear, 'r');
+                    $i=0;
+                    while (!feof($handlein))
+                    {
+                        $i++;   // output line number
+                        $read = fgets($handlein);
+                        // Exclude warning line we don't want
+                        if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+                        fwrite($handle,$read);
+                        if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
+                        elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+                    }
+                    pclose($handlein);
+                }
+
+
+                if ($compression == 'none') fclose($handle);
+                if ($compression == 'gz')   gzclose($handle);
+                if ($compression == 'bz')   bzclose($handle);
+
+                if (! empty($conf->global->MAIN_UMASK))
+                    @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+            }
+            else
+            {
+                $langs->load("errors");
+                dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+                $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+            }
+
+            // Get errorstring
+            if ($compression == 'none') $handle = fopen($outputfile, 'r');
+            if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
+            if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
+            if ($handle)
+            {
+                // Get 2048 first chars of error message.
+                $errormsg = fgets($handle,2048);
+                // Close file
+                if ($compression == 'none') fclose($handle);
+                if ($compression == 'gz')   gzclose($handle);
+                if ($compression == 'bz')   bzclose($handle);
+                if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
+                else
+                {
+                    // Renommer fichier sortie en fichier erreur
+                    //print "$outputfile -> $outputerror";
+                    @dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
+                    @rename($outputfile,$outputerror);
+                    // Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
+                    if (! $errormsg)
+                    {
+                        $langs->load("errors");
+                        $errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
+                    }
+                }
+            }
+            // Fin execution commande
+
+            $this->output = $errormsg;
+            $this->error = $errormsg;
+            $this->result = array("commandbackuplastdone" => $command." ".$paramcrypted, "commandbackuptorun" => "");
+            //if (empty($this->output)) $this->output=$this->result['commandbackuplastdone'];
+        }
+
+        // MYSQL NO BIN
+        if ($type == 'mysqlnobin')
+        {
+            $outputfile = $outputdir.'/'.$file;
+            $outputfiletemp = $outputfile.'-TMP.sql';
+            // for compression format, we add extension
+            $compression=$compression ? $compression : 'none';
+            if ($compression == 'gz') $outputfile.='.gz';
+            if ($compression == 'bz') $outputfile.='.bz2';
+            $outputerror = $outputfile.'.err';
+            dol_mkdir($conf->admin->dir_output.'/backup');
+
+            if ($compression == 'gz' or $compression == 'bz')
+            {
+                $this->backupTables($outputfiletemp);
+                dol_compress_file($outputfiletemp, $outputfile, $compression);
+                unlink($outputfiletemp);
+            }
+            else
+            {
+                $this->backupTables($outputfile);
+            }
+
+            $this->output = "";
+            $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => "");
+        }
+
+        // POSTGRESQL
+        if ($type == 'postgresql' || $type == 'pgsql')
+        {
+            $cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+
+            $outputfile = $outputdir.'/'.$file;
+            // for compression format, we add extension
+            $compression=$compression ? $compression : 'none';
+            if ($compression == 'gz') $outputfile.='.gz';
+            if ($compression == 'bz') $outputfile.='.bz2';
+            $outputerror = $outputfile.'.err';
+            dol_mkdir($conf->admin->dir_output.'/backup');
+
+            // Parameteres execution
+            $command=$cmddump;
+            if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+
+            //$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
+            //$param="-F c";
+            $param="-F p";
+            $param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
+            $param.=" -U ".$dolibarr_main_db_user;
+            if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
+            if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
+            if (GETPOST("drop_database"))        $param.=" -c -C";
+            if (GETPOST("sql_structure"))
+            {
+                if (GETPOST("drop"))			 $param.=" --add-drop-table";
+                if (! GETPOST("sql_data"))       $param.=" -s";
+            }
+            if (GETPOST("sql_data"))
+            {
+                if (! GETPOST("sql_structure"))	 $param.=" -a";
+                if (GETPOST("showcolumns"))	     $param.=" -c";
+            }
+            $param.=' -f "'.$outputfile.'"';
+            //if ($compression == 'none')
+            if ($compression == 'gz')   $param.=' -Z 9';
+            //if ($compression == 'bz')
+            $paramcrypted=$param;
+            $paramclear=$param;
+            /*if (! empty($dolibarr_main_db_pass))
 			 {
 			 $paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass);
 			 $paramclear.=" -W".$dolibarr_main_db_pass;
 			 }*/
-			$paramcrypted.=" -w ".$dolibarr_main_db_name;
-			$paramclear.=" -w ".$dolibarr_main_db_name;
-
-			$this->output = "";
-			$this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
-		}
-
-		// Clean old files
-		if ($keeplastnfiles > 0)
-		{
-			$tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
-			$i=0;
-			foreach($tmpfiles as $key => $val)
-			{
-				$i++;
-				if ($i <= $keeplastnfiles) continue;
-				dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);
-			}
-		}
-
-		return 0;
-	}
-
-
-
-	/**
-	 * Execute a CLI command.
-	 *
-	 * @param 	string	$command		Command line to execute.
-	 * @param 	string	$outputfile		Output file (used only when method is 2). For exemple $conf->admin->dir_temp.'/out.tmp';
-	 * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
-	 * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
-	 */
-	function executeCLI($command, $outputfile, $execmethod=0)
-	{
-		global $conf, $langs;
-
-		$result = 0;
-		$output = '';
-		$error = '';
-
-		$command=escapeshellcmd($command);
-		$command.=" 2>&1";
-
-		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-		if (empty($execmethod)) $execmethod=1;
-		//$execmethod=1;
-
-		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
-		$output_arr=array();
-
-		if ($execmethod == 1)
-		{
-			exec($command, $output_arr, $retval);
-			$result = $retval;
-			if ($retval != 0)
-			{
-				$langs->load("errors");
-				dol_syslog("Utils::executeCLI retval after exec=".$retval, LOG_ERR);
-				$error = 'Error '.$retval;
-			}
-		}
-		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
-		{
-			$ok=0;
-			$handle = fopen($outputfile, 'w+b');
-			if ($handle)
-			{
-				dol_syslog("Utils::executeCLI run command ".$command);
-				$handlein = popen($command, 'r');
-				while (!feof($handlein))
-				{
-					$read = fgets($handlein);
-					fwrite($handle,$read);
-					$output_arr[]=$read;
-				}
-				pclose($handlein);
-				fclose($handle);
-			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-		}
-
-		// Update with result
-		if (is_array($output_arr) && count($output_arr)>0)
-		{
-			foreach($output_arr as $val)
-			{
-				$output.=$val.($execmethod == 2 ? '' : "\n");
-			}
-		}
-
-		dol_syslog("Utils::executeCLI result=".$result." output=".$output." error=".$error, LOG_DEBUG);
-
-		return array('result'=>$result, 'output'=>$output, 'error'=>$error);
-	}
-
-	/**
-	 * Generate documentation of a Module
-	 *
-	 * @param 	string	$module		Module name
-	 * @return	int					<0 if KO, >0 if OK
-	 */
-	function generateDoc($module)
-	{
-		global $conf, $langs;
-		global $dirins;
-
-		$error = 0;
-
-		$modulelowercase=strtolower($module);
-
-		// Dir for module
-		$dir = $dirins.'/'.$modulelowercase;
-		// Zip file to build
-		$FILENAMEDOC='';
-
-		// Load module
-		dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-		$class='mod'.$module;
-
-		if (class_exists($class))
-		{
-			try {
-				$moduleobj = new $class($this->db);
-			}
-			catch(Exception $e)
-			{
-				$error++;
-				dol_print_error($e->getMessage());
-			}
-		}
-		else
-		{
-			$error++;
-			$langs->load("errors");
-			dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
-			exit;
-		}
-
-		$arrayversion=explode('.',$moduleobj->version,3);
-		if (count($arrayversion))
-		{
-			$FILENAMEASCII=strtolower($module).'.asciidoc';
-			$FILENAMEDOC=strtolower($module).'.html';			// TODO Use/text PDF
-
-			$dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
-			$dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp';
-			$outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
-			if ($dirofmodule)
-			{
-				if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
-				if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
-				if (! is_writable($dirofmoduletmp))
-				{
-					$this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
-					return -1;
-				}
-
-				$destfile=$dirofmoduletmp.'/'.$FILENAMEASCII;
-
-				$fhandle = fopen($destfile, 'w+');
-				if ($fhandle)
-				{
-					$specs=dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
-
-					$i = 0;
-					foreach ($specs as $spec)
-					{
-						if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
-						if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
-
-						$pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
-						$format='asciidoc';
-						if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
-
-						$filecursor = @file_get_contents($spec['fullname']);
-						if ($filecursor)
-						{
-							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
-						}
-						else
-						{
-							$this->error = 'Failed to concat content of file '.$spec['fullname'];
-							return -1;
-						}
-
-						$i++;
-					}
-
-					fwrite($fhandle, "\n\n\n== DATA SPECIFICATIONS...\n\n");
-
-					// TODO
-					fwrite($fhandle, "TODO...");
-
-					fclose($fhandle);
-				}
-
-				$conf->global->MODULEBUILDER_ASCIIDOCTOR='asciidoctor';
-				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR))
-				{
-					dol_print_error('', 'Module setup not complete');
-					exit;
-				}
-
-				$command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
-				$outfile=$dirofmoduletmp.'/out.tmp';
-
-				require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
-				$utils = new Utils($db);
-				$resarray = $utils->executeCLI($command, $outfile);
-				if ($resarray['result'] != '0')
-				{
-					$this->error = $resarray['error'].' '.$resarray['output'];
-				}
-				$result = ($resarray['result'] == 0) ? 1 : 0;
-			}
-			else
-			{
-				$result = 0;
-			}
-
-			if ($result > 0)
-			{
-				return 1;
-			}
-			else
-			{
-				$error++;
-				$langs->load("errors");
-				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
-			}
-		}
-		else
-		{
-			$error++;
-			$langs->load("errors");
-			$this->error = $langs->trans("ErrorCheckVersionIsDefined");
-		}
-
-		return -1;
-	}
-
-	/**
-	 * This saves syslog files and compresses older ones.
-	 * Nb of archive to keep is defined into $conf->global->SYSLOG_FILE_SAVES
-	 * CAN BE A CRON TASK
-	 *
-	 * @return	int						0 if OK, < 0 if KO
-	 */
+            $paramcrypted.=" -w ".$dolibarr_main_db_name;
+            $paramclear.=" -w ".$dolibarr_main_db_name;
+
+            $this->output = "";
+            $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
+        }
+
+        // Clean old files
+        if ($keeplastnfiles > 0)
+        {
+            $tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
+            $i=0;
+            foreach($tmpfiles as $key => $val)
+            {
+                $i++;
+                if ($i <= $keeplastnfiles) continue;
+                dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);
+            }
+        }
+
+        return 0;
+    }
+
+
+
+    /**
+     * Execute a CLI command.
+     *
+     * @param 	string	$command		Command line to execute.
+     * @param 	string	$outputfile		Output file (used only when method is 2). For exemple $conf->admin->dir_temp.'/out.tmp';
+     * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
+     * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
+     */
+    function executeCLI($command, $outputfile, $execmethod=0)
+    {
+        global $conf, $langs;
+
+        $result = 0;
+        $output = '';
+        $error = '';
+
+        $command=escapeshellcmd($command);
+        $command.=" 2>&1";
+
+        if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+        if (empty($execmethod)) $execmethod=1;
+        //$execmethod=1;
+
+        dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
+        $output_arr=array();
+
+        if ($execmethod == 1)
+        {
+            exec($command, $output_arr, $retval);
+            $result = $retval;
+            if ($retval != 0)
+            {
+                $langs->load("errors");
+                dol_syslog("Utils::executeCLI retval after exec=".$retval, LOG_ERR);
+                $error = 'Error '.$retval;
+            }
+        }
+        if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+        {
+            $ok=0;
+            $handle = fopen($outputfile, 'w+b');
+            if ($handle)
+            {
+                dol_syslog("Utils::executeCLI run command ".$command);
+                $handlein = popen($command, 'r');
+                while (!feof($handlein))
+                {
+                    $read = fgets($handlein);
+                    fwrite($handle,$read);
+                    $output_arr[]=$read;
+                }
+                pclose($handlein);
+                fclose($handle);
+            }
+            if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+        }
+
+        // Update with result
+        if (is_array($output_arr) && count($output_arr)>0)
+        {
+            foreach($output_arr as $val)
+            {
+                $output.=$val.($execmethod == 2 ? '' : "\n");
+            }
+        }
+
+        dol_syslog("Utils::executeCLI result=".$result." output=".$output." error=".$error, LOG_DEBUG);
+
+        return array('result'=>$result, 'output'=>$output, 'error'=>$error);
+    }
+
+    /**
+     * Generate documentation of a Module
+     *
+     * @param 	string	$module		Module name
+     * @return	int					<0 if KO, >0 if OK
+     */
+    function generateDoc($module)
+    {
+        global $conf, $langs;
+        global $dirins;
+
+        $error = 0;
+
+        $modulelowercase=strtolower($module);
+
+        // Dir for module
+        $dir = $dirins.'/'.$modulelowercase;
+        // Zip file to build
+        $FILENAMEDOC='';
+
+        // Load module
+        dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
+        $class='mod'.$module;
+
+        if (class_exists($class))
+        {
+            try {
+                $moduleobj = new $class($this->db);
+            }
+            catch(Exception $e)
+            {
+                $error++;
+                dol_print_error($e->getMessage());
+            }
+        }
+        else
+        {
+            $error++;
+            $langs->load("errors");
+            dol_print_error($langs->trans("ErrorFailedToLoadModuleDescriptorForXXX", $module));
+            exit;
+        }
+
+        $arrayversion=explode('.',$moduleobj->version,3);
+        if (count($arrayversion))
+        {
+            $FILENAMEASCII=strtolower($module).'.asciidoc';
+            $FILENAMEDOC=strtolower($module).'.html';			// TODO Use/text PDF
+
+            $dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
+            $dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp';
+            $outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
+            if ($dirofmodule)
+            {
+                if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
+                if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
+                if (! is_writable($dirofmoduletmp))
+                {
+                    $this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
+                    return -1;
+                }
+
+                $destfile=$dirofmoduletmp.'/'.$FILENAMEASCII;
+
+                $fhandle = fopen($destfile, 'w+');
+                if ($fhandle)
+                {
+                    $specs=dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
+
+                    $i = 0;
+                    foreach ($specs as $spec)
+                    {
+                        if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
+                        if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
+
+                        $pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
+                        $format='asciidoc';
+                        if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
+
+                        $filecursor = @file_get_contents($spec['fullname']);
+                        if ($filecursor)
+                        {
+                            fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
+                        }
+                        else
+                        {
+                            $this->error = 'Failed to concat content of file '.$spec['fullname'];
+                            return -1;
+                        }
+
+                        $i++;
+                    }
+
+                    fwrite($fhandle, "\n\n\n== DATA SPECIFICATIONS...\n\n");
+
+                    // TODO
+                    fwrite($fhandle, "TODO...");
+
+                    fclose($fhandle);
+                }
+
+                $conf->global->MODULEBUILDER_ASCIIDOCTOR='asciidoctor';
+                if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR))
+                {
+                    dol_print_error('', 'Module setup not complete');
+                    exit;
+                }
+
+                $command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
+                $outfile=$dirofmoduletmp.'/out.tmp';
+
+                require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
+                $utils = new Utils($db);
+                $resarray = $utils->executeCLI($command, $outfile);
+                if ($resarray['result'] != '0')
+                {
+                    $this->error = $resarray['error'].' '.$resarray['output'];
+                }
+                $result = ($resarray['result'] == 0) ? 1 : 0;
+            }
+            else
+            {
+                $result = 0;
+            }
+
+            if ($result > 0)
+            {
+                return 1;
+            }
+            else
+            {
+                $error++;
+                $langs->load("errors");
+                $this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
+            }
+        }
+        else
+        {
+            $error++;
+            $langs->load("errors");
+            $this->error = $langs->trans("ErrorCheckVersionIsDefined");
+        }
+
+        return -1;
+    }
+
+    /**
+     * This saves syslog files and compresses older ones.
+     * Nb of archive to keep is defined into $conf->global->SYSLOG_FILE_SAVES
+     * CAN BE A CRON TASK
+     *
+     * @return	int						0 if OK, < 0 if KO
+     */
     function compressSyslogs()
     {
-		global $conf;
+        global $conf;
+
+        if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
+            return 0;
+        }
+
+        if(! function_exists('gzopen')) {
+            $this->error = 'Support for gzopen not available in this PHP';
+            return -1;
+        }
+
+        dol_include_once('/core/lib/files.lib.php');
+
+        $nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+
+        if (empty($conf->global->SYSLOG_FILE)) {
+            $mainlogdir = DOL_DATA_ROOT;
+            $mainlog = 'dolibarr.log';
+        } else {
+            $mainlogfull = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
+            $mainlogdir = dirname($mainlogfull);
+            $mainlog = basename($mainlogfull);
+        }
+
+        $tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log
+        $tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir);
 
-		if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
-			return 0;
-		}
+        foreach($tabfiles as $file) {
 
-		if(! function_exists('gzopen')) {
-			$this->error = 'Support for gzopen not available in this PHP';
-			return -1;
-		}
+            $logname = $file['name'];
+            $logpath = $file['path'];
 
-		dol_include_once('/core/lib/files.lib.php');
+            if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty
+            {
+                // Handle already compressed files to rename them and add +1
 
-		$nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+                $filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
 
-		if (empty($conf->global->SYSLOG_FILE)) {
-			$mainlogdir = DOL_DATA_ROOT;
-			$mainlog = 'dolibarr.log';
-		} else {
-			$mainlogfull = str_replace('DOL_DATA_ROOT', DOL_DATA_ROOT, $conf->global->SYSLOG_FILE);
-			$mainlogdir = dirname($mainlogfull);
-			$mainlog = basename($mainlogfull);
-		}
+                $gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
+                $gzfiles = array();
 
-		$tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log
-		$tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir);
+                foreach($gzfilestmp as $gzfile) {
+                    $tabmatches = array();
+                    preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches);
 
-		foreach($tabfiles as $file) {
-
-			$logname = $file['name'];
-			$logpath = $file['path'];
-
-			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty
-			{
-				// Handle already compressed files to rename them and add +1
-
-				$filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
-
-				$gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
-				$gzfiles = array();
-
-				foreach($gzfilestmp as $gzfile) {
-					$tabmatches = array();
-					preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches);
-
-					$numsave = intval($tabmatches[1]);
-
-					$gzfiles[$numsave] = $gzfile;
-				}
-
-				krsort($gzfiles, SORT_NUMERIC);
-
-				foreach($gzfiles as $numsave => $dummy) {
-					if (dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) {
-						return -2;
-					}
-
-					if($numsave >= $nbSaves) {
-						dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz', 0, 0, 0, null, false, 0);
-					} else {
-						dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0);
-					}
-				}
-
-				// Compress current file and recreate it
-
-				if ($nbSaves > 0) {			// If $nbSaves is 1, we keep 1 archive .gz file, If 2, we keep 2 .gz files
-					$gzfilehandle = gzopen($logpath.'/'.$logname.'.1.gz', 'wb9');
-
-					if (empty($gzfilehandle)) {
-						$this->error = 'Failted to open file '.$logpath.'/'.$logname.'.1.gz';
-						return -3;
-					}
-
-					$sourcehandle = fopen($logpath.'/'.$logname, 'r');
-
-					if (empty($sourcehandle)) {
-						$this->error = 'Failed to open file '.$logpath.'/'.$logname;
-						return -4;
-					}
-
-					while(! feof($sourcehandle)) {
-						gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time
-					}
-
-					fclose($sourcehandle);
-					gzclose($gzfilehandle);
-
-					@chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-				}
-
-				dol_delete_file($logpath.'/'.$logname, 0, 0, 0, null, false, 0);
-
-				// Create empty file
-				$newlog = fopen($logpath.'/'.$logname, 'a+');
-				fclose($newlog);
-
-				//var_dump($logpath.'/'.$logname." - ".octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-				@chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-			}
-		}
-
-		$this->output = 'Archive log files (keeping last SYSLOG_FILE_SAVES='.$nbSaves.' files) done.';
-		return 0;
-	}
-
-	/**	Backup the db OR just a table without mysqldump binary, with PHP only (does not require any exec permission)
-	 *	Author: David Walsh (http://davidwalsh.name/backup-mysql-database-php)
-	 *	Updated and enhanced by Stephen Larroque (lrq3000) and by the many commentators from the blog
-	 *	Note about foreign keys constraints: for Dolibarr, since there are a lot of constraints and when imported the tables will be inserted in the dumped order, not in constraints order, then we ABSOLUTELY need to use SET FOREIGN_KEY_CHECKS=0; when importing the sql dump.
-	 *	Note2: db2SQL by Howard Yeend can be an alternative, by using SHOW FIELDS FROM and SHOW KEYS FROM we could generate a more precise dump (eg: by getting the type of the field and then precisely outputting the right formatting - in quotes, numeric or null - instead of trying to guess like we are doing now).
-	 *
-	 *	@param	string	$outputfile		Output file name
-	 *	@param	string	$tables			Table name or '*' for all
-	 *	@return	int						<0 if KO, >0 if OK
-	 */
-	function backupTables($outputfile, $tables='*')
-	{
-		global $db, $langs;
-		global $errormsg;
-
-		// Set to UTF-8
-		if (is_a($db, 'DoliDBMysqli')) {
-			/** @var DoliDBMysqli $db */
-			$db->db->set_charset('utf8');
-		} else {
-			/** @var DoliDB $db */
-			$db->query('SET NAMES utf8');
-			$db->query('SET CHARACTER SET utf8');
-		}
-
-		//get all of the tables
-		if ($tables == '*')
-		{
-			$tables = array();
-			$result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
-			while($row = $db->fetch_row($result))
-			{
-				$tables[] = $row[0];
-			}
-		}
-		else
-		{
-			$tables = is_array($tables) ? $tables : explode(',',$tables);
-		}
-
-		//cycle through
-		$handle = fopen($outputfile, 'w+');
-		if (fwrite($handle, '') === false)
-		{
-			$langs->load("errors");
-			dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-			$errormsg=$langs->trans("ErrorFailedToWriteInDir");
-			return -1;
-		}
-
-		// Print headers and global mysql config vars
-		$sqlhead = '';
-		$sqlhead .= "-- ".$db::LABEL." dump via php with Dolibarr ".DOL_VERSION."
+                    $numsave = intval($tabmatches[1]);
+
+                    $gzfiles[$numsave] = $gzfile;
+                }
+
+                krsort($gzfiles, SORT_NUMERIC);
+
+                foreach($gzfiles as $numsave => $dummy) {
+                    if (dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) {
+                        return -2;
+                    }
+
+                    if($numsave >= $nbSaves) {
+                        dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz', 0, 0, 0, null, false, 0);
+                    } else {
+                        dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0);
+                    }
+                }
+
+                // Compress current file and recreate it
+
+                if ($nbSaves > 0) {			// If $nbSaves is 1, we keep 1 archive .gz file, If 2, we keep 2 .gz files
+                    $gzfilehandle = gzopen($logpath.'/'.$logname.'.1.gz', 'wb9');
+
+                    if (empty($gzfilehandle)) {
+                        $this->error = 'Failted to open file '.$logpath.'/'.$logname.'.1.gz';
+                        return -3;
+                    }
+
+                    $sourcehandle = fopen($logpath.'/'.$logname, 'r');
+
+                    if (empty($sourcehandle)) {
+                        $this->error = 'Failed to open file '.$logpath.'/'.$logname;
+                        return -4;
+                    }
+
+                    while(! feof($sourcehandle)) {
+                        gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time
+                    }
+
+                    fclose($sourcehandle);
+                    gzclose($gzfilehandle);
+
+                    @chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+                }
+
+                dol_delete_file($logpath.'/'.$logname, 0, 0, 0, null, false, 0);
+
+                // Create empty file
+                $newlog = fopen($logpath.'/'.$logname, 'a+');
+                fclose($newlog);
+
+                //var_dump($logpath.'/'.$logname." - ".octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+                @chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+            }
+        }
+
+        $this->output = 'Archive log files (keeping last SYSLOG_FILE_SAVES='.$nbSaves.' files) done.';
+        return 0;
+    }
+
+    /**	Backup the db OR just a table without mysqldump binary, with PHP only (does not require any exec permission)
+     *	Author: David Walsh (http://davidwalsh.name/backup-mysql-database-php)
+     *	Updated and enhanced by Stephen Larroque (lrq3000) and by the many commentators from the blog
+     *	Note about foreign keys constraints: for Dolibarr, since there are a lot of constraints and when imported the tables will be inserted in the dumped order, not in constraints order, then we ABSOLUTELY need to use SET FOREIGN_KEY_CHECKS=0; when importing the sql dump.
+     *	Note2: db2SQL by Howard Yeend can be an alternative, by using SHOW FIELDS FROM and SHOW KEYS FROM we could generate a more precise dump (eg: by getting the type of the field and then precisely outputting the right formatting - in quotes, numeric or null - instead of trying to guess like we are doing now).
+     *
+     *	@param	string	$outputfile		Output file name
+     *	@param	string	$tables			Table name or '*' for all
+     *	@return	int						<0 if KO, >0 if OK
+     */
+    function backupTables($outputfile, $tables='*')
+    {
+        global $db, $langs;
+        global $errormsg;
+
+        // Set to UTF-8
+        if (is_a($db, 'DoliDBMysqli')) {
+            /** @var DoliDBMysqli $db */
+            $db->db->set_charset('utf8');
+        } else {
+            /** @var DoliDB $db */
+            $db->query('SET NAMES utf8');
+            $db->query('SET CHARACTER SET utf8');
+        }
+
+        //get all of the tables
+        if ($tables == '*')
+        {
+            $tables = array();
+            $result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
+            while($row = $db->fetch_row($result))
+            {
+                $tables[] = $row[0];
+            }
+        }
+        else
+        {
+            $tables = is_array($tables) ? $tables : explode(',',$tables);
+        }
+
+        //cycle through
+        $handle = fopen($outputfile, 'w+');
+        if (fwrite($handle, '') === false)
+        {
+            $langs->load("errors");
+            dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
+            $errormsg=$langs->trans("ErrorFailedToWriteInDir");
+            return -1;
+        }
+
+        // Print headers and global mysql config vars
+        $sqlhead = '';
+        $sqlhead .= "-- ".$db::LABEL." dump via php with Dolibarr ".DOL_VERSION."
 --
 -- Host: ".$db->db->host_info."    Database: ".$db->database_name."
 -- ------------------------------------------------------
@@ -896,77 +896,77 @@ 
 
 ";
 
-		if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
-		//$sqlhead .= "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n";
-		if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
-
-		fwrite($handle, $sqlhead);
-
-		$ignore = '';
-		if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';
-		$delayed = '';
-		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
-
-		// Process each table and print their definition + their datas
-		foreach($tables as $table)
-		{
-			// Saving the table structure
-			fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
-
-			if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
-			fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
-			fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
-			$resqldrop=$db->query('SHOW CREATE TABLE '.$table);
-			$row2 = $db->fetch_row($resqldrop);
-			if (empty($row2[1]))
-			{
-				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
-			}
-			else
-			{
-				fwrite($handle,$row2[1].";\n");
-				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
-
-				// Dumping the data (locking the table and disabling the keys check while doing the process)
-				fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
-				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
-
-				$sql='SELECT * FROM '.$table;
-				$result = $db->query($sql);
-				while($row = $db->fetch_row($result))
-				{
-					// For each row of data we print a line of INSERT
-					fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
-					$columns = count($row);
-					for($j=0; $j<$columns; $j++) {
-						// Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier)
-						if ($row[$j] == null && !is_string($row[$j])) {
-							// IMPORTANT: if the field is NULL we set it NULL
-							$row[$j] = 'NULL';
-						} elseif(is_string($row[$j]) && $row[$j] == '') {
-							// if it's an empty string, we set it as an empty string
-							$row[$j] = "''";
-						} elseif(is_numeric($row[$j]) && !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
-							// if it's a number, we return it as-is
-							//	                    $row[$j] = $row[$j];
-						} else { // else for all other cases we escape the value and put quotes around
-							$row[$j] = addslashes($row[$j]);
-							$row[$j] = preg_replace("#\n#", "\\n", $row[$j]);
-							$row[$j] = "'".$row[$j]."'";
-						}
-					}
-					fwrite($handle,implode(',', $row).");\n");
-				}
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
-				fwrite($handle,"\n\n\n");
-			}
-		}
-
-		/* Backup Procedure structure*/
-		/*
+        if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+        //$sqlhead .= "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n";
+        if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+
+        fwrite($handle, $sqlhead);
+
+        $ignore = '';
+        if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';
+        $delayed = '';
+        if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
+
+        // Process each table and print their definition + their datas
+        foreach($tables as $table)
+        {
+            // Saving the table structure
+            fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
+
+            if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+            fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
+            fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
+            $resqldrop=$db->query('SHOW CREATE TABLE '.$table);
+            $row2 = $db->fetch_row($resqldrop);
+            if (empty($row2[1]))
+            {
+                fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
+            }
+            else
+            {
+                fwrite($handle,$row2[1].";\n");
+                //fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
+
+                // Dumping the data (locking the table and disabling the keys check while doing the process)
+                fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
+                if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
+                if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
+                else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+
+                $sql='SELECT * FROM '.$table;
+                $result = $db->query($sql);
+                while($row = $db->fetch_row($result))
+                {
+                    // For each row of data we print a line of INSERT
+                    fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
+                    $columns = count($row);
+                    for($j=0; $j<$columns; $j++) {
+                        // Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier)
+                        if ($row[$j] == null && !is_string($row[$j])) {
+                            // IMPORTANT: if the field is NULL we set it NULL
+                            $row[$j] = 'NULL';
+                        } elseif(is_string($row[$j]) && $row[$j] == '') {
+                            // if it's an empty string, we set it as an empty string
+                            $row[$j] = "''";
+                        } elseif(is_numeric($row[$j]) && !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
+                            // if it's a number, we return it as-is
+                            //	                    $row[$j] = $row[$j];
+                        } else { // else for all other cases we escape the value and put quotes around
+                            $row[$j] = addslashes($row[$j]);
+                            $row[$j] = preg_replace("#\n#", "\\n", $row[$j]);
+                            $row[$j] = "'".$row[$j]."'";
+                        }
+                    }
+                    fwrite($handle,implode(',', $row).");\n");
+                }
+                if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
+                if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
+                fwrite($handle,"\n\n\n");
+            }
+        }
+
+        /* Backup Procedure structure*/
+        /*
 		 $result = $db->query('SHOW PROCEDURE STATUS');
 		 if ($db->num_rows($result) > 0)
 		 {
@@ -982,17 +982,17 @@ 
 		 }
 		 }
 		 */
-		/* Backup Procedure structure*/
+        /* Backup Procedure structure*/
 
-		// Write the footer (restore the previous database settings)
-		$sqlfooter="\n\n";
-		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
-		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
-		$sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
-		fwrite($handle, $sqlfooter);
+        // Write the footer (restore the previous database settings)
+        $sqlfooter="\n\n";
+        if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
+        if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+        $sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
+        fwrite($handle, $sqlfooter);
 
-		fclose($handle);
+        fclose($handle);
 
-		return 1;
-	}
+        return 1;
+    }
 }

Spacing +196 added lines, -196 removed lines

@@ -32,8 +32,8 @@ 
      */
     public $db;
 
-	var $output;   // Used by Cron method to return message
-	var $result;   // Used by Cron method to return data
+	var $output; // Used by Cron method to return message
+	var $result; // Used by Cron method to return data
 
 	/**
 	 *	Constructor
@@ -53,7 +53,7 @@ 
 	 *  @param	string		$choice		Choice of purge mode ('tempfiles', '' or 'tempfilesold' to purge temp older than 24h, 'allfiles', 'logfile')
 	 *  @return	int						0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	function purgeFiles($choice='tempfilesold')
+	function purgeFiles($choice = 'tempfilesold')
 	{
 		global $conf, $langs, $dolibarr_main_data_root;
 
@@ -62,80 +62,80 @@ 
 		dol_syslog("Utils::purgeFiles choice=".$choice, LOG_DEBUG);
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-		$filesarray=array();
-		if (empty($choice)) $choice='tempfilesold';
+		$filesarray = array();
+		if (empty($choice)) $choice = 'tempfilesold';
 
-		if ($choice=='tempfiles' || $choice=='tempfilesold')
+		if ($choice == 'tempfiles' || $choice == 'tempfilesold')
 		{
 			// Delete temporary files
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1);	// Do not follow symlinks
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', 'name', SORT_ASC, 2, 0, '', 1); // Do not follow symlinks
 				if ($choice == 'tempfilesold')
 				{
 					$now = dol_now();
-					foreach($filesarray as $key => $val)
+					foreach ($filesarray as $key => $val)
 					{
-						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
+						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]); // Discard files not older than 24h
 					}
 				}
 			}
 		}
 
-		if ($choice=='allfiles')
+		if ($choice == 'allfiles')
 		{
 			// Delete all files (except install.lock, do not follow symbolic links)
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
 			}
 		}
 
-		if ($choice=='logfile')
+		if ($choice == 'logfile')
 		{
 			// Define files log
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*(\.gz)?$', 'install\.lock$', 'name', SORT_ASC, 0, 0, '', 1);
 			}
 
-			$filelog='';
-			if (! empty($conf->syslog->enabled))
+			$filelog = '';
+			if (!empty($conf->syslog->enabled))
 			{
-				$filelog=$conf->global->SYSLOG_FILE;
-				$filelog=preg_replace('/DOL_DATA_ROOT/i',DOL_DATA_ROOT,$filelog);
+				$filelog = $conf->global->SYSLOG_FILE;
+				$filelog = preg_replace('/DOL_DATA_ROOT/i', DOL_DATA_ROOT, $filelog);
 
-				$alreadyincluded=false;
+				$alreadyincluded = false;
 				foreach ($filesarray as $tmpcursor)
 				{
-					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
+					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded = true; }
 				}
-				if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				if (!$alreadyincluded) $filesarray[] = array('fullname'=>$filelog, 'type'=>'file');
 			}
 		}
 
-		$count=0;
-		$countdeleted=0;
-		$counterror=0;
+		$count = 0;
+		$countdeleted = 0;
+		$counterror = 0;
 		if (count($filesarray))
 		{
-			foreach($filesarray as $key => $value)
+			foreach ($filesarray as $key => $value)
 			{
 				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
 				if ($filesarray[$key]['type'] == 'dir')
 				{
-					$startcount=0;
-					$tmpcountdeleted=0;
-					$result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
-					$count+=$result;
-					$countdeleted+=$tmpcountdeleted;
+					$startcount = 0;
+					$tmpcountdeleted = 0;
+					$result = dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
+					$count += $result;
+					$countdeleted += $tmpcountdeleted;
 				}
 				elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if mode is logfile)
-					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
+					if ($filesarray[$key]['fullname'] != $filelog || $choice == 'logfile')
 					{
-						$result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
+						$result = dol_delete_file($filesarray[$key]['fullname'], 1, 1);
 						if ($result)
 						{
 							$count++;
@@ -150,7 +150,7 @@ 
 			}
 
 			// Update cachenbofdoc
-			if (! empty($conf->ecm->enabled) && $choice=='allfiles')
+			if (!empty($conf->ecm->enabled) && $choice == 'allfiles')
 			{
 				require_once DOL_DOCUMENT_ROOT.'/ecm/class/ecmdirectory.class.php';
 				$ecmdirstatic = new EcmDirectory($this->db);
@@ -160,13 +160,13 @@ 
 
 		if ($count > 0)
 		{
-			$this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
-			if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+			$this->output = $langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
+			if ($count > $countdeleted) $this->output .= '<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
 		}
-		else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
+		else $this->output = $langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)' : '');
 
 		//return $count;
-		return 0;     // This function can be called by cron so must return 0 if OK
+		return 0; // This function can be called by cron so must return 0 if OK
 	}
 
 
@@ -182,7 +182,7 @@ 
 	 *  @param	int		    $execmethod		   0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
 	 *  @return	int						       0 if OK, < 0 if KO (this function is used also by cron so only 0 is OK)
 	 */
-	function dumpDatabase($compression='none', $type='auto', $usedefault=1, $file='auto', $keeplastnfiles=0, $execmethod=0)
+	function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 0, $execmethod = 0)
 	{
 		global $db, $conf, $langs, $dolibarr_main_data_root;
 		global $dolibarr_main_db_name, $dolibarr_main_db_host, $dolibarr_main_db_user, $dolibarr_main_db_port, $dolibarr_main_db_pass;
@@ -193,112 +193,112 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		// Check compression parameter
-		if (! in_array($compression, array('none', 'gz', 'bz', 'zip')))
+		if (!in_array($compression, array('none', 'gz', 'bz', 'zip')))
 		{
 			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
+			$this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
 			return -1;
 		}
 
 		// Check type parameter
 		if ($type == 'auto') $type = $db->type;
-		if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
+		if (!in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
 		{
 			$langs->load("errors");
-			$this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
+			$this->error = $langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
 			return -1;
 		}
 
 		// Check file parameter
 		if ($file == 'auto')
 		{
-			$prefix='dump';
-			$ext='sql';
-			if (in_array($type, array('mysql', 'mysqli')))  { $prefix='mysqldump'; $ext='sql'; }
+			$prefix = 'dump';
+			$ext = 'sql';
+			if (in_array($type, array('mysql', 'mysqli'))) { $prefix = 'mysqldump'; $ext = 'sql'; }
 			//if ($label == 'PostgreSQL') { $prefix='pg_dump'; $ext='dump'; }
-			if (in_array($type, array('pgsql'))) { $prefix='pg_dump'; $ext='sql'; }
-			$file=$prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
+			if (in_array($type, array('pgsql'))) { $prefix = 'pg_dump'; $ext = 'sql'; }
+			$file = $prefix.'_'.$dolibarr_main_db_name.'_'.dol_sanitizeFileName(DOL_VERSION).'_'.strftime("%Y%m%d%H%M").'.'.$ext;
 		}
 
-		$outputdir  = $conf->admin->dir_output.'/backup';
-		$result=dol_mkdir($outputdir);
+		$outputdir = $conf->admin->dir_output.'/backup';
+		$result = dol_mkdir($outputdir);
 
 
 		// MYSQL
 		if ($type == 'mysql' || $type == 'mysqli')
 		{
-			$cmddump=$conf->global->SYSTEMTOOLS_MYSQLDUMP;
+			$cmddump = $conf->global->SYSTEMTOOLS_MYSQLDUMP;
 
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			$compression = $compression ? $compression : 'none';
+			if ($compression == 'gz') $outputfile .= '.gz';
+			if ($compression == 'bz') $outputfile .= '.bz2';
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			$command = $cmddump;
+			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
-			$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
-			$param.=" -u ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
-			if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
-			if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
-			if (GETPOST("drop_database"))        $param.=" --add-drop-database";
+			$param = $dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
+			$param .= " -u ".$dolibarr_main_db_user;
+			if (!empty($dolibarr_main_db_port)) $param .= " -P ".$dolibarr_main_db_port;
+			if (!GETPOST("use_transaction"))    $param .= " -l --single-transaction";
+			if (GETPOST("disable_fk") || $usedefault) $param .= " -K";
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param .= " --compatible=".escapeshellarg(GETPOST("sql_compat", "alpha"));
+			if (GETPOST("drop_database"))        $param .= " --add-drop-database";
 			if (GETPOST("sql_structure") || $usedefault)
 			{
-				if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
-				else 							    $param.=" --add-drop-table=FALSE";
+				if (GETPOST("drop") || $usedefault)	$param .= " --add-drop-table=TRUE";
+				else 							    $param .= " --add-drop-table=FALSE";
 			}
 			else
 			{
-				$param.=" -t";
+				$param .= " -t";
 			}
-			if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
+			if (GETPOST("disable-add-locks")) $param .= " --add-locks=FALSE";
 			if (GETPOST("sql_data") || $usedefault)
 			{
-				$param.=" --tables";
-				if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
-				if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
-				else $param.=" --skip-extended-insert";
-				if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
-				if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
-				if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
+				$param .= " --tables";
+				if (GETPOST("showcolumns") || $usedefault)	 $param .= " -c";
+				if (GETPOST("extended_ins") || $usedefault) $param .= " -e";
+				else $param .= " --skip-extended-insert";
+				if (GETPOST("delayed"))	 	 $param .= " --delayed-insert";
+				if (GETPOST("sql_ignore"))	 $param .= " --insert-ignore";
+				if (GETPOST("hexforbinary") || $usedefault) $param .= " --hex-blob";
 			}
 			else
 			{
-				$param.=" -d";    // No row information (no data)
+				$param .= " -d"; // No row information (no data)
 			}
-			$param.=" --default-character-set=utf8";    // We always save output into utf8 charset
-			$paramcrypted=$param;
-			$paramclear=$param;
-			if (! empty($dolibarr_main_db_pass))
+			$param .= " --default-character-set=utf8"; // We always save output into utf8 charset
+			$paramcrypted = $param;
+			$paramclear = $param;
+			if (!empty($dolibarr_main_db_pass))
 			{
-				$paramcrypted.=' -p"'.preg_replace('/./i','*',$dolibarr_main_db_pass).'"';
-				$paramclear.=' -p"'.str_replace(array('"','`'),array('\"','\`'),$dolibarr_main_db_pass).'"';
+				$paramcrypted .= ' -p"'.preg_replace('/./i', '*', $dolibarr_main_db_pass).'"';
+				$paramclear .= ' -p"'.str_replace(array('"', '`'), array('\"', '\`'), $dolibarr_main_db_pass).'"';
 			}
 
-			$errormsg='';
+			$errormsg = '';
 			$handle = '';
 
 			// Start call method to execute dump
-			$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
-			$fullcommandclear=$command." ".$paramclear." 2>&1";
+			$fullcommandcrypted = $command." ".$paramcrypted." 2>&1";
+			$fullcommandclear = $command." ".$paramclear." 2>&1";
 			if ($compression == 'none') $handle = fopen($outputfile, 'w');
 			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
 			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
 
 			if ($handle)
 			{
-				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-				if (empty($execmethod)) $execmethod=1;
+				if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+				if (empty($execmethod)) $execmethod = 1;
 
-				$ok=0;
+				$ok = 0;
 				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
 
 				// TODO Replace with executeCLI function
@@ -312,35 +312,35 @@ 
 						$langs->load("errors");
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$error = 'Error '.$retval;
-						$ok=0;
+						$ok = 0;
 					}
 					else
 					{
-						$i=0;
+						$i = 0;
 						if (!empty($readt))
-						foreach($readt as $key=>$read)
+						foreach ($readt as $key=>$read)
 						{
-							$i++;   // output line number
+							$i++; // output line number
 							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
 							fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+							if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;
+							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;
 						}
 					}
 				}
 				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
 				{
 					$handlein = popen($fullcommandclear, 'r');
-					$i=0;
+					$i = 0;
 					while (!feof($handlein))
 					{
-						$i++;   // output line number
+						$i++; // output line number
 						$read = fgets($handlein);
 						// Exclude warning line we don't want
 						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
-						fwrite($handle,$read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+						fwrite($handle, $read);
+						if (preg_match('/'.preg_quote('-- Dump completed').'/i', $read)) $ok = 1;
+						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i', $read)) $ok = 1;
 					}
 					pclose($handlein);
 				}
@@ -350,14 +350,14 @@ 
 				if ($compression == 'gz')   gzclose($handle);
 				if ($compression == 'bz')   bzclose($handle);
 
-				if (! empty($conf->global->MAIN_UMASK))
+				if (!empty($conf->global->MAIN_UMASK))
 					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 			}
 			else
 			{
 				$langs->load("errors");
-				dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-				$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+				dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+				$errormsg = $langs->trans("ErrorFailedToWriteInDir");
 			}
 
 			// Get errorstring
@@ -367,23 +367,23 @@ 
 			if ($handle)
 			{
 				// Get 2048 first chars of error message.
-				$errormsg = fgets($handle,2048);
+				$errormsg = fgets($handle, 2048);
 				// Close file
 				if ($compression == 'none') fclose($handle);
 				if ($compression == 'gz')   gzclose($handle);
 				if ($compression == 'bz')   bzclose($handle);
-				if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
+				if ($ok && preg_match('/^-- MySql/i', $errormsg)) $errormsg = ''; // Pas erreur
 				else
 				{
 					// Renommer fichier sortie en fichier erreur
 					//print "$outputfile -> $outputerror";
 					@dol_delete_file($outputerror, 1, 0, 0, null, false, 0);
-					@rename($outputfile,$outputerror);
+					@rename($outputfile, $outputerror);
 					// Si safe_mode on et command hors du parametre exec, on a un fichier out vide donc errormsg vide
-					if (! $errormsg)
+					if (!$errormsg)
 					{
 						$langs->load("errors");
-						$errormsg=$langs->trans("ErrorFailedToRunExternalCommand");
+						$errormsg = $langs->trans("ErrorFailedToRunExternalCommand");
 					}
 				}
 			}
@@ -401,9 +401,9 @@ 
 			$outputfile = $outputdir.'/'.$file;
 			$outputfiletemp = $outputfile.'-TMP.sql';
 			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			$compression = $compression ? $compression : 'none';
+			if ($compression == 'gz') $outputfile .= '.gz';
+			if ($compression == 'bz') $outputfile .= '.bz2';
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
@@ -425,51 +425,51 @@ 
 		// POSTGRESQL
 		if ($type == 'postgresql' || $type == 'pgsql')
 		{
-			$cmddump=$conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
+			$cmddump = $conf->global->SYSTEMTOOLS_POSTGRESQLDUMP;
 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
-			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			$compression = $compression ? $compression : 'none';
+			if ($compression == 'gz') $outputfile .= '.gz';
+			if ($compression == 'bz') $outputfile .= '.bz2';
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
-			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			$command = $cmddump;
+			if (preg_match("/\s/", $command)) $command = escapeshellarg($command); // Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			//$param="-F c";
-			$param="-F p";
-			$param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
-			$param.=" -U ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
-			if (GETPOST("drop_database"))        $param.=" -c -C";
+			$param = "-F p";
+			$param .= " --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
+			$param .= " -U ".$dolibarr_main_db_user;
+			if (!empty($dolibarr_main_db_port)) $param .= " -p ".$dolibarr_main_db_port;
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param .= "  --disable-dollar-quoting";
+			if (GETPOST("drop_database"))        $param .= " -c -C";
 			if (GETPOST("sql_structure"))
 			{
-				if (GETPOST("drop"))			 $param.=" --add-drop-table";
-				if (! GETPOST("sql_data"))       $param.=" -s";
+				if (GETPOST("drop"))			 $param .= " --add-drop-table";
+				if (!GETPOST("sql_data"))       $param .= " -s";
 			}
 			if (GETPOST("sql_data"))
 			{
-				if (! GETPOST("sql_structure"))	 $param.=" -a";
-				if (GETPOST("showcolumns"))	     $param.=" -c";
+				if (!GETPOST("sql_structure"))	 $param .= " -a";
+				if (GETPOST("showcolumns"))	     $param .= " -c";
 			}
-			$param.=' -f "'.$outputfile.'"';
+			$param .= ' -f "'.$outputfile.'"';
 			//if ($compression == 'none')
-			if ($compression == 'gz')   $param.=' -Z 9';
+			if ($compression == 'gz')   $param .= ' -Z 9';
 			//if ($compression == 'bz')
-			$paramcrypted=$param;
-			$paramclear=$param;
+			$paramcrypted = $param;
+			$paramclear = $param;
 			/*if (! empty($dolibarr_main_db_pass))
 			 {
 			 $paramcrypted.=" -W".preg_replace('/./i','*',$dolibarr_main_db_pass);
 			 $paramclear.=" -W".$dolibarr_main_db_pass;
 			 }*/
-			$paramcrypted.=" -w ".$dolibarr_main_db_name;
-			$paramclear.=" -w ".$dolibarr_main_db_name;
+			$paramcrypted .= " -w ".$dolibarr_main_db_name;
+			$paramclear .= " -w ".$dolibarr_main_db_name;
 
 			$this->output = "";
 			$this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
@@ -479,8 +479,8 @@ 
 		if ($keeplastnfiles > 0)
 		{
 			$tmpfiles = dol_dir_list($conf->admin->dir_output.'/backup', 'files', 0, '', '(\.err|\.old|\.sav)$', 'date', SORT_DESC);
-			$i=0;
-			foreach($tmpfiles as $key => $val)
+			$i = 0;
+			foreach ($tmpfiles as $key => $val)
 			{
 				$i++;
 				if ($i <= $keeplastnfiles) continue;
@@ -501,7 +501,7 @@ 
 	 * @param	int		$execmethod		0=Use default method (that is 1 by default), 1=Use the PHP 'exec', 2=Use the 'popen' method
 	 * @return	array					array('result'=>...,'output'=>...,'error'=>...). result = 0 means OK.
 	 */
-	function executeCLI($command, $outputfile, $execmethod=0)
+	function executeCLI($command, $outputfile, $execmethod = 0)
 	{
 		global $conf, $langs;
 
@@ -509,15 +509,15 @@ 
 		$output = '';
 		$error = '';
 
-		$command=escapeshellcmd($command);
-		$command.=" 2>&1";
+		$command = escapeshellcmd($command);
+		$command .= " 2>&1";
 
-		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-		if (empty($execmethod)) $execmethod=1;
+		if (!empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod = $conf->global->MAIN_EXEC_USE_POPEN;
+		if (empty($execmethod)) $execmethod = 1;
 		//$execmethod=1;
 
 		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
-		$output_arr=array();
+		$output_arr = array();
 
 		if ($execmethod == 1)
 		{
@@ -532,7 +532,7 @@ 
 		}
 		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
 		{
-			$ok=0;
+			$ok = 0;
 			$handle = fopen($outputfile, 'w+b');
 			if ($handle)
 			{
@@ -541,21 +541,21 @@ 
 				while (!feof($handlein))
 				{
 					$read = fgets($handlein);
-					fwrite($handle,$read);
-					$output_arr[]=$read;
+					fwrite($handle, $read);
+					$output_arr[] = $read;
 				}
 				pclose($handlein);
 				fclose($handle);
 			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (!empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
 		}
 
 		// Update with result
-		if (is_array($output_arr) && count($output_arr)>0)
+		if (is_array($output_arr) && count($output_arr) > 0)
 		{
-			foreach($output_arr as $val)
+			foreach ($output_arr as $val)
 			{
-				$output.=$val.($execmethod == 2 ? '' : "\n");
+				$output .= $val.($execmethod == 2 ? '' : "\n");
 			}
 		}
 
@@ -577,23 +577,23 @@ 
 
 		$error = 0;
 
-		$modulelowercase=strtolower($module);
+		$modulelowercase = strtolower($module);
 
 		// Dir for module
 		$dir = $dirins.'/'.$modulelowercase;
 		// Zip file to build
-		$FILENAMEDOC='';
+		$FILENAMEDOC = '';
 
 		// Load module
 		dol_include_once($modulelowercase.'/core/modules/mod'.$module.'.class.php');
-		$class='mod'.$module;
+		$class = 'mod'.$module;
 
 		if (class_exists($class))
 		{
 			try {
 				$moduleobj = new $class($this->db);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				$error++;
 				dol_print_error($e->getMessage());
@@ -607,41 +607,41 @@ 
 			exit;
 		}
 
-		$arrayversion=explode('.',$moduleobj->version,3);
+		$arrayversion = explode('.', $moduleobj->version, 3);
 		if (count($arrayversion))
 		{
-			$FILENAMEASCII=strtolower($module).'.asciidoc';
-			$FILENAMEDOC=strtolower($module).'.html';			// TODO Use/text PDF
+			$FILENAMEASCII = strtolower($module).'.asciidoc';
+			$FILENAMEDOC = strtolower($module).'.html'; // TODO Use/text PDF
 
 			$dirofmodule = dol_buildpath(strtolower($module), 0).'/doc';
 			$dirofmoduletmp = dol_buildpath(strtolower($module), 0).'/doc/temp';
 			$outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
 			if ($dirofmodule)
 			{
-				if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
-				if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
-				if (! is_writable($dirofmoduletmp))
+				if (!dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
+				if (!dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
+				if (!is_writable($dirofmoduletmp))
 				{
 					$this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
 					return -1;
 				}
 
-				$destfile=$dirofmoduletmp.'/'.$FILENAMEASCII;
+				$destfile = $dirofmoduletmp.'/'.$FILENAMEASCII;
 
 				$fhandle = fopen($destfile, 'w+');
 				if ($fhandle)
 				{
-					$specs=dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
+					$specs = dol_dir_list(dol_buildpath(strtolower($module).'/doc', 0), 'files', 1, '(\.md|\.asciidoc)$', array('\/temp\/'));
 
 					$i = 0;
 					foreach ($specs as $spec)
 					{
-						if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
-						if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
+						if (preg_match('/notindoc/', $spec['relativename'])) continue; // Discard file
+						if (preg_match('/disabled/', $spec['relativename'])) continue; // Discard file
 
 						$pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
-						$format='asciidoc';
-						if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
+						$format = 'asciidoc';
+						if (preg_match('/\.md$/i', $spec['name'])) $format = 'markdown';
 
 						$filecursor = @file_get_contents($spec['fullname']);
 						if ($filecursor)
@@ -665,15 +665,15 @@ 
 					fclose($fhandle);
 				}
 
-				$conf->global->MODULEBUILDER_ASCIIDOCTOR='asciidoctor';
+				$conf->global->MODULEBUILDER_ASCIIDOCTOR = 'asciidoctor';
 				if (empty($conf->global->MODULEBUILDER_ASCIIDOCTOR))
 				{
 					dol_print_error('', 'Module setup not complete');
 					exit;
 				}
 
-				$command=$conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
-				$outfile=$dirofmoduletmp.'/out.tmp';
+				$command = $conf->global->MODULEBUILDER_ASCIIDOCTOR.' '.$destfile.' -n -o '.$dirofmodule.'/'.$FILENAMEDOC;
+				$outfile = $dirofmoduletmp.'/out.tmp';
 
 				require_once DOL_DOCUMENT_ROOT.'/core/class/utils.class.php';
 				$utils = new Utils($db);
@@ -721,18 +721,18 @@ 
     {
 		global $conf;
 
-		if(empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
+		if (empty($conf->loghandlers['mod_syslog_file'])) { // File Syslog disabled
 			return 0;
 		}
 
-		if(! function_exists('gzopen')) {
+		if (!function_exists('gzopen')) {
 			$this->error = 'Support for gzopen not available in this PHP';
 			return -1;
 		}
 
 		dol_include_once('/core/lib/files.lib.php');
 
-		$nbSaves = ! empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
+		$nbSaves = !empty($conf->global->SYSLOG_FILE_SAVES) ? intval($conf->global->SYSLOG_FILE_SAVES) : 14;
 
 		if (empty($conf->global->SYSLOG_FILE)) {
 			$mainlogdir = DOL_DATA_ROOT;
@@ -746,7 +746,7 @@ 
 		$tabfiles = dol_dir_list(DOL_DATA_ROOT, 'files', 0, '^(dolibarr_.+|odt2pdf)\.log$'); // Also handle other log files like dolibarr_install.log
 		$tabfiles[] = array('name' => $mainlog, 'path' => $mainlogdir);
 
-		foreach($tabfiles as $file) {
+		foreach ($tabfiles as $file) {
 
 			$logname = $file['name'];
 			$logpath = $file['path'];
@@ -760,7 +760,7 @@ 
 				$gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
 				$gzfiles = array();
 
-				foreach($gzfilestmp as $gzfile) {
+				foreach ($gzfilestmp as $gzfile) {
 					$tabmatches = array();
 					preg_match('/'.$filter.'/i', $gzfile['name'], $tabmatches);
 
@@ -771,15 +771,15 @@ 
 
 				krsort($gzfiles, SORT_NUMERIC);
 
-				foreach($gzfiles as $numsave => $dummy) {
-					if (dol_is_file($logpath.'/'.$logname.'.'.($numsave+1).'.gz')) {
+				foreach ($gzfiles as $numsave => $dummy) {
+					if (dol_is_file($logpath.'/'.$logname.'.'.($numsave + 1).'.gz')) {
 						return -2;
 					}
 
-					if($numsave >= $nbSaves) {
+					if ($numsave >= $nbSaves) {
 						dol_delete_file($logpath.'/'.$logname.'.'.$numsave.'.gz', 0, 0, 0, null, false, 0);
 					} else {
-						dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave+1).'.gz', 0, 1, 0, 0);
+						dol_move($logpath.'/'.$logname.'.'.$numsave.'.gz', $logpath.'/'.$logname.'.'.($numsave + 1).'.gz', 0, 1, 0, 0);
 					}
 				}
 
@@ -800,14 +800,14 @@ 
 						return -4;
 					}
 
-					while(! feof($sourcehandle)) {
+					while (!feof($sourcehandle)) {
 						gzwrite($gzfilehandle, fread($sourcehandle, 512 * 1024)); // Read 512 kB at a time
 					}
 
 					fclose($sourcehandle);
 					gzclose($gzfilehandle);
 
-					@chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+					@chmod($logpath.'/'.$logname.'.1.gz', octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));
 				}
 
 				dol_delete_file($logpath.'/'.$logname, 0, 0, 0, null, false, 0);
@@ -817,7 +817,7 @@ 
 				fclose($newlog);
 
 				//var_dump($logpath.'/'.$logname." - ".octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
-				@chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK)?'0664':$conf->global->MAIN_UMASK));
+				@chmod($logpath.'/'.$logname, octdec(empty($conf->global->MAIN_UMASK) ? '0664' : $conf->global->MAIN_UMASK));
 			}
 		}
 
@@ -835,7 +835,7 @@ 
 	 *	@param	string	$tables			Table name or '*' for all
 	 *	@return	int						<0 if KO, >0 if OK
 	 */
-	function backupTables($outputfile, $tables='*')
+	function backupTables($outputfile, $tables = '*')
 	{
 		global $db, $langs;
 		global $errormsg;
@@ -855,14 +855,14 @@ 
 		{
 			$tables = array();
 			$result = $db->query('SHOW FULL TABLES WHERE Table_type = \'BASE TABLE\'');
-			while($row = $db->fetch_row($result))
+			while ($row = $db->fetch_row($result))
 			{
 				$tables[] = $row[0];
 			}
 		}
 		else
 		{
-			$tables = is_array($tables) ? $tables : explode(',',$tables);
+			$tables = is_array($tables) ? $tables : explode(',', $tables);
 		}
 
 		//cycle through
@@ -870,8 +870,8 @@ 
 		if (fwrite($handle, '') === false)
 		{
 			$langs->load("errors");
-			dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
-			$errormsg=$langs->trans("ErrorFailedToWriteInDir");
+			dol_syslog("Failed to open file ".$outputfile, LOG_ERR);
+			$errormsg = $langs->trans("ErrorFailedToWriteInDir");
 			return -1;
 		}
 
@@ -908,15 +908,15 @@ 
 		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
 
 		// Process each table and print their definition + their datas
-		foreach($tables as $table)
+		foreach ($tables as $table)
 		{
 			// Saving the table structure
 			fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
 
-			if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
-			fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
-			fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
-			$resqldrop=$db->query('SHOW CREATE TABLE '.$table);
+			if (GETPOST("nobin_drop")) fwrite($handle, "DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+			fwrite($handle, "/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
+			fwrite($handle, "/*!40101 SET character_set_client = utf8 */;\n");
+			$resqldrop = $db->query('SHOW CREATE TABLE '.$table);
 			$row2 = $db->fetch_row($resqldrop);
 			if (empty($row2[1]))
 			{
@@ -924,7 +924,7 @@ 
 			}
 			else
 			{
-				fwrite($handle,$row2[1].";\n");
+				fwrite($handle, $row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
 				// Dumping the data (locking the table and disabling the keys check while doing the process)
@@ -933,22 +933,22 @@ 
 				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
 				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
 
-				$sql='SELECT * FROM '.$table;
+				$sql = 'SELECT * FROM '.$table;
 				$result = $db->query($sql);
-				while($row = $db->fetch_row($result))
+				while ($row = $db->fetch_row($result))
 				{
 					// For each row of data we print a line of INSERT
-					fwrite($handle,'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
+					fwrite($handle, 'INSERT '.$delayed.$ignore.'INTO `'.$table.'` VALUES (');
 					$columns = count($row);
-					for($j=0; $j<$columns; $j++) {
+					for ($j = 0; $j < $columns; $j++) {
 						// Processing each columns of the row to ensure that we correctly save the value (eg: add quotes for string - in fact we add quotes for everything, it's easier)
 						if ($row[$j] == null && !is_string($row[$j])) {
 							// IMPORTANT: if the field is NULL we set it NULL
 							$row[$j] = 'NULL';
-						} elseif(is_string($row[$j]) && $row[$j] == '') {
+						} elseif (is_string($row[$j]) && $row[$j] == '') {
 							// if it's an empty string, we set it as an empty string
 							$row[$j] = "''";
-						} elseif(is_numeric($row[$j]) && !strcmp($row[$j], $row[$j]+0) ) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
+						} elseif (is_numeric($row[$j]) && !strcmp($row[$j], $row[$j] + 0)) { // test if it's a numeric type and the numeric version ($nb+0) == string version (eg: if we have 01, it's probably not a number but rather a string, else it would not have any leading 0)
 							// if it's a number, we return it as-is
 							//	                    $row[$j] = $row[$j];
 						} else { // else for all other cases we escape the value and put quotes around
@@ -957,11 +957,11 @@ 
 							$row[$j] = "'".$row[$j]."'";
 						}
 					}
-					fwrite($handle,implode(',', $row).");\n");
+					fwrite($handle, implode(',', $row).");\n");
 				}
 				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
 				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
-				fwrite($handle,"\n\n\n");
+				fwrite($handle, "\n\n\n");
 			}
 		}
 
@@ -985,10 +985,10 @@ 
 		/* Backup Procedure structure*/
 
 		// Write the footer (restore the previous database settings)
-		$sqlfooter="\n\n";
+		$sqlfooter = "\n\n";
 		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
 		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
-		$sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
+		$sqlfooter .= "\n\n-- Dump completed on ".date('Y-m-d G-i-s');
 		fwrite($handle, $sqlfooter);
 
 		fclose($handle);

Braces +270 added lines, -116 removed lines

@@ -63,7 +63,9 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 		$filesarray=array();
-		if (empty($choice)) $choice='tempfilesold';
+		if (empty($choice)) {
+		    $choice='tempfilesold';
+		}
 
 		if ($choice=='tempfiles' || $choice=='tempfilesold')
 		{
@@ -76,7 +78,10 @@ 
 					$now = dol_now();
 					foreach($filesarray as $key => $val)
 					{
-						if ($val['date'] > ($now - (24 * 3600))) unset($filesarray[$key]);	// Discard files not older than 24h
+						if ($val['date'] > ($now - (24 * 3600))) {
+						    unset($filesarray[$key]);
+						}
+						// Discard files not older than 24h
 					}
 				}
 			}
@@ -110,7 +115,9 @@ 
 				{
 					if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
 				}
-				if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				if (! $alreadyincluded) {
+				    $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				}
 			}
 		}
 
@@ -129,8 +136,7 @@ 
 					$result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
 					$count+=$result;
 					$countdeleted+=$tmpcountdeleted;
-				}
-				elseif ($filesarray[$key]['type'] == 'file')
+				} elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if mode is logfile)
 					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
@@ -140,8 +146,7 @@ 
 						{
 							$count++;
 							$countdeleted++;
-						}
-						else
+						} else
 						{
 							$counterror++;
 						}
@@ -161,9 +166,12 @@ 
 		if ($count > 0)
 		{
 			$this->output=$langs->trans("PurgeNDirectoriesDeleted", $countdeleted);
-			if ($count > $countdeleted) $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+			if ($count > $countdeleted) {
+			    $this->output.='<br>'.$langs->trans("PurgeNDirectoriesFailed", ($count - $countdeleted));
+			}
+		} else {
+		    $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
 		}
-		else $this->output=$langs->trans("PurgeNothingToDelete").($choice == 'tempfilesold' ? ' (older than 24h)':'');
 
 		//return $count;
 		return 0;     // This function can be called by cron so must return 0 if OK
@@ -201,7 +209,9 @@ 
 		}
 
 		// Check type parameter
-		if ($type == 'auto') $type = $db->type;
+		if ($type == 'auto') {
+		    $type = $db->type;
+		}
 		if (! in_array($type, array('postgresql', 'pgsql', 'mysql', 'mysqli', 'mysqlnobin')))
 		{
 			$langs->load("errors");
@@ -233,44 +243,75 @@ 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
 			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			if ($compression == 'gz') {
+			    $outputfile.='.gz';
+			}
+			if ($compression == 'bz') {
+			    $outputfile.='.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
 			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			if (preg_match("/\s/",$command)) {
+			    $command=escapeshellarg($command);
+			}
+			// Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			$param=$dolibarr_main_db_name." -h ".$dolibarr_main_db_host;
 			$param.=" -u ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -P ".$dolibarr_main_db_port;
-			if (! GETPOST("use_transaction"))    $param.=" -l --single-transaction";
-			if (GETPOST("disable_fk") || $usedefault) $param.=" -K";
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
-			if (GETPOST("drop_database"))        $param.=" --add-drop-database";
+			if (! empty($dolibarr_main_db_port)) {
+			    $param.=" -P ".$dolibarr_main_db_port;
+			}
+			if (! GETPOST("use_transaction")) {
+			    $param.=" -l --single-transaction";
+			}
+			if (GETPOST("disable_fk") || $usedefault) {
+			    $param.=" -K";
+			}
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") != 'NONE') {
+			    $param.=" --compatible=".escapeshellarg(GETPOST("sql_compat","alpha"));
+			}
+			if (GETPOST("drop_database")) {
+			    $param.=" --add-drop-database";
+			}
 			if (GETPOST("sql_structure") || $usedefault)
 			{
-				if (GETPOST("drop") || $usedefault)	$param.=" --add-drop-table=TRUE";
-				else 							    $param.=" --add-drop-table=FALSE";
-			}
-			else
+				if (GETPOST("drop") || $usedefault) {
+				    $param.=" --add-drop-table=TRUE";
+				} else {
+				    $param.=" --add-drop-table=FALSE";
+				}
+			} else
 			{
 				$param.=" -t";
 			}
-			if (GETPOST("disable-add-locks")) $param.=" --add-locks=FALSE";
+			if (GETPOST("disable-add-locks")) {
+			    $param.=" --add-locks=FALSE";
+			}
 			if (GETPOST("sql_data") || $usedefault)
 			{
 				$param.=" --tables";
-				if (GETPOST("showcolumns") || $usedefault)	 $param.=" -c";
-				if (GETPOST("extended_ins") || $usedefault) $param.=" -e";
-				else $param.=" --skip-extended-insert";
-				if (GETPOST("delayed"))	 	 $param.=" --delayed-insert";
-				if (GETPOST("sql_ignore"))	 $param.=" --insert-ignore";
-				if (GETPOST("hexforbinary") || $usedefault) $param.=" --hex-blob";
-			}
-			else
+				if (GETPOST("showcolumns") || $usedefault) {
+				    $param.=" -c";
+				}
+				if (GETPOST("extended_ins") || $usedefault) {
+				    $param.=" -e";
+				} else {
+				    $param.=" --skip-extended-insert";
+				}
+				if (GETPOST("delayed")) {
+				    $param.=" --delayed-insert";
+				}
+				if (GETPOST("sql_ignore")) {
+				    $param.=" --insert-ignore";
+				}
+				if (GETPOST("hexforbinary") || $usedefault) {
+				    $param.=" --hex-blob";
+				}
+			} else
 			{
 				$param.=" -d";    // No row information (no data)
 			}
@@ -289,14 +330,24 @@ 
 			// Start call method to execute dump
 			$fullcommandcrypted=$command." ".$paramcrypted." 2>&1";
 			$fullcommandclear=$command." ".$paramclear." 2>&1";
-			if ($compression == 'none') $handle = fopen($outputfile, 'w');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'w');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'w');
+			if ($compression == 'none') {
+			    $handle = fopen($outputfile, 'w');
+			}
+			if ($compression == 'gz') {
+			    $handle = gzopen($outputfile, 'w');
+			}
+			if ($compression == 'bz') {
+			    $handle = bzopen($outputfile, 'w');
+			}
 
 			if ($handle)
 			{
-				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-				if (empty($execmethod)) $execmethod=1;
+				if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+				    $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+				}
+				if (empty($execmethod)) {
+				    $execmethod=1;
+				}
 
 				$ok=0;
 				dol_syslog("Utils::dumpDatabase execmethod=".$execmethod." command:".$fullcommandcrypted, LOG_DEBUG);
@@ -313,47 +364,66 @@ 
 						dol_syslog("Datadump retval after exec=".$retval, LOG_ERR);
 						$error = 'Error '.$retval;
 						$ok=0;
-					}
-					else
+					} else
 					{
 						$i=0;
-						if (!empty($readt))
-						foreach($readt as $key=>$read)
+						if (!empty($readt)) {
+												foreach($readt as $key=>$read)
 						{
-							$i++;   // output line number
-							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+							$i++;
+						}
+						// output line number
+							if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
+							    continue;
+							}
 							fwrite($handle, $read.($execmethod == 2 ? '' : "\n"));
-							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-							elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+							if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) {
+							    $ok=1;
+							} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) {
+							    $ok=1;
+							}
 						}
 					}
 				}
-				if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+				if ($execmethod == 2) {
+				    // With this method, there is no way to get the return code, only output
 				{
 					$handlein = popen($fullcommandclear, 'r');
+				}
 					$i=0;
 					while (!feof($handlein))
 					{
 						$i++;   // output line number
 						$read = fgets($handlein);
 						// Exclude warning line we don't want
-						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) continue;
+						if ($i == 1 && preg_match('/Warning.*Using a password/i', $read)) {
+						    continue;
+						}
 						fwrite($handle,$read);
-						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) $ok=1;
-						elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) $ok=1;
+						if (preg_match('/'.preg_quote('-- Dump completed').'/i',$read)) {
+						    $ok=1;
+						} elseif (preg_match('/'.preg_quote('SET SQL_NOTES=@OLD_SQL_NOTES').'/i',$read)) {
+						    $ok=1;
+						}
 					}
 					pclose($handlein);
 				}
 
 
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
+				if ($compression == 'none') {
+				    fclose($handle);
+				}
+				if ($compression == 'gz') {
+				    gzclose($handle);
+				}
+				if ($compression == 'bz') {
+				    bzclose($handle);
+				}
 
-				if (! empty($conf->global->MAIN_UMASK))
-					@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
-			}
-			else
+				if (! empty($conf->global->MAIN_UMASK)) {
+									@chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+				}
+			} else
 			{
 				$langs->load("errors");
 				dol_syslog("Failed to open file ".$outputfile,LOG_ERR);
@@ -361,18 +431,33 @@ 
 			}
 
 			// Get errorstring
-			if ($compression == 'none') $handle = fopen($outputfile, 'r');
-			if ($compression == 'gz')   $handle = gzopen($outputfile, 'r');
-			if ($compression == 'bz')   $handle = bzopen($outputfile, 'r');
+			if ($compression == 'none') {
+			    $handle = fopen($outputfile, 'r');
+			}
+			if ($compression == 'gz') {
+			    $handle = gzopen($outputfile, 'r');
+			}
+			if ($compression == 'bz') {
+			    $handle = bzopen($outputfile, 'r');
+			}
 			if ($handle)
 			{
 				// Get 2048 first chars of error message.
 				$errormsg = fgets($handle,2048);
 				// Close file
-				if ($compression == 'none') fclose($handle);
-				if ($compression == 'gz')   gzclose($handle);
-				if ($compression == 'bz')   bzclose($handle);
-				if ($ok && preg_match('/^-- MySql/i',$errormsg)) $errormsg='';	// Pas erreur
+				if ($compression == 'none') {
+				    fclose($handle);
+				}
+				if ($compression == 'gz') {
+				    gzclose($handle);
+				}
+				if ($compression == 'bz') {
+				    bzclose($handle);
+				}
+				if ($ok && preg_match('/^-- MySql/i',$errormsg)) {
+				    $errormsg='';
+				}
+				// Pas erreur
 				else
 				{
 					// Renommer fichier sortie en fichier erreur
@@ -402,8 +487,12 @@ 
 			$outputfiletemp = $outputfile.'-TMP.sql';
 			// for compression format, we add extension
 			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			if ($compression == 'gz') {
+			    $outputfile.='.gz';
+			}
+			if ($compression == 'bz') {
+			    $outputfile.='.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
@@ -412,8 +501,7 @@ 
 				$this->backupTables($outputfiletemp);
 				dol_compress_file($outputfiletemp, $outputfile, $compression);
 				unlink($outputfiletemp);
-			}
-			else
+			} else
 			{
 				$this->backupTables($outputfile);
 			}
@@ -430,36 +518,59 @@ 
 			$outputfile = $outputdir.'/'.$file;
 			// for compression format, we add extension
 			$compression=$compression ? $compression : 'none';
-			if ($compression == 'gz') $outputfile.='.gz';
-			if ($compression == 'bz') $outputfile.='.bz2';
+			if ($compression == 'gz') {
+			    $outputfile.='.gz';
+			}
+			if ($compression == 'bz') {
+			    $outputfile.='.bz2';
+			}
 			$outputerror = $outputfile.'.err';
 			dol_mkdir($conf->admin->dir_output.'/backup');
 
 			// Parameteres execution
 			$command=$cmddump;
-			if (preg_match("/\s/",$command)) $command=escapeshellarg($command);	// Use quotes on command
+			if (preg_match("/\s/",$command)) {
+			    $command=escapeshellarg($command);
+			}
+			// Use quotes on command
 
 			//$param=escapeshellarg($dolibarr_main_db_name)." -h ".escapeshellarg($dolibarr_main_db_host)." -u ".escapeshellarg($dolibarr_main_db_user)." -p".escapeshellarg($dolibarr_main_db_pass);
 			//$param="-F c";
 			$param="-F p";
 			$param.=" --no-tablespaces --inserts -h ".$dolibarr_main_db_host;
 			$param.=" -U ".$dolibarr_main_db_user;
-			if (! empty($dolibarr_main_db_port)) $param.=" -p ".$dolibarr_main_db_port;
-			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') $param.="  --disable-dollar-quoting";
-			if (GETPOST("drop_database"))        $param.=" -c -C";
+			if (! empty($dolibarr_main_db_port)) {
+			    $param.=" -p ".$dolibarr_main_db_port;
+			}
+			if (GETPOST("sql_compat") && GETPOST("sql_compat") == 'ANSI') {
+			    $param.="  --disable-dollar-quoting";
+			}
+			if (GETPOST("drop_database")) {
+			    $param.=" -c -C";
+			}
 			if (GETPOST("sql_structure"))
 			{
-				if (GETPOST("drop"))			 $param.=" --add-drop-table";
-				if (! GETPOST("sql_data"))       $param.=" -s";
+				if (GETPOST("drop")) {
+				    $param.=" --add-drop-table";
+				}
+				if (! GETPOST("sql_data")) {
+				    $param.=" -s";
+				}
 			}
 			if (GETPOST("sql_data"))
 			{
-				if (! GETPOST("sql_structure"))	 $param.=" -a";
-				if (GETPOST("showcolumns"))	     $param.=" -c";
+				if (! GETPOST("sql_structure")) {
+				    $param.=" -a";
+				}
+				if (GETPOST("showcolumns")) {
+				    $param.=" -c";
+				}
 			}
 			$param.=' -f "'.$outputfile.'"';
 			//if ($compression == 'none')
-			if ($compression == 'gz')   $param.=' -Z 9';
+			if ($compression == 'gz') {
+			    $param.=' -Z 9';
+			}
 			//if ($compression == 'bz')
 			$paramcrypted=$param;
 			$paramclear=$param;
@@ -483,7 +594,9 @@ 
 			foreach($tmpfiles as $key => $val)
 			{
 				$i++;
-				if ($i <= $keeplastnfiles) continue;
+				if ($i <= $keeplastnfiles) {
+				    continue;
+				}
 				dol_delete_file($val['fullname'], 0, 0, 0, null, false, 0);
 			}
 		}
@@ -512,8 +625,12 @@ 
 		$command=escapeshellcmd($command);
 		$command.=" 2>&1";
 
-		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
-		if (empty($execmethod)) $execmethod=1;
+		if (! empty($conf->global->MAIN_EXEC_USE_POPEN)) {
+		    $execmethod=$conf->global->MAIN_EXEC_USE_POPEN;
+		}
+		if (empty($execmethod)) {
+		    $execmethod=1;
+		}
 		//$execmethod=1;
 
 		dol_syslog("Utils::executeCLI execmethod=".$execmethod." system:".$command, LOG_DEBUG);
@@ -530,9 +647,11 @@ 
 				$error = 'Error '.$retval;
 			}
 		}
-		if ($execmethod == 2)	// With this method, there is no way to get the return code, only output
+		if ($execmethod == 2) {
+		    // With this method, there is no way to get the return code, only output
 		{
 			$ok=0;
+		}
 			$handle = fopen($outputfile, 'w+b');
 			if ($handle)
 			{
@@ -547,7 +666,9 @@ 
 				pclose($handlein);
 				fclose($handle);
 			}
-			if (! empty($conf->global->MAIN_UMASK)) @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+			    @chmod($outputfile, octdec($conf->global->MAIN_UMASK));
+			}
 		}
 
 		// Update with result
@@ -592,14 +713,12 @@ 
 		{
 			try {
 				$moduleobj = new $class($this->db);
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$error++;
 				dol_print_error($e->getMessage());
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$langs->load("errors");
@@ -618,8 +737,12 @@ 
 			$outputfiledoc = $dirofmodule.'/'.$FILENAMEDOC;
 			if ($dirofmodule)
 			{
-				if (! dol_is_dir($dirofmodule)) dol_mkdir($dirofmodule);
-				if (! dol_is_dir($dirofmoduletmp)) dol_mkdir($dirofmoduletmp);
+				if (! dol_is_dir($dirofmodule)) {
+				    dol_mkdir($dirofmodule);
+				}
+				if (! dol_is_dir($dirofmoduletmp)) {
+				    dol_mkdir($dirofmoduletmp);
+				}
 				if (! is_writable($dirofmoduletmp))
 				{
 					$this->error = 'Dir '.$dirofmoduletmp.' does not exists or is not writable';
@@ -636,19 +759,26 @@ 
 					$i = 0;
 					foreach ($specs as $spec)
 					{
-						if (preg_match('/notindoc/', $spec['relativename'])) continue;	// Discard file
-						if (preg_match('/disabled/', $spec['relativename'])) continue;	// Discard file
+						if (preg_match('/notindoc/', $spec['relativename'])) {
+						    continue;
+						}
+						// Discard file
+						if (preg_match('/disabled/', $spec['relativename'])) {
+						    continue;
+						}
+						// Discard file
 
 						$pathtofile = strtolower($module).'/doc/'.$spec['relativename'];
 						$format='asciidoc';
-						if (preg_match('/\.md$/i', $spec['name'])) $format='markdown';
+						if (preg_match('/\.md$/i', $spec['name'])) {
+						    $format='markdown';
+						}
 
 						$filecursor = @file_get_contents($spec['fullname']);
 						if ($filecursor)
 						{
 							fwrite($fhandle, ($i ? "\n<<<\n\n" : "").$filecursor."\n");
-						}
-						else
+						} else
 						{
 							$this->error = 'Failed to concat content of file '.$spec['fullname'];
 							return -1;
@@ -683,8 +813,7 @@ 
 					$this->error = $resarray['error'].' '.$resarray['output'];
 				}
 				$result = ($resarray['result'] == 0) ? 1 : 0;
-			}
-			else
+			} else
 			{
 				$result = 0;
 			}
@@ -692,15 +821,13 @@ 
 			if ($result > 0)
 			{
 				return 1;
-			}
-			else
+			} else
 			{
 				$error++;
 				$langs->load("errors");
 				$this->error = $langs->trans("ErrorFailToGenerateFile", $outputfiledoc);
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$langs->load("errors");
@@ -751,11 +878,13 @@ 
 			$logname = $file['name'];
 			$logpath = $file['path'];
 
-			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0)	// If log file exists and is not empty
+			if (dol_is_file($logpath.'/'.$logname) && dol_filesize($logpath.'/'.$logname) > 0) {
+			    // If log file exists and is not empty
 			{
 				// Handle already compressed files to rename them and add +1
 
 				$filter = '^'.preg_quote($logname, '/').'\.([0-9]+)\.gz$';
+			}
 
 				$gzfilestmp = dol_dir_list($logpath, 'files', 0, $filter);
 				$gzfiles = array();
@@ -859,8 +988,7 @@ 
 			{
 				$tables[] = $row[0];
 			}
-		}
-		else
+		} else
 		{
 			$tables = is_array($tables) ? $tables : explode(',',$tables);
 		}
@@ -896,16 +1024,24 @@ 
 
 ";
 
-		if (GETPOST("nobin_disable_fk")) $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+		if (GETPOST("nobin_disable_fk")) {
+		    $sqlhead .= "SET FOREIGN_KEY_CHECKS=0;\n";
+		}
 		//$sqlhead .= "SET SQL_MODE=\"NO_AUTO_VALUE_ON_ZERO\";\n";
-		if (GETPOST("nobin_use_transaction")) $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+		if (GETPOST("nobin_use_transaction")) {
+		    $sqlhead .= "SET AUTOCOMMIT=0;\nSTART TRANSACTION;\n";
+		}
 
 		fwrite($handle, $sqlhead);
 
 		$ignore = '';
-		if (GETPOST("nobin_sql_ignore")) $ignore = 'IGNORE ';
+		if (GETPOST("nobin_sql_ignore")) {
+		    $ignore = 'IGNORE ';
+		}
 		$delayed = '';
-		if (GETPOST("nobin_delayed")) $delayed = 'DELAYED ';
+		if (GETPOST("nobin_delayed")) {
+		    $delayed = 'DELAYED ';
+		}
 
 		// Process each table and print their definition + their datas
 		foreach($tables as $table)
@@ -913,7 +1049,10 @@ 
 			// Saving the table structure
 			fwrite($handle, "\n--\n-- Table structure for table `".$table."`\n--\n");
 
-			if (GETPOST("nobin_drop")) fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n"); // Dropping table if exists prior to re create it
+			if (GETPOST("nobin_drop")) {
+			    fwrite($handle,"DROP TABLE IF EXISTS `".$table."`;\n");
+			}
+			// Dropping table if exists prior to re create it
 			fwrite($handle,"/*!40101 SET @saved_cs_client     = @@character_set_client */;\n");
 			fwrite($handle,"/*!40101 SET character_set_client = utf8 */;\n");
 			$resqldrop=$db->query('SHOW CREATE TABLE '.$table);
@@ -921,17 +1060,22 @@ 
 			if (empty($row2[1]))
 			{
 				fwrite($handle, "\n-- WARNING: Show create table ".$table." return empy string when it should not.\n");
-			}
-			else
+			} else
 			{
 				fwrite($handle,$row2[1].";\n");
 				//fwrite($handle,"/*!40101 SET character_set_client = @saved_cs_client */;\n\n");
 
 				// Dumping the data (locking the table and disabling the keys check while doing the process)
 				fwrite($handle, "\n--\n-- Dumping data for table `".$table."`\n--\n");
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n"); // Lock the table before inserting data (when the data will be imported back)
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
-				else fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+				if (!GETPOST("nobin_nolocks")) {
+				    fwrite($handle, "LOCK TABLES `".$table."` WRITE;\n");
+				}
+				// Lock the table before inserting data (when the data will be imported back)
+				if (GETPOST("nobin_disable_fk")) {
+				    fwrite($handle, "ALTER TABLE `".$table."` DISABLE KEYS;\n");
+				} else {
+				    fwrite($handle, "/*!40000 ALTER TABLE `".$table."` DISABLE KEYS */;\n");
+				}
 
 				$sql='SELECT * FROM '.$table;
 				$result = $db->query($sql);
@@ -959,8 +1103,14 @@ 
 					}
 					fwrite($handle,implode(',', $row).");\n");
 				}
-				if (GETPOST("nobin_disable_fk")) fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n"); // Enabling back the keys/index checking
-				if (!GETPOST("nobin_nolocks")) fwrite($handle, "UNLOCK TABLES;\n"); // Unlocking the table
+				if (GETPOST("nobin_disable_fk")) {
+				    fwrite($handle, "ALTER TABLE `".$table."` ENABLE KEYS;\n");
+				}
+				// Enabling back the keys/index checking
+				if (!GETPOST("nobin_nolocks")) {
+				    fwrite($handle, "UNLOCK TABLES;\n");
+				}
+				// Unlocking the table
 				fwrite($handle,"\n\n\n");
 			}
 		}
@@ -986,8 +1136,12 @@ 
 
 		// Write the footer (restore the previous database settings)
 		$sqlfooter="\n\n";
-		if (GETPOST("nobin_use_transaction")) $sqlfooter .= "COMMIT;\n";
-		if (GETPOST("nobin_disable_fk")) $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+		if (GETPOST("nobin_use_transaction")) {
+		    $sqlfooter .= "COMMIT;\n";
+		}
+		if (GETPOST("nobin_disable_fk")) {
+		    $sqlfooter .= "SET FOREIGN_KEY_CHECKS=1;\n";
+		}
 		$sqlfooter.="\n\n-- Dump completed on ".date('Y-m-d G-i-s');
 		fwrite($handle, $sqlfooter);
 

dolibarr/htdocs/core/class/html.formcontract.class.php

Indentation +124 added lines, -124 removed lines

@@ -33,9 +33,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -50,135 +50,135 @@ 
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Show a combo list with contracts qualified for a third party
-	 *
-	 *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
-	 *	@param  int		$selected   Id contract preselected
-	 *	@param  string	$htmlname   Nom de la zone html
-	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
-	 *	@return int         		Nbr of project if OK, <0 if KO
-	 */
-	function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
-	{
+    /**
+     *	Show a combo list with contracts qualified for a third party
+     *
+     *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
+     *	@param  int		$selected   Id contract preselected
+     *	@param  string	$htmlname   Nom de la zone html
+     *	@param	int		$maxlength	Maximum length of label
+     *	@param	int		$showempty	Show empty line
+     *	@return int         		Nbr of project if OK, <0 if KO
+     */
+    function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+    {
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+        global $db,$user,$conf,$langs;
 
-		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+        $hideunselectables = false;
+        if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
-		// Search all contacts
-		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'contrat as c';
-		$sql.= " WHERE c.entity = ".$conf->entity;
-		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
-		if ($socid > 0)
-		{
-			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
-			    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
-		    	else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
-			{
-		        	$sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
-				$sql.= " OR c.fk_soc IS NULL)";
-		    	}
-		}
-		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
-		$sql.= " ORDER BY c.ref ";
+        // Search all contacts
+        $sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
+        $sql.= ' FROM '.MAIN_DB_PREFIX .'contrat as c';
+        $sql.= " WHERE c.entity = ".$conf->entity;
+        //if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
+        if ($socid > 0)
+        {
+            // CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
+                if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
+                $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+                else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
+            {
+                    $sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
+                $sql.= " OR c.fk_soc IS NULL)";
+                }
+        }
+        if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+        $sql.= " ORDER BY c.ref ";
 
-		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
-		$resql=$db->query($sql);
-		if ($resql)
-		{
-			print '<select class="flat" name="'.$htmlname.'">';
-			if ($showempty) print '<option value="0">&nbsp;</option>';
-			$num = $db->num_rows($resql);
-			$i = 0;
-			if ($num)
-			{
-				while ($i < $num)
-				{
-					$obj = $db->fetch_object($resql);
-					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
-					{
-						// Do nothing
-					}
-					else
-					{
-						$labeltoshow=dol_trunc($obj->ref,18);
-						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
-						//else $labeltoshow.=' ('.$langs->trans("Private").')';
-						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
-						{
-							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
-						{
-							$disabled=0;
-							if ( $obj->statut ==  0)
-							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
-							}
-							if ( empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
-							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
-							}
+        dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
+        $resql=$db->query($sql);
+        if ($resql)
+        {
+            print '<select class="flat" name="'.$htmlname.'">';
+            if ($showempty) print '<option value="0">&nbsp;</option>';
+            $num = $db->num_rows($resql);
+            $i = 0;
+            if ($num)
+            {
+                while ($i < $num)
+                {
+                    $obj = $db->fetch_object($resql);
+                    // If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
+                    if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+                    {
+                        // Do nothing
+                    }
+                    else
+                    {
+                        $labeltoshow=dol_trunc($obj->ref,18);
+                        //if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
+                        //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                        if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
+                        {
+                            print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                        }
+                        else
+                        {
+                            $disabled=0;
+                            if ( $obj->statut ==  0)
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' ('.$langs->trans("Draft").')';
+                            }
+                            if ( empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+                            {
+                                $disabled=1;
+                                $labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+                            }
 
-							if ($hideunselectables && $disabled)
-							{
-								$resultat='';
-							}
-							else
-							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
-								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
-								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
-							}
-							print $resultat;
-						}
-					}
-					$i++;
-				}
-			}
-			print '</select>';
-			$db->free($resql);
+                            if ($hideunselectables && $disabled)
+                            {
+                                $resultat='';
+                            }
+                            else
+                            {
+                                $resultat='<option value="'.$obj->rowid.'"';
+                                if ($disabled) $resultat.=' disabled';
+                                //if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
+                                //else $labeltoshow.=' ('.$langs->trans("Private").')';
+                                $resultat.='>'.$labeltoshow;
+                                $resultat.='</option>';
+                            }
+                            print $resultat;
+                        }
+                    }
+                    $i++;
+                }
+            }
+            print '</select>';
+            $db->free($resql);
 
-			if (!empty($conf->use_javascript_ajax))
-			{
-				// Make select dynamic
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-				print ajax_combobox($htmlname);
-			}
+            if (!empty($conf->use_javascript_ajax))
+            {
+                // Make select dynamic
+                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+                print ajax_combobox($htmlname);
+            }
 
-			return $num;
-		}
-		else
-		{
-			dol_print_error($db);
-			return -1;
-		}
-	}
+            return $num;
+        }
+        else
+        {
+            dol_print_error($db);
+            return -1;
+        }
+    }
 
-	/**
-	 *	Show a form to select a contract
-	 *
-	 *  @param	int		$page       Page
-	 *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
-	 *	@param  int		$selected   Id contract preselected
-	 *	@param  string	$htmlname   Nom de la zone html
-	 *	@param	int		$maxlength	Maximum length of label
-	 *	@param	int		$showempty	Show empty line
-	 *	@return int                 Nbr of project if OK, <0 if KO
-	 */
-	function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
-	{
+    /**
+     *	Show a form to select a contract
+     *
+     *  @param	int		$page       Page
+     *	@param	int		$socid      Id third party (-1=all, 0=only contracts not linked to a third party, id=contracts not linked or linked to third party id)
+     *	@param  int		$selected   Id contract preselected
+     *	@param  string	$htmlname   Nom de la zone html
+     *	@param	int		$maxlength	Maximum length of label
+     *	@param	int		$showempty	Show empty line
+     *	@return int                 Nbr of project if OK, <0 if KO
+     */
+    function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+    {
         global $langs;
 
         print "\n";

Spacing +28 added lines, -28 removed lines

@@ -35,7 +35,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -60,35 +60,35 @@ 
 	 *	@param	int		$showempty	Show empty line
 	 *	@return int         		Nbr of project if OK, <0 if KO
 	 */
-	function select_contract($socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+	function select_contract($socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1)
 	{
         // phpcs:enable
-		global $db,$user,$conf,$langs;
+		global $db, $user, $conf, $langs;
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
 
 		// Search all contacts
 		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
-		$sql.= ' FROM '.MAIN_DB_PREFIX .'contrat as c';
-		$sql.= " WHERE c.entity = ".$conf->entity;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'contrat as c';
+		$sql .= " WHERE c.entity = ".$conf->entity;
 		//if ($contratListId) $sql.= " AND c.rowid IN (".$contratListId.")";
 		if ($socid > 0)
 		{
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
 		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
-			    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+			    $sql .= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
 		    	else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
 			{
-		        	$sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
-				$sql.= " OR c.fk_soc IS NULL)";
+		        	$sql .= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
+				$sql .= " OR c.fk_soc IS NULL)";
 		    	}
 		}
-		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
-		$sql.= " ORDER BY c.ref ";
+		if ($socid == 0) $sql .= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		$sql .= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
-		$resql=$db->query($sql);
+		$resql = $db->query($sql);
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
@@ -101,13 +101,13 @@ 
 				{
 					$obj = $db->fetch_object($resql);
 					// If we ask to filter on a company and user has no permission to see all companies and project is linked to another company, we hide project.
-					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
+					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && !$user->rights->societe->lire)
 					{
 						// Do nothing
 					}
 					else
 					{
-						$labeltoshow=dol_trunc($obj->ref,18);
+						$labeltoshow = dol_trunc($obj->ref, 18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
 						//else $labeltoshow.=' ('.$langs->trans("Private").')';
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
@@ -116,30 +116,30 @@ 
 						}
 						else
 						{
-							$disabled=0;
-							if ( $obj->statut ==  0)
+							$disabled = 0;
+							if ($obj->statut == 0)
 							{
-								$disabled=1;
-								$labeltoshow.=' ('.$langs->trans("Draft").')';
+								$disabled = 1;
+								$labeltoshow .= ' ('.$langs->trans("Draft").')';
 							}
-							if ( empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) &&  $socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY) && $socid > 0 && (!empty($obj->fk_soc) && $obj->fk_soc != $socid))
 							{
-								$disabled=1;
-								$labeltoshow.=' - '.$langs->trans("LinkedToAnotherCompany");
+								$disabled = 1;
+								$labeltoshow .= ' - '.$langs->trans("LinkedToAnotherCompany");
 							}
 
 							if ($hideunselectables && $disabled)
 							{
-								$resultat='';
+								$resultat = '';
 							}
 							else
 							{
-								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								$resultat = '<option value="'.$obj->rowid.'"';
+								if ($disabled) $resultat .= ' disabled';
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
-								$resultat.='>'.$labeltoshow;
-								$resultat.='</option>';
+								$resultat .= '>'.$labeltoshow;
+								$resultat .= '</option>';
 							}
 							print $resultat;
 						}
@@ -153,7 +153,7 @@ 
 			if (!empty($conf->use_javascript_ajax))
 			{
 				// Make select dynamic
-				include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
+				include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
 				print ajax_combobox($htmlname);
 			}
 
@@ -177,7 +177,7 @@ 
 	 *	@param	int		$showempty	Show empty line
 	 *	@return int                 Nbr of project if OK, <0 if KO
 	 */
-	function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
+	function formSelectContract($page, $socid = -1, $selected = '', $htmlname = 'contrattid', $maxlength = 16, $showempty = 1)
 	{
         global $langs;
 

Braces +19 added lines, -15 removed lines

@@ -66,7 +66,9 @@ 
 		global $db,$user,$conf,$langs;
 
 		$hideunselectables = false;
-		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->CONTRACT_HIDE_UNSELECTABLES)) {
+		    $hideunselectables = true;
+		}
 
 		// Search all contacts
 		$sql = 'SELECT c.rowid, c.ref, c.fk_soc, c.statut';
@@ -76,15 +78,17 @@ 
 		if ($socid > 0)
 		{
 			// CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY is 'all' or a list of ids separated by coma.
-		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY))
-			    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
-		    	else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
+		    	if (empty($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY)) {
+		    				    $sql.= " AND (c.fk_soc=".$socid." OR c.fk_soc IS NULL)";
+		    	} else if ($conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY != 'all')
 			{
 		        	$sql.= " AND (c.fk_soc IN (".$socid.", ".$conf->global->CONTRACT_ALLOW_TO_LINK_FROM_OTHER_COMPANY.") ";
 				$sql.= " OR c.fk_soc IS NULL)";
 		    	}
 		}
-		if ($socid == 0) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		if ($socid == 0) {
+		    $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
+		}
 		$sql.= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
@@ -92,7 +96,9 @@ 
 		if ($resql)
 		{
 			print '<select class="flat" name="'.$htmlname.'">';
-			if ($showempty) print '<option value="0">&nbsp;</option>';
+			if ($showempty) {
+			    print '<option value="0">&nbsp;</option>';
+			}
 			$num = $db->num_rows($resql);
 			$i = 0;
 			if ($num)
@@ -104,8 +110,7 @@ 
 					if ($socid > 0 && (empty($obj->fk_soc) || $obj->fk_soc == $socid) && ! $user->rights->societe->lire)
 					{
 						// Do nothing
-					}
-					else
+					} else
 					{
 						$labeltoshow=dol_trunc($obj->ref,18);
 						//if ($obj->public) $labeltoshow.=' ('.$langs->trans("SharedProject").')';
@@ -113,8 +118,7 @@ 
 						if (!empty($selected) && $selected == $obj->rowid && $obj->statut > 0)
 						{
 							print '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-						}
-						else
+						} else
 						{
 							$disabled=0;
 							if ( $obj->statut ==  0)
@@ -131,11 +135,12 @@ 
 							if ($hideunselectables && $disabled)
 							{
 								$resultat='';
-							}
-							else
+							} else
 							{
 								$resultat='<option value="'.$obj->rowid.'"';
-								if ($disabled) $resultat.=' disabled';
+								if ($disabled) {
+								    $resultat.=' disabled';
+								}
 								//if ($obj->public) $labeltoshow.=' ('.$langs->trans("Public").')';
 								//else $labeltoshow.=' ('.$langs->trans("Private").')';
 								$resultat.='>'.$labeltoshow;
@@ -158,8 +163,7 @@ 
 			}
 
 			return $num;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return -1;

dolibarr/htdocs/core/class/html.formmargin.class.php

Indentation +209 added lines, -209 removed lines

@@ -34,9 +34,9 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
     /**
@@ -51,234 +51,234 @@ 
 
 
 
-	/**
-	 *	get array with margin information from lines of object
-	 *  TODO Move this in common class.
-	 *
-	 * 	@param	CommonObject	$object			Object we want to get margin information for
-	 * 	@param 	boolean			$force_price	True of not
-	 * 	@return array							Array with info
-	 */
-	function getMarginInfosArray($object, $force_price=false)
-	{
-		global $conf, $db;
+    /**
+     *	get array with margin information from lines of object
+     *  TODO Move this in common class.
+     *
+     * 	@param	CommonObject	$object			Object we want to get margin information for
+     * 	@param 	boolean			$force_price	True of not
+     * 	@return array							Array with info
+     */
+    function getMarginInfosArray($object, $force_price=false)
+    {
+        global $conf, $db;
 
-		// Default returned array
-		$marginInfos = array(
-				'pa_products' => 0,
-				'pv_products' => 0,
-				'margin_on_products' => 0,
-				'margin_rate_products' => '',
-				'mark_rate_products' => '',
-				'pa_services' => 0,
-				'pv_services' => 0,
-				'margin_on_services' => 0,
-				'margin_rate_services' => '',
-				'mark_rate_services' => '',
-				'pa_total' => 0,
-				'pv_total' => 0,
-				'total_margin' => 0,
-				'total_margin_rate' => '',
-				'total_mark_rate' => ''
-		);
+        // Default returned array
+        $marginInfos = array(
+                'pa_products' => 0,
+                'pv_products' => 0,
+                'margin_on_products' => 0,
+                'margin_rate_products' => '',
+                'mark_rate_products' => '',
+                'pa_services' => 0,
+                'pv_services' => 0,
+                'margin_on_services' => 0,
+                'margin_rate_services' => '',
+                'mark_rate_services' => '',
+                'pa_total' => 0,
+                'pv_total' => 0,
+                'total_margin' => 0,
+                'total_margin_rate' => '',
+                'total_mark_rate' => ''
+        );
 
-		foreach($object->lines as $line)
-		{
-			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
-			{
-				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
-				$product = new ProductFournisseur($db);
-				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
-					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
-			}
-			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
-			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
-				$line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
-			}
+        foreach($object->lines as $line)
+        {
+            if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
+            {
+                require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
+                $product = new ProductFournisseur($db);
+                if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
+                    $line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+            }
+            // si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
+            if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
+                $line->pa_ht = $line->subprice * (1 - ($line->remise_percent / 100));
+            }
 
-			$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
-			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
-			$pa = $line->qty * $pa_ht;
+            $pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
+            $pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
+            $pa = $line->qty * $pa_ht;
 
-			// calcul des marges
-			if (isset($line->fk_remise_except) && isset($conf->global->MARGIN_METHODE_FOR_DISCOUNT)) {    // remise
-				if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
-					$marginInfos['pa_products'] += $pa;
-					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//{
-					//	$marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
-					//}
-					//else
-						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
-					$marginInfos['pa_services'] += $pa;
-					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
-					//else
-						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
-					$marginInfos['pa_total'] += $pa;
-					$marginInfos['pv_total'] += $pv;
-				}
-			}
-			else {
-				$type=$line->product_type?$line->product_type:$line->fk_product_type;
-				if ($type == 0) {  // product
-					$marginInfos['pa_products'] += $pa;
-					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//{
-					//    $marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
-					//}
-					//else
-					//{
-					    $marginInfos['margin_on_products'] += $pv - $pa;
-					//}
-				}
-				elseif ($type == 1) {  // service
-					$marginInfos['pa_services'] += $pa;
-					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
-					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-					//if ($pv < 0)
-					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
-					//else
-						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-			}
-		}
-		if ($marginInfos['pa_products'] > 0)
-			$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
-		if ($marginInfos['pv_products'] > 0)
-			$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+            // calcul des marges
+            if (isset($line->fk_remise_except) && isset($conf->global->MARGIN_METHODE_FOR_DISCOUNT)) {    // remise
+                if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
+                    $marginInfos['pa_products'] += $pa;
+                    $marginInfos['pv_products'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //{
+                    //	$marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
+                    //}
+                    //else
+                        $marginInfos['margin_on_products'] += $pv - $pa;
+                }
+                elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+                    $marginInfos['pa_services'] += $pa;
+                    $marginInfos['pv_services'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
+                    //else
+                        $marginInfos['margin_on_services'] += $pv - $pa;
+                }
+                elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+                    $marginInfos['pa_total'] += $pa;
+                    $marginInfos['pv_total'] += $pv;
+                }
+            }
+            else {
+                $type=$line->product_type?$line->product_type:$line->fk_product_type;
+                if ($type == 0) {  // product
+                    $marginInfos['pa_products'] += $pa;
+                    $marginInfos['pv_products'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //{
+                    //    $marginInfos['margin_on_products'] += -1 * (abs($pv) - $pa);
+                    //}
+                    //else
+                    //{
+                        $marginInfos['margin_on_products'] += $pv - $pa;
+                    //}
+                }
+                elseif ($type == 1) {  // service
+                    $marginInfos['pa_services'] += $pa;
+                    $marginInfos['pv_services'] += $pv;
+                    $marginInfos['pa_total'] +=  $pa;
+                    $marginInfos['pv_total'] +=  $pv;
+                    // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+                    //if ($pv < 0)
+                    //	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
+                    //else
+                        $marginInfos['margin_on_services'] += $pv - $pa;
+                }
+            }
+        }
+        if ($marginInfos['pa_products'] > 0)
+            $marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
+        if ($marginInfos['pv_products'] > 0)
+            $marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
 
-		if ($marginInfos['pa_services'] > 0)
-			$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
-		if ($marginInfos['pv_services'] > 0)
-			$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+        if ($marginInfos['pa_services'] > 0)
+            $marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
+        if ($marginInfos['pv_services'] > 0)
+            $marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
 
-		// if credit note, margin = -1 * (abs(selling_price) - buying_price)
-		//if ($marginInfos['pv_total'] < 0)
-		//	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
-		//else
-			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
-		if ($marginInfos['pa_total'] > 0)
-			$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
-		if ($marginInfos['pv_total'] > 0)
-			$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+        // if credit note, margin = -1 * (abs(selling_price) - buying_price)
+        //if ($marginInfos['pv_total'] < 0)
+        //	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
+        //else
+            $marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
+        if ($marginInfos['pa_total'] > 0)
+            $marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
+        if ($marginInfos['pv_total'] > 0)
+            $marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
 
-		return $marginInfos;
-	}
+        return $marginInfos;
+    }
 
-	/**
-	 * 	Show the array with all margin infos
-	 *
-	 *	@param	CommonObject	$object			Object we want to get margin information for
-	 * 	@param 	boolean			$force_price	Force price
-	 * 	@return	void
-	 */
-	function displayMarginInfos($object, $force_price=false)
-	{
-		global $langs, $conf, $user;
+    /**
+     * 	Show the array with all margin infos
+     *
+     *	@param	CommonObject	$object			Object we want to get margin information for
+     * 	@param 	boolean			$force_price	Force price
+     * 	@return	void
+     */
+    function displayMarginInfos($object, $force_price=false)
+    {
+        global $langs, $conf, $user;
 
-    	if (! empty($user->societe_id)) return;
+        if (! empty($user->societe_id)) return;
 
-    	if (! $user->rights->margins->liretous) return;
+        if (! $user->rights->margins->liretous) return;
 
         $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
-		$marginInfo = $this->getMarginInfosArray($object, $force_price);
+        $marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
-		{
-			print $langs->trans('ShowMarginInfos').' : ';
-	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
-	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
-	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
+        if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+        {
+            print $langs->trans('ShowMarginInfos').' : ';
+            $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
+            print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
+            print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
 
-    	    print '<script>$(document).ready(function() {
+            print '<script>$(document).ready(function() {
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
-		}
+            if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+        }
 
-		print '<div class="div-table-responsive-no-min">';
-		print '<!-- Margin table -->'."\n";
+        print '<div class="div-table-responsive-no-min">';
+        print '<!-- Margin table -->'."\n";
 
-		print '<table class="noborder margintable centpercent">';
-		print '<tr class="liste_titre">';
-		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
-		print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
-		if ($conf->global->MARGIN_TYPE == "1")
-			print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
-		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
-		if (! empty($conf->global->DISPLAY_MARK_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
-		print '</tr>';
+        print '<table class="noborder margintable centpercent">';
+        print '<tr class="liste_titre">';
+        print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
+        print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
+        if ($conf->global->MARGIN_TYPE == "1")
+            print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
+        else
+            print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+        print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
+        if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+            print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
+        if (! empty($conf->global->DISPLAY_MARK_RATES))
+            print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+        print '</tr>';
 
-		if (! empty($conf->product->enabled))
-		{
-			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
-			print '<tr class="oddeven">';
-			print '<td>'.$langs->trans('MarginOnProducts').'</td>';
-			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			print '</tr>';
-		}
+        if (! empty($conf->product->enabled))
+        {
+            //if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
+            print '<tr class="oddeven">';
+            print '<td>'.$langs->trans('MarginOnProducts').'</td>';
+            print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+            print '</tr>';
+        }
 
-		if (! empty($conf->service->enabled))
-		{
-			print '<tr class="oddeven">';
-			print '<td>'.$langs->trans('MarginOnServices').'</td>';
-			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			print '</tr>';
-		}
+        if (! empty($conf->service->enabled))
+        {
+            print '<tr class="oddeven">';
+            print '<td>'.$langs->trans('MarginOnServices').'</td>';
+            print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+            print '</tr>';
+        }
 
-		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
-		{
-			print '<tr class="liste_total">';
-			print '<td>'.$langs->trans('TotalMargin').'</td>';
-			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
-			print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
-			print '</tr>';
-		}
-		print '</table>';
-		print '</div>';
-	}
+        if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+        {
+            print '<tr class="liste_total">';
+            print '<td>'.$langs->trans('TotalMargin').'</td>';
+            print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
+            print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
+            if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+                print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+            if (! empty($conf->global->DISPLAY_MARK_RATES))
+                print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+            print '</tr>';
+        }
+        print '</table>';
+        print '</div>';
+    }
 }
 

Spacing +36 added lines, -36 removed lines

@@ -36,7 +36,7 @@ 
     /**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
     /**
@@ -59,7 +59,7 @@ 
 	 * 	@param 	boolean			$force_price	True of not
 	 * 	@return array							Array with info
 	 */
-	function getMarginInfosArray($object, $force_price=false)
+	function getMarginInfosArray($object, $force_price = false)
 	{
 		global $conf, $db;
 
@@ -82,7 +82,7 @@ 
 				'total_mark_rate' => ''
 		);
 
-		foreach($object->lines as $line)
+		foreach ($object->lines as $line)
 		{
 			if (empty($line->pa_ht) && isset($line->fk_fournprice) && !$force_price)
 			{
@@ -97,7 +97,7 @@ 
 			}
 
 			$pv = $line->qty * $line->subprice * (1 - $line->remise_percent / 100);
-			$pa_ht = ($pv < 0 ? - $line->pa_ht : $line->pa_ht);      // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
+			$pa_ht = ($pv < 0 ? -$line->pa_ht : $line->pa_ht); // We choosed to have line->pa_ht always positive in database, so we guess the correct sign
 			$pa = $line->qty * $pa_ht;
 
 			// calcul des marges
@@ -105,8 +105,8 @@ 
 				if ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '1') { // remise globale considérée comme produit
 					$marginInfos['pa_products'] += $pa;
 					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//{
@@ -118,8 +118,8 @@ 
 				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
@@ -132,12 +132,12 @@ 
 				}
 			}
 			else {
-				$type=$line->product_type?$line->product_type:$line->fk_product_type;
+				$type = $line->product_type ? $line->product_type : $line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
 					$marginInfos['pv_products'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//{
@@ -151,8 +151,8 @@ 
 				elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
-					$marginInfos['pa_total'] +=  $pa;
-					$marginInfos['pv_total'] +=  $pv;
+					$marginInfos['pa_total'] += $pa;
+					$marginInfos['pv_total'] += $pv;
 					// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 					//if ($pv < 0)
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
@@ -191,24 +191,24 @@ 
 	 * 	@param 	boolean			$force_price	Force price
 	 * 	@return	void
 	 */
-	function displayMarginInfos($object, $force_price=false)
+	function displayMarginInfos($object, $force_price = false)
 	{
 		global $langs, $conf, $user;
 
-    	if (! empty($user->societe_id)) return;
+    	if (!empty($user->societe_id)) return;
 
-    	if (! $user->rights->margins->liretous) return;
+    	if (!$user->rights->margins->liretous) return;
 
         $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+		if (!empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
 	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
-	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
-	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
+	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? '' : 'hideobject').'">'.img_picto($langs->trans("Disabled"), 'switch_off').'</span>';
+	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos) ? 'hideobject' : '').'">'.img_picto($langs->trans("Enabled"), 'switch_on').'</span>';
 
     	    print '<script>$(document).ready(function() {
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
@@ -229,13 +229,13 @@ 
 		else
 			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
 		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
+		if (!empty($conf->global->DISPLAY_MARGIN_RATES))
 			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
-		if (! empty($conf->global->DISPLAY_MARK_RATES))
+		if (!empty($conf->global->DISPLAY_MARK_RATES))
 			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
 		print '</tr>';
 
-		if (! empty($conf->product->enabled))
+		if (!empty($conf->product->enabled))
 		{
 			//if ($marginInfo['margin_on_products'] != 0 && $marginInfo['margin_on_services'] != 0) {
 			print '<tr class="oddeven">';
@@ -243,38 +243,38 @@ 
 			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '') ? '' : price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '') ? '' : price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
 			print '</tr>';
 		}
 
-		if (! empty($conf->service->enabled))
+		if (!empty($conf->service->enabled))
 		{
 			print '<tr class="oddeven">';
 			print '<td>'.$langs->trans('MarginOnServices').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '') ? '' : price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '') ? '' : price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
 			print '</tr>';
 		}
 
-		if (! empty($conf->product->enabled) && ! empty($conf->service->enabled))
+		if (!empty($conf->product->enabled) && !empty($conf->service->enabled))
 		{
 			print '<tr class="liste_total">';
 			print '<td>'.$langs->trans('TotalMargin').'</td>';
 			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARGIN_RATES))
+				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '') ? '' : price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+			if (!empty($conf->global->DISPLAY_MARK_RATES))
+				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '') ? '' : price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
 			print '</tr>';
 		}
 		print '</table>';

Braces +66 added lines, -46 removed lines

@@ -88,8 +88,9 @@ 
 			{
 				require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
 				$product = new ProductFournisseur($db);
-				if ($product->fetch_product_fournisseur_price($line->fk_fournprice))
-					$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+				if ($product->fetch_product_fournisseur_price($line->fk_fournprice)) {
+									$line->pa_ht = $product->fourn_unitprice * (1 - $product->fourn_remise_percent / 100);
+				}
 			}
 			// si prix d'achat non renseigné et devrait l'être, alors prix achat = prix vente
 			if ((!isset($line->pa_ht) || $line->pa_ht == 0) && $line->subprice > 0 && (isset($conf->global->ForceBuyingPriceIfNull) && $conf->global->ForceBuyingPriceIfNull == 1)) {
@@ -114,8 +115,7 @@ 
 					//}
 					//else
 						$marginInfos['margin_on_products'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '2') { // remise globale considérée comme service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] +=  $pa;
@@ -125,13 +125,11 @@ 
 					//	$marginInfos['margin_on_services'] += -1 * (abs($pv) - $pa);
 					//else
 						$marginInfos['margin_on_services'] += $pv - $pa;
-				}
-				elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
+				} elseif ($conf->global->MARGIN_METHODE_FOR_DISCOUNT == '3') { // remise globale prise en compte uniqt sur total
 					$marginInfos['pa_total'] += $pa;
 					$marginInfos['pv_total'] += $pv;
 				}
-			}
-			else {
+			} else {
 				$type=$line->product_type?$line->product_type:$line->fk_product_type;
 				if ($type == 0) {  // product
 					$marginInfos['pa_products'] += $pa;
@@ -147,8 +145,7 @@ 
 					//{
 					    $marginInfos['margin_on_products'] += $pv - $pa;
 					//}
-				}
-				elseif ($type == 1) {  // service
+				} elseif ($type == 1) {  // service
 					$marginInfos['pa_services'] += $pa;
 					$marginInfos['pv_services'] += $pv;
 					$marginInfos['pa_total'] +=  $pa;
@@ -161,25 +158,31 @@ 
 				}
 			}
 		}
-		if ($marginInfos['pa_products'] > 0)
-			$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
-		if ($marginInfos['pv_products'] > 0)
-			$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+		if ($marginInfos['pa_products'] > 0) {
+					$marginInfos['margin_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pa_products'];
+		}
+		if ($marginInfos['pv_products'] > 0) {
+					$marginInfos['mark_rate_products'] = 100 * $marginInfos['margin_on_products'] / $marginInfos['pv_products'];
+		}
 
-		if ($marginInfos['pa_services'] > 0)
-			$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
-		if ($marginInfos['pv_services'] > 0)
-			$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+		if ($marginInfos['pa_services'] > 0) {
+					$marginInfos['margin_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pa_services'];
+		}
+		if ($marginInfos['pv_services'] > 0) {
+					$marginInfos['mark_rate_services'] = 100 * $marginInfos['margin_on_services'] / $marginInfos['pv_services'];
+		}
 
 		// if credit note, margin = -1 * (abs(selling_price) - buying_price)
 		//if ($marginInfos['pv_total'] < 0)
 		//	$marginInfos['total_margin'] = -1 * (abs($marginInfos['pv_total']) - $marginInfos['pa_total']);
 		//else
 			$marginInfos['total_margin'] = $marginInfos['pv_total'] - $marginInfos['pa_total'];
-		if ($marginInfos['pa_total'] > 0)
-			$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
-		if ($marginInfos['pv_total'] > 0)
-			$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+		if ($marginInfos['pa_total'] > 0) {
+					$marginInfos['total_margin_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pa_total'];
+		}
+		if ($marginInfos['pv_total'] > 0) {
+					$marginInfos['total_mark_rate'] = 100 * $marginInfos['total_margin'] / $marginInfos['pv_total'];
+		}
 
 		return $marginInfos;
 	}
@@ -195,17 +198,23 @@ 
 	{
 		global $langs, $conf, $user;
 
-    	if (! empty($user->societe_id)) return;
+    	if (! empty($user->societe_id)) {
+    	    return;
+    	}
 
-    	if (! $user->rights->margins->liretous) return;
+    	if (! $user->rights->margins->liretous) {
+    	    return;
+    	}
 
         $rounding = min($conf->global->MAIN_MAX_DECIMALS_UNIT, $conf->global->MAIN_MAX_DECIMALS_TOT);
 
 		$marginInfo = $this->getMarginInfosArray($object, $force_price);
 
-		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON))	// TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
+		if (! empty($conf->global->MARGIN_ADD_SHOWHIDE_BUTTON)) {
+		    // TODO Warning this feature rely on an external js file that may be removed. Using native js function document.cookie should be better
 		{
 			print $langs->trans('ShowMarginInfos').' : ';
+		}
 	        $hidemargininfos = $_COOKIE['DOLUSER_MARGININFO_HIDE_SHOW'];
 	    	print '<span id="showMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'':'hideobject').'">'.img_picto($langs->trans("Disabled"),'switch_off').'</span>';
 	    	print '<span id="hideMarginInfos" class="linkobject '.(!empty($hidemargininfos)?'hideobject':'').'">'.img_picto($langs->trans("Enabled"),'switch_on').'</span>';
@@ -214,7 +223,9 @@ 
         	    $("span#showMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 0); $(".margininfos").show(); $("span#showMarginInfos").addClass("hideobject"); $("span#hideMarginInfos").removeClass("hideobject");})});
         	    $("span#hideMarginInfos").click(function() { $.getScript( "'.dol_buildpath('/includes/jquery/plugins/jquerytreeview/lib/jquery.cookie.js', 1).'", function( data, textStatus, jqxhr ) { $.cookie("DOLUSER_MARGININFO_HIDE_SHOW", 1); $(".margininfos").hide(); $("span#hideMarginInfos").addClass("hideobject"); $("span#showMarginInfos").removeClass("hideobject");})});
       	        });</script>';
-    	    if (!empty($hidemargininfos)) print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+    	    if (!empty($hidemargininfos)) {
+    	        print '<script>$(document).ready(function() {$(".margininfos").hide();});</script>';
+    	    }
 		}
 
 		print '<div class="div-table-responsive-no-min">';
@@ -224,15 +235,18 @@ 
 		print '<tr class="liste_titre">';
 		print '<td class="liste_titre">'.$langs->trans('Margins').'</td>';
 		print '<td class="liste_titre" align="right">'.$langs->trans('SellingPrice').'</td>';
-		if ($conf->global->MARGIN_TYPE == "1")
-			print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
-		else
-			print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+		if ($conf->global->MARGIN_TYPE == "1") {
+					print '<td class="liste_titre" align="right">'.$langs->trans('BuyingPrice').'</td>';
+		} else {
+					print '<td class="liste_titre" align="right">'.$langs->trans('CostPrice').'</td>';
+		}
 		print '<td class="liste_titre" align="right">'.$langs->trans('Margin').'</td>';
-		if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
-		if (! empty($conf->global->DISPLAY_MARK_RATES))
-			print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+		if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+					print '<td class="liste_titre" align="right">'.$langs->trans('MarginRate').'</td>';
+		}
+		if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+					print '<td class="liste_titre" align="right">'.$langs->trans('MarkRate').'</td>';
+		}
 		print '</tr>';
 
 		if (! empty($conf->product->enabled))
@@ -243,10 +257,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_products'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_products'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['margin_rate_products'] == '')?'':price($marginInfo['margin_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['mark_rate_products'] == '')?'':price($marginInfo['mark_rate_products'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
@@ -257,10 +273,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_services'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['margin_on_services'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['margin_rate_services'] == '')?'':price($marginInfo['margin_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['mark_rate_services'] == '')?'':price($marginInfo['mark_rate_services'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 
@@ -271,10 +289,12 @@ 
 			print '<td align="right">'.price($marginInfo['pv_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['pa_total'], null, null, null, null, $rounding).'</td>';
 			print '<td align="right">'.price($marginInfo['total_margin'], null, null, null, null, $rounding).'</td>';
-			if (! empty($conf->global->DISPLAY_MARGIN_RATES))
-				print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
-			if (! empty($conf->global->DISPLAY_MARK_RATES))
-				print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			if (! empty($conf->global->DISPLAY_MARGIN_RATES)) {
+							print '<td align="right">'.(($marginInfo['total_margin_rate'] == '')?'':price($marginInfo['total_margin_rate'], null, null, null, null, $rounding).'%').'</td>';
+			}
+			if (! empty($conf->global->DISPLAY_MARK_RATES)) {
+							print '<td align="right">'.(($marginInfo['total_mark_rate'] == '')?'':price($marginInfo['total_mark_rate'], null, null, null, null, $rounding).'%').'</td>';
+			}
 			print '</tr>';
 		}
 		print '</table>';

dolibarr/htdocs/core/class/html.formpropal.class.php

Indentation +20 added lines, -20 removed lines

@@ -27,26 +27,26 @@ 
  */
 class FormPropal
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     public $db;
 	
-	/**
-	 * @var string Error code (or message)
-	 */
-	public $error='';
+    /**
+     * @var string Error code (or message)
+     */
+    public $error='';
 
 
-	/**
-	 * Constructor
-	 *
-	 * @param		DoliDB		$db      Database handler
-	 */
-	public function __construct($db)
-	{
-		$this->db = $db;
-	}
+    /**
+     * Constructor
+     *
+     * @param		DoliDB		$db      Database handler
+     */
+    public function __construct($db)
+    {
+        $this->db = $db;
+    }
 
     /**
      *    Return combo list of differents status of a proposal
@@ -114,11 +114,11 @@ 
         {
             if ($excludedraft)
             {
-				if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
-				{
-					$i++;
-					continue;
-				}
+                if ($obj['code'] == 'Draft' || $obj['code'] == 'PR_DRAFT')
+                {
+                    $i++;
+                    continue;
+                }
             }
             if ($selected != '' && $selected == $obj['id'])
             {
@@ -134,7 +134,7 @@ 
                 print $langs->trans($prefix.$key.($short?'Short':''));
             }
             else
-			{
+            {
                 $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
                 if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
 

Spacing +16 added lines, -16 removed lines

@@ -35,7 +35,7 @@ 
 	/**
 	 * @var string Error code (or message)
 	 */
-	public $error='';
+	public $error = '';
 
 
 	/**
@@ -60,18 +60,18 @@ 
      *    @param    string  $htmlname       Name of select field
      *    @return	void
      */
-    function selectProposalStatus($selected='',$short=0, $excludedraft=0, $showempty=1, $mode='customer',$htmlname='propal_statut')
+    function selectProposalStatus($selected = '', $short = 0, $excludedraft = 0, $showempty = 1, $mode = 'customer', $htmlname = 'propal_statut')
     {
         global $langs;
 
-        $prefix='';
-        $listofstatus=array();
+        $prefix = '';
+        $listofstatus = array();
         if ($mode == 'supplier')
         {
-            $prefix='SupplierProposalStatus';
+            $prefix = 'SupplierProposalStatus';
 
             $langs->load("supplier_proposal");
-            $listofstatus=array(
+            $listofstatus = array(
                 0=>array('id'=>0, 'code'=>'PR_DRAFT'),
                 1=>array('id'=>1, 'code'=>'PR_OPEN'),
                 2=>array('id'=>2, 'code'=>'PR_SIGNED'),
@@ -81,12 +81,12 @@ 
         }
         else
         {
-            $prefix="PropalStatus";
+            $prefix = "PropalStatus";
 
             $sql = "SELECT id, code, label, active FROM ".MAIN_DB_PREFIX."c_propalst";
             $sql .= " WHERE active = 1";
             dol_syslog(get_class($this)."::selectProposalStatus", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $num = $this->db->num_rows($resql);
@@ -96,7 +96,7 @@ 
                     while ($i < $num)
                     {
                         $obj = $this->db->fetch_object($resql);
-                        $listofstatus[$obj->id]=array('id'=>$obj->id,'code'=>$obj->code,'label'=>$obj->label);
+                        $listofstatus[$obj->id] = array('id'=>$obj->id, 'code'=>$obj->code, 'label'=>$obj->label);
                         $i++;
                     }
                 }
@@ -110,7 +110,7 @@ 
         print '<select class="flat" name="'.$htmlname.'">';
         if ($showempty) print '<option value="-1">&nbsp;</option>';
 
-        foreach($listofstatus as $key => $obj)
+        foreach ($listofstatus as $key => $obj)
         {
             if ($excludedraft)
             {
@@ -128,17 +128,17 @@ 
             {
                 print '<option value="'.$obj['id'].'">';
             }
-            $key=$obj['code'];
-            if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
+            $key = $obj['code'];
+            if ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : ''))
             {
-                print $langs->trans($prefix.$key.($short?'Short':''));
+                print $langs->trans($prefix.$key.($short ? 'Short' : ''));
             }
             else
 			{
-                $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+                $conv_to_new_code = array('PR_DRAFT'=>'Draft', 'PR_OPEN'=>'Validated', 'PR_CLOSED'=>'Closed', 'PR_SIGNED'=>'Signed', 'PR_NOTSIGNED'=>'NotSigned', 'PR_FAC'=>'Billed');
+                if (!empty($conv_to_new_code[$obj['code']])) $key = $conv_to_new_code[$obj['code']];
 
-                print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
+                print ($langs->trans($prefix.$key.($short ? 'Short' : '')) != $prefix.$key.($short ? 'Short' : '')) ? $langs->trans($prefix.$key.($short ? 'Short' : '')) : ($obj['label'] ? $obj['label'] : $obj['code']);
             }
             print '</option>';
             $i++;

Braces +10 added lines, -10 removed lines

@@ -78,8 +78,7 @@ 
                 3=>array('id'=>3, 'code'=>'PR_NOTSIGNED'),
                 4=>array('id'=>4, 'code'=>'PR_CLOSED')
             );
-        }
-        else
+        } else
         {
             $prefix="PropalStatus";
 
@@ -100,15 +99,16 @@ 
                         $i++;
                     }
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
             }
         }
 
         print '<select class="flat" name="'.$htmlname.'">';
-        if ($showempty) print '<option value="-1">&nbsp;</option>';
+        if ($showempty) {
+            print '<option value="-1">&nbsp;</option>';
+        }
 
         foreach($listofstatus as $key => $obj)
         {
@@ -123,8 +123,7 @@ 
             if ($selected != '' && $selected == $obj['id'])
             {
                 print '<option value="'.$obj['id'].'" selected>';
-            }
-            else
+            } else
             {
                 print '<option value="'.$obj['id'].'">';
             }
@@ -132,11 +131,12 @@ 
             if ($langs->trans($prefix.$key.($short?'Short':'')) != $prefix.$key.($short?'Short':''))
             {
                 print $langs->trans($prefix.$key.($short?'Short':''));
-            }
-            else
+            } else
 			{
                 $conv_to_new_code=array('PR_DRAFT'=>'Draft','PR_OPEN'=>'Validated','PR_CLOSED'=>'Closed','PR_SIGNED'=>'Signed','PR_NOTSIGNED'=>'NotSigned','PR_FAC'=>'Billed');
-                if (! empty($conv_to_new_code[$obj['code']])) $key=$conv_to_new_code[$obj['code']];
+                if (! empty($conv_to_new_code[$obj['code']])) {
+                    $key=$conv_to_new_code[$obj['code']];
+                }
 
                 print ($langs->trans($prefix.$key.($short?'Short':''))!=$prefix.$key.($short?'Short':''))?$langs->trans($prefix.$key.($short?'Short':'')):($obj['label']?$obj['label']:$obj['code']);
             }

dolibarr/htdocs/core/class/discount.class.php

Indentation +96 added lines, -96 removed lines

@@ -34,23 +34,23 @@ 
     public $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
-	/**
-	 * @var string[]	Array of error strings
-	 */
-	public $errors=array();
+    /**
+     * @var string[]	Array of error strings
+     */
+    public $errors=array();
 
-	/**
-	 * @var int ID discount
-	 */
-	public $id;
+    /**
+     * @var int ID discount
+     */
+    public $id;
 
     /**
-	 * @var int Thirdparty ID
-	 */
+     * @var int Thirdparty ID
+     */
     public $fk_soc;
 
     public $discount_type;			// 0 => customer discount, 1 => supplier discount
@@ -60,14 +60,14 @@ 
     public $tva_tx;				// Vat rate
 
     /**
-	 * @var int User ID Id utilisateur qui accorde la remise
-	 */
-	public $fk_user;
+     * @var int User ID Id utilisateur qui accorde la remise
+     */
+    public $fk_user;
 
     /**
-	 * @var string description
-	 */
-	public $description;
+     * @var string description
+     */
+    public $description;
 
     public $datec;					// Date creation
 
@@ -111,7 +111,7 @@ 
      */
     function fetch($rowid, $fk_facture_source=0, $fk_invoice_supplier_source=0)
     {
-    	global $conf;
+        global $conf;
 
         // Check parameters
         if (! $rowid && ! $fk_facture_source && ! $fk_invoice_supplier_source)
@@ -288,29 +288,29 @@ 
         // Check if we can remove the discount
         if ($this->fk_invoice_supplier_source)
         {
-        	$sql="SELECT COUNT(rowid) as nb";
-        	$sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-        	$sql.=" WHERE (fk_invoice_supplier_line IS NOT NULL";	// Not used as absolute simple discount
-        	$sql.=" OR fk_invoice_supplier IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-        	$sql.=" AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
-        	//$sql.=" AND rowid != ".$this->id;
-
-        	dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-        	$resql=$this->db->query($sql);
-        	if ($resql)
-        	{
-        		$obj = $this->db->fetch_object($resql);
-        		if ($obj->nb > 0)
-        		{
-        			$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
-        			return -2;
-        		}
-        	}
-        	else
-        	{
-        		dol_print_error($this->db);
-        		return -1;
-        	}
+            $sql="SELECT COUNT(rowid) as nb";
+            $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
+            $sql.=" WHERE (fk_invoice_supplier_line IS NOT NULL";	// Not used as absolute simple discount
+            $sql.=" OR fk_invoice_supplier IS NOT NULL)"; 			// Not used as credit note and not used as deposit
+            $sql.=" AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+            //$sql.=" AND rowid != ".$this->id;
+
+            dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
+            $resql=$this->db->query($sql);
+            if ($resql)
+            {
+                $obj = $this->db->fetch_object($resql);
+                if ($obj->nb > 0)
+                {
+                    $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+                    return -2;
+                }
+            }
+            else
+            {
+                dol_print_error($this->db);
+                return -1;
+            }
         }
 
         $this->db->begin();
@@ -352,23 +352,23 @@ 
             }
             elseif($this->fk_invoice_supplier_source) {
 
-            	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-            	$sql.=" set paye=0, fk_statut=1";
-            	$sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
-
-            	dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-            	$result=$this->db->query($sql);
-            	if ($result)
-            	{
-            		$this->db->commit();
-            		return 1;
-            	}
-            	else
-            	{
-            		$this->error=$this->db->lasterror();
-            		$this->db->rollback();
-            		return -1;
-            	}
+                $sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
+                $sql.=" set paye=0, fk_statut=1";
+                $sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
+
+                dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
+                $result=$this->db->query($sql);
+                if ($result)
+                {
+                    $this->db->commit();
+                    return 1;
+                }
+                else
+                {
+                    $this->error=$this->db->lasterror();
+                    $this->db->rollback();
+                    return -1;
+                }
             }
             else
             {
@@ -413,11 +413,11 @@ 
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
         if(! empty($this->discount_type)) {
-        	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+            if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
+            if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
         } else {
-        	if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+            if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
+            if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
         }
         $sql.=" WHERE rowid = ".$this->id;
 
@@ -425,13 +425,13 @@ 
         $resql = $this->db->query($sql);
         if ($resql)
         {
-        	if(! empty($this->discount_type)) {
-        		$this->fk_invoice_supplier_line=$rowidline;
-        		$this->fk_invoice_supplier=$rowidinvoice;
-        	} else {
-        		$this->fk_facture_line=$rowidline;
-        		$this->fk_facture=$rowidinvoice;
-        	}
+            if(! empty($this->discount_type)) {
+                $this->fk_invoice_supplier_line=$rowidline;
+                $this->fk_invoice_supplier=$rowidinvoice;
+            } else {
+                $this->fk_facture_line=$rowidline;
+                $this->fk_facture=$rowidinvoice;
+            }
             return 1;
         }
         else
@@ -453,11 +453,11 @@ 
     {
         // phpcs:enable
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-		if(! empty($this->discount_type)) {
-       		$sql.=" SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
-		} else {
-			$sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
-		}
+        if(! empty($this->discount_type)) {
+                $sql.=" SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
+        } else {
+            $sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
+        }
         $sql.=" WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
@@ -486,7 +486,7 @@ 
      */
     function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $discount_type=0)
     {
-    	global $conf;
+        global $conf;
 
         $sql  = "SELECT SUM(rc.amount_ttc) as amount";
         //$sql  = "SELECT rc.amount_ttc as amount";
@@ -494,9 +494,9 @@ 
         $sql.= " WHERE rc.entity = " . $conf->entity;
         $sql.= " AND rc.discount_type=".intval($discount_type);
         if (! empty($discount_type)) {
-        	$sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
+            $sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
         } else {
-        	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
+            $sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
         }
         if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
         if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
@@ -524,7 +524,7 @@ 
      *  Should always be empty, except if option FACTURE_DEPOSITS_ARE_JUST_PAYMENTS is on (not recommended).
      *
      *	@param		CommonInvoice	$invoice		Object invoice (customer of supplier)
-	 *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
+     *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
      *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
      */
     function getSumDepositsUsed($invoice, $multicurrency=0)
@@ -557,7 +557,7 @@ 
         {
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
+            else return $obj->amount;
         }
         else
         {
@@ -570,7 +570,7 @@ 
      *  Return amount (with tax) of all credit notes invoices + excess received used by invoice as a payment
      *
      *	@param		CommonInvoice	  $invoice	    	Object invoice
-	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
+     *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
      *	@return		int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
      */
     function getSumCreditNotesUsed($invoice, $multicurrency=0)
@@ -603,7 +603,7 @@ 
         {
             $obj = $this->db->fetch_object($resql);
             if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
+            else return $obj->amount;
         }
         else
         {
@@ -650,22 +650,22 @@ 
     }
 
 
-	/**
+    /**
      *  Initialise an instance with random values.
      *  Used to build previews or test instances.
      *	id must be 0 if object instance is a specimen.
      *
      *  @return	void
-	 */
-	function initAsSpecimen()
-	{
-		global $user,$langs,$conf;
-
-		$this->fk_soc         = 1;
-		$this->amount_ht      = 10;
-		$this->amount_tva     = 1.96;
-		$this->amount_ttc     = 11.96;
-		$this->tva_tx         = 19.6;
-		$this->description    = 'Specimen discount';
-	}
+     */
+    function initAsSpecimen()
+    {
+        global $user,$langs,$conf;
+
+        $this->fk_soc         = 1;
+        $this->amount_ht      = 10;
+        $this->amount_tva     = 1.96;
+        $this->amount_ttc     = 11.96;
+        $this->tva_tx         = 19.6;
+        $this->description    = 'Specimen discount';
+    }
 }

Spacing +156 added lines, -156 removed lines

@@ -41,7 +41,7 @@ 
 	/**
 	 * @var string[]	Array of error strings
 	 */
-	public $errors=array();
+	public $errors = array();
 
 	/**
 	 * @var int ID discount
@@ -53,11 +53,11 @@ 
 	 */
     public $fk_soc;
 
-    public $discount_type;			// 0 => customer discount, 1 => supplier discount
-    public $amount_ht;				//
-    public $amount_tva;			//
-    public $amount_ttc;			//
-    public $tva_tx;				// Vat rate
+    public $discount_type; // 0 => customer discount, 1 => supplier discount
+    public $amount_ht; //
+    public $amount_tva; //
+    public $amount_ttc; //
+    public $tva_tx; // Vat rate
 
     /**
 	 * @var int User ID Id utilisateur qui accorde la remise
@@ -69,7 +69,7 @@ 
 	 */
 	public $description;
 
-    public $datec;					// Date creation
+    public $datec; // Date creation
 
     /**
      * @var int ID invoice line when a discount is used into an invoice line (for absolute discounts)
@@ -86,7 +86,7 @@ 
      */
     public $fk_facture_source;
 
-    public $ref_facture_source;	    // Ref credit note having caused the discount
+    public $ref_facture_source; // Ref credit note having caused the discount
 
     public $ref_invoice_supplier_source;
 
@@ -109,31 +109,31 @@ 
      *  @param		int		$fk_invoice_supplier_source		fk_invoice_supplier_source
      *	@return		int										<0 if KO, =0 if not found, >0 if OK
      */
-    function fetch($rowid, $fk_facture_source=0, $fk_invoice_supplier_source=0)
+    function fetch($rowid, $fk_facture_source = 0, $fk_invoice_supplier_source = 0)
     {
     	global $conf;
 
         // Check parameters
-        if (! $rowid && ! $fk_facture_source && ! $fk_invoice_supplier_source)
+        if (!$rowid && !$fk_facture_source && !$fk_invoice_supplier_source)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -1;
         }
 
         $sql = "SELECT sr.rowid, sr.fk_soc, sr.discount_type,";
-        $sql.= " sr.fk_user,";
-        $sql.= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
-        $sql.= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
-        $sql.= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";
-        $sql.= " sr.datec,";
-        $sql.= " f.ref as ref_facture_source, fsup.ref as ref_invoice_supplier_source";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
-        $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
-        $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
-        if ($fk_invoice_supplier_source) $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        $sql .= " sr.fk_user,";
+        $sql .= " sr.amount_ht, sr.amount_tva, sr.amount_ttc, sr.tva_tx,";
+        $sql .= " sr.multicurrency_amount_ht, sr.multicurrency_amount_tva, sr.multicurrency_amount_ttc,";
+        $sql .= " sr.fk_facture_line, sr.fk_facture, sr.fk_facture_source, sr.fk_invoice_supplier_line, sr.fk_invoice_supplier, sr.fk_invoice_supplier_source, sr.description,";
+        $sql .= " sr.datec,";
+        $sql .= " f.ref as ref_facture_source, fsup.ref as ref_invoice_supplier_source";
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as sr";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
+        $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
+        $sql .= " WHERE sr.entity = ".$conf->entity;
+        if ($rowid) $sql .= " AND sr.rowid=".$rowid;
+        if ($fk_facture_source) $sql .= " AND sr.fk_facture_source=".$fk_facture_source;
+        if ($fk_invoice_supplier_source) $sql .= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -159,12 +159,12 @@ 
                 $this->fk_user = $obj->fk_user;
                 $this->fk_facture_line = $obj->fk_facture_line;
                 $this->fk_facture = $obj->fk_facture;
-                $this->fk_facture_source = $obj->fk_facture_source;		// Id avoir source
-                $this->ref_facture_source = $obj->ref_facture_source;	// Ref avoir source
+                $this->fk_facture_source = $obj->fk_facture_source; // Id avoir source
+                $this->ref_facture_source = $obj->ref_facture_source; // Ref avoir source
                 $this->fk_invoice_supplier_line = $obj->fk_invoice_supplier_line;
                 $this->fk_invoice_supplier = $obj->fk_invoice_supplier;
-                $this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source;		// Id avoir source
-                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source;	// Ref avoir source
+                $this->fk_invoice_supplier_source = $obj->fk_invoice_supplier_source; // Id avoir source
+                $this->ref_invoice_supplier_source = $obj->ref_invoice_supplier_source; // Ref avoir source
                 $this->description = $obj->description;
                 $this->datec = $this->db->jdate($obj->datec);
 
@@ -179,7 +179,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -1;
         }
     }
@@ -196,52 +196,52 @@ 
         global $conf, $langs;
 
         // Clean parameters
-        $this->amount_ht=price2num($this->amount_ht);
-        $this->amount_tva=price2num($this->amount_tva);
-        $this->amount_ttc=price2num($this->amount_ttc);
+        $this->amount_ht = price2num($this->amount_ht);
+        $this->amount_tva = price2num($this->amount_tva);
+        $this->amount_ttc = price2num($this->amount_ttc);
 
-        $this->tva_tx=price2num($this->tva_tx);
+        $this->tva_tx = price2num($this->tva_tx);
 
-        $this->multicurrency_amount_ht=price2num($this->multicurrency_amount_ht);
-        $this->multicurrency_amount_tva=price2num($this->multicurrency_amount_tva);
-        $this->multicurrency_amount_ttc=price2num($this->multicurrency_amount_ttc);
+        $this->multicurrency_amount_ht = price2num($this->multicurrency_amount_ht);
+        $this->multicurrency_amount_tva = price2num($this->multicurrency_amount_tva);
+        $this->multicurrency_amount_ttc = price2num($this->multicurrency_amount_ttc);
 
-        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht=0;
-        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva=0;
-        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc=0;
+        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht = 0;
+        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva = 0;
+        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc = 0;
 
         // Check parameters
         if (empty($this->description))
         {
-            $this->error='BadValueForPropertyDescription';
+            $this->error = 'BadValueForPropertyDescription';
             dol_syslog(get_class($this)."::create ".$this->error, LOG_ERR);
             return -1;
         }
 
         // Insert request
         $sql = "INSERT INTO ".MAIN_DB_PREFIX."societe_remise_except";
-        $sql.= " (entity, datec, fk_soc, discount_type, fk_user, description,";
-        $sql.= " amount_ht, amount_tva, amount_ttc, tva_tx,";
-        $sql.= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
-        $sql.= " fk_facture_source, fk_invoice_supplier_source";
-        $sql.= ")";
-        $sql.= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec!=''?$this->datec:dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type)?0:intval($this->discount_type)).", ".$user->id.", '".$this->db->escape($this->description)."',";
-        $sql.= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
-        $sql.= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
-        $sql.= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'":"null").",";
-        $sql.= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'":"null");
-        $sql.= ")";
+        $sql .= " (entity, datec, fk_soc, discount_type, fk_user, description,";
+        $sql .= " amount_ht, amount_tva, amount_ttc, tva_tx,";
+        $sql .= " multicurrency_amount_ht, multicurrency_amount_tva, multicurrency_amount_ttc,";
+        $sql .= " fk_facture_source, fk_invoice_supplier_source";
+        $sql .= ")";
+        $sql .= " VALUES (".$conf->entity.", '".$this->db->idate($this->datec != '' ? $this->datec : dol_now())."', ".$this->fk_soc.", ".(empty($this->discount_type) ? 0 : intval($this->discount_type)).", ".$user->id.", '".$this->db->escape($this->description)."',";
+        $sql .= " ".$this->amount_ht.", ".$this->amount_tva.", ".$this->amount_ttc.", ".$this->tva_tx.",";
+        $sql .= " ".$this->multicurrency_amount_ht.", ".$this->multicurrency_amount_tva.", ".$this->multicurrency_amount_ttc.", ";
+        $sql .= " ".($this->fk_facture_source ? "'".$this->db->escape($this->fk_facture_source)."'" : "null").",";
+        $sql .= " ".($this->fk_invoice_supplier_source ? "'".$this->db->escape($this->fk_invoice_supplier_source)."'" : "null");
+        $sql .= ")";
 
         dol_syslog(get_class($this)."::create", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
-            $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
+            $this->id = $this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
         }
         else
         {
-            $this->error=$this->db->lasterror().' - sql='.$sql;
+            $this->error = $this->db->lasterror().' - sql='.$sql;
             return -1;
         }
     }
@@ -260,21 +260,21 @@ 
         // Check if we can remove the discount
         if ($this->fk_facture_source)
         {
-            $sql="SELECT COUNT(rowid) as nb";
-            $sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-            $sql.=" WHERE (fk_facture_line IS NOT NULL";	// Not used as absolute simple discount
-            $sql.=" OR fk_facture IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-            $sql.=" AND fk_facture_source = ".$this->fk_facture_source;
+            $sql = "SELECT COUNT(rowid) as nb";
+            $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+            $sql .= " WHERE (fk_facture_line IS NOT NULL"; // Not used as absolute simple discount
+            $sql .= " OR fk_facture IS NOT NULL)"; // Not used as credit note and not used as deposit
+            $sql .= " AND fk_facture_source = ".$this->fk_facture_source;
             //$sql.=" AND rowid != ".$this->id;
 
             dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-            $resql=$this->db->query($sql);
+            $resql = $this->db->query($sql);
             if ($resql)
             {
                 $obj = $this->db->fetch_object($resql);
                 if ($obj->nb > 0)
                 {
-                    $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+                    $this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
             }
@@ -288,21 +288,21 @@ 
         // Check if we can remove the discount
         if ($this->fk_invoice_supplier_source)
         {
-        	$sql="SELECT COUNT(rowid) as nb";
-        	$sql.=" FROM ".MAIN_DB_PREFIX."societe_remise_except";
-        	$sql.=" WHERE (fk_invoice_supplier_line IS NOT NULL";	// Not used as absolute simple discount
-        	$sql.=" OR fk_invoice_supplier IS NOT NULL)"; 			// Not used as credit note and not used as deposit
-        	$sql.=" AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+        	$sql = "SELECT COUNT(rowid) as nb";
+        	$sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except";
+        	$sql .= " WHERE (fk_invoice_supplier_line IS NOT NULL"; // Not used as absolute simple discount
+        	$sql .= " OR fk_invoice_supplier IS NOT NULL)"; // Not used as credit note and not used as deposit
+        	$sql .= " AND fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
         	//$sql.=" AND rowid != ".$this->id;
 
         	dol_syslog(get_class($this)."::delete Check if we can remove discount", LOG_DEBUG);
-        	$resql=$this->db->query($sql);
+        	$resql = $this->db->query($sql);
         	if ($resql)
         	{
         		$obj = $this->db->fetch_object($resql);
         		if ($obj->nb > 0)
         		{
-        			$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
+        			$this->error = 'ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
         	}
@@ -317,27 +317,27 @@ 
 
         // Delete but only if not used
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        elseif ($this->fk_invoice_supplier_source) $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
-        $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
-        $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
-        $sql.= " AND (fk_invoice_supplier_line IS NULL";	// Not used as absolute simple discount
-        $sql.= " AND fk_invoice_supplier IS NULL)";		// Not used as credit note and not used as deposit
+        if ($this->fk_facture_source) $sql .= " WHERE fk_facture_source = ".$this->fk_facture_source; // Delete all lines of same serie
+        elseif ($this->fk_invoice_supplier_source) $sql .= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source; // Delete all lines of same serie
+        else $sql .= " WHERE rowid = ".$this->id; // Delete only line
+        $sql .= " AND (fk_facture_line IS NULL"; // Not used as absolute simple discount
+        $sql .= " AND fk_facture IS NULL)"; // Not used as credit note and not used as deposit
+        $sql .= " AND (fk_invoice_supplier_line IS NULL"; // Not used as absolute simple discount
+        $sql .= " AND fk_invoice_supplier IS NULL)"; // Not used as credit note and not used as deposit
 
         dol_syslog(get_class($this)."::delete Delete discount", LOG_DEBUG);
-        $result=$this->db->query($sql);
+        $result = $this->db->query($sql);
         if ($result)
         {
             // If source of discount was a credit note or deposit, we change source statut.
             if ($this->fk_facture_source)
             {
                 $sql = "UPDATE ".MAIN_DB_PREFIX."facture";
-                $sql.=" set paye=0, fk_statut=1";
-                $sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
+                $sql .= " set paye=0, fk_statut=1";
+                $sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_facture_source;
 
                 dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-                $result=$this->db->query($sql);
+                $result = $this->db->query($sql);
                 if ($result)
                 {
                     $this->db->commit();
@@ -345,19 +345,19 @@ 
                 }
                 else
                 {
-                    $this->error=$this->db->lasterror();
+                    $this->error = $this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
             }
-            elseif($this->fk_invoice_supplier_source) {
+            elseif ($this->fk_invoice_supplier_source) {
 
             	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
-            	$sql.=" set paye=0, fk_statut=1";
-            	$sql.=" WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
+            	$sql .= " set paye=0, fk_statut=1";
+            	$sql .= " WHERE (type = 2 or type = 3) AND rowid=".$this->fk_invoice_supplier_source;
 
             	dol_syslog(get_class($this)."::delete Update credit note or deposit invoice statut", LOG_DEBUG);
-            	$result=$this->db->query($sql);
+            	$result = $this->db->query($sql);
             	if ($result)
             	{
             		$this->db->commit();
@@ -365,7 +365,7 @@ 
             	}
             	else
             	{
-            		$this->error=$this->db->lasterror();
+            		$this->error = $this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
@@ -378,7 +378,7 @@ 
         }
         else
         {
-            $this->error=$this->db->lasterror();
+            $this->error = $this->db->lasterror();
             $this->db->rollback();
             return -1;
         }
@@ -396,47 +396,47 @@ 
      *	@param		int		$rowidinvoice	Invoice id (To use discount as a credit note to reduc payment of invoice)
      *	@return		int						<0 if KO, >0 if OK
      */
-    function link_to_invoice($rowidline,$rowidinvoice)
+    function link_to_invoice($rowidline, $rowidinvoice)
     {
         // phpcs:enable
         // Check parameters
-        if (! $rowidline && ! $rowidinvoice)
+        if (!$rowidline && !$rowidinvoice)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -1;
         }
         if ($rowidline && $rowidinvoice)
         {
-            $this->error='ErrorBadParameters';
+            $this->error = 'ErrorBadParameters';
             return -2;
         }
 
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-        if(! empty($this->discount_type)) {
-        	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+        if (!empty($this->discount_type)) {
+        	if ($rowidline)    $sql .= " SET fk_invoice_supplier_line = ".$rowidline;
+        	if ($rowidinvoice) $sql .= " SET fk_invoice_supplier = ".$rowidinvoice;
         } else {
-        	if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+        	if ($rowidline)    $sql .= " SET fk_facture_line = ".$rowidline;
+        	if ($rowidinvoice) $sql .= " SET fk_facture = ".$rowidinvoice;
         }
-        $sql.=" WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::link_to_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
         if ($resql)
         {
-        	if(! empty($this->discount_type)) {
-        		$this->fk_invoice_supplier_line=$rowidline;
-        		$this->fk_invoice_supplier=$rowidinvoice;
+        	if (!empty($this->discount_type)) {
+        		$this->fk_invoice_supplier_line = $rowidline;
+        		$this->fk_invoice_supplier = $rowidinvoice;
         	} else {
-        		$this->fk_facture_line=$rowidline;
-        		$this->fk_facture=$rowidinvoice;
+        		$this->fk_facture_line = $rowidline;
+        		$this->fk_facture = $rowidinvoice;
         	}
             return 1;
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -452,13 +452,13 @@ 
     function unlink_invoice()
     {
         // phpcs:enable
-        $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
-		if(! empty($this->discount_type)) {
-       		$sql.=" SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
+        $sql = "UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
+		if (!empty($this->discount_type)) {
+       		$sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
 		} else {
-			$sql.=" SET fk_facture_line = NULL, fk_facture = NULL";
+			$sql .= " SET fk_facture_line = NULL, fk_facture = NULL";
 		}
-        $sql.=" WHERE rowid = ".$this->id;
+        $sql .= " WHERE rowid = ".$this->id;
 
         dol_syslog(get_class($this)."::unlink_invoice", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -468,7 +468,7 @@ 
         }
         else
         {
-            $this->error=$this->db->error();
+            $this->error = $this->db->error();
             return -3;
         }
     }
@@ -484,27 +484,27 @@ 
      *  @param      int			$discount_type  0 => customer discount, 1 => supplier discount
      * 	@return		int						<0 if KO, amount otherwise
      */
-    function getAvailableDiscounts($company='', $user='',$filter='', $maxvalue=0, $discount_type=0)
+    function getAvailableDiscounts($company = '', $user = '', $filter = '', $maxvalue = 0, $discount_type = 0)
     {
     	global $conf;
 
-        $sql  = "SELECT SUM(rc.amount_ttc) as amount";
+        $sql = "SELECT SUM(rc.amount_ttc) as amount";
         //$sql  = "SELECT rc.amount_ttc as amount";
-        $sql.= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
-        $sql.= " WHERE rc.entity = " . $conf->entity;
-        $sql.= " AND rc.discount_type=".intval($discount_type);
-        if (! empty($discount_type)) {
-        	$sql.= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
+        $sql .= " FROM ".MAIN_DB_PREFIX."societe_remise_except as rc";
+        $sql .= " WHERE rc.entity = ".$conf->entity;
+        $sql .= " AND rc.discount_type=".intval($discount_type);
+        if (!empty($discount_type)) {
+        	$sql .= " AND (rc.fk_invoice_supplier IS NULL AND rc.fk_invoice_supplier_line IS NULL)"; // Available from supplier
         } else {
-        	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
+        	$sql .= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
         }
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        if (is_object($company)) $sql .= " AND rc.fk_soc = ".$company->id;
+        if (is_object($user))    $sql .= " AND rc.fk_user = ".$user->id;
+        if ($filter)   $sql .= ' AND ('.$filter.')';
+        if ($maxvalue) $sql .= ' AND rc.amount_ttc <= '.price2num($maxvalue);
 
         dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -527,32 +527,32 @@ 
 	 *  @param 		int 		    $multicurrency 	Return multicurrency_amount instead of amount
      *	@return		int				     			<0 if KO, Sum of credit notes and deposits amount otherwise
      */
-    function getSumDepositsUsed($invoice, $multicurrency=0)
+    function getSumDepositsUsed($invoice, $multicurrency = 0)
     {
         dol_syslog(get_class($this)."::getSumDepositsUsed", LOG_DEBUG);
 
         if ($invoice->element == 'facture' || $invoice->element == 'invoice')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql .= ' AND f.type = 3';
         }
         else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND f.type = 3';
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql .= ' AND f.type = 3';
         }
         else
         {
-            $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
+            $this->error = get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
         }
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -573,32 +573,32 @@ 
 	 *	@param		int			      $multicurrency	Return multicurrency_amount instead of amount
      *	@return		int					        		<0 if KO, Sum of credit notes and excess received amount otherwise
      */
-    function getSumCreditNotesUsed($invoice, $multicurrency=0)
+    function getSumCreditNotesUsed($invoice, $multicurrency = 0)
     {
         dol_syslog(get_class($this)."::getSumCreditNotesUsed", LOG_DEBUG);
 
         if ($invoice->element == 'facture' || $invoice->element == 'invoice')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
-            $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
-            $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess received
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
+            $sql .= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
+            $sql .= ' AND (f.type = 2 OR f.type = 0)'; // Find discount coming from credit note or excess received
         }
         else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
-            $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
-            $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
-            $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess paid
+            $sql .= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
+            $sql .= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
+            $sql .= ' AND (f.type = 2 OR f.type = 0)'; // Find discount coming from credit note or excess paid
         }
         else
         {
-            $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
+            $this->error = get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
             return -1;
         }
 
-        $resql=$this->db->query($sql);
+        $resql = $this->db->query($sql);
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
@@ -619,33 +619,33 @@ 
      *	@param		string	$option			Where to link to ('invoice' or 'discount')
      *	@return		string					String with URL
      */
-    function getNomUrl($withpicto,$option='invoice')
+    function getNomUrl($withpicto, $option = 'invoice')
     {
         global $langs;
 
-        $result='';
+        $result = '';
 
         if ($option == 'invoice') {
-            $facid=! empty($this->discount_type)?$this->fk_invoice_supplier_source:$this->fk_facture_source;
-            $link=! empty($this->discount_type)?'/fourn/facture/card.php':'/compta/facture/card.php';
-            $label=$langs->trans("ShowDiscount").': '.$this->ref_facture_source;
+            $facid = !empty($this->discount_type) ? $this->fk_invoice_supplier_source : $this->fk_facture_source;
+            $link = !empty($this->discount_type) ? '/fourn/facture/card.php' : '/compta/facture/card.php';
+            $label = $langs->trans("ShowDiscount").': '.$this->ref_facture_source;
             $link = '<a href="'.DOL_URL_ROOT.$link.'?facid='.$facid.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=! empty($this->discount_type)?$this->ref_invoice_supplier_source:$this->ref_facture_source;
-            $picto='bill';
+            $linkend = '</a>';
+            $ref = !empty($this->discount_type) ? $this->ref_invoice_supplier_source : $this->ref_facture_source;
+            $picto = 'bill';
         }
         if ($option == 'discount') {
-            $label=$langs->trans("Discount");
+            $label = $langs->trans("Discount");
             $link = '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$this->fk_soc.'" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">';
-            $linkend='</a>';
-            $ref=$langs->trans("Discount");
-            $picto='generic';
+            $linkend = '</a>';
+            $ref = $langs->trans("Discount");
+            $picto = 'generic';
         }
 
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
-        $result.=$link.$ref.$linkend;
+        if ($withpicto) $result .= ($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        if ($withpicto && $withpicto != 2) $result .= ' ';
+        $result .= $link.$ref.$linkend;
         return $result;
     }
 
@@ -659,7 +659,7 @@ 
 	 */
 	function initAsSpecimen()
 	{
-		global $user,$langs,$conf;
+		global $user, $langs, $conf;
 
 		$this->fk_soc         = 1;
 		$this->amount_ht      = 10;

Braces +88 added lines, -59 removed lines

@@ -131,9 +131,15 @@ 
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as f ON sr.fk_facture_source = f.rowid";
         $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."facture as fsup ON sr.fk_invoice_supplier_source = fsup.rowid";
         $sql.= " WHERE sr.entity = " . $conf->entity;
-        if ($rowid) $sql.= " AND sr.rowid=".$rowid;
-        if ($fk_facture_source) $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
-        if ($fk_invoice_supplier_source) $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        if ($rowid) {
+            $sql.= " AND sr.rowid=".$rowid;
+        }
+        if ($fk_facture_source) {
+            $sql.= " AND sr.fk_facture_source=".$fk_facture_source;
+        }
+        if ($fk_invoice_supplier_source) {
+            $sql.= " AND sr.fk_invoice_supplier_source=".$fk_invoice_supplier_source;
+        }
 
         dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
         $resql = $this->db->query($sql);
@@ -170,14 +176,12 @@ 
 
                 $this->db->free($resql);
                 return 1;
-            }
-            else
+            } else
             {
                 $this->db->free($resql);
                 return 0;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -1;
@@ -206,9 +210,15 @@ 
         $this->multicurrency_amount_tva=price2num($this->multicurrency_amount_tva);
         $this->multicurrency_amount_ttc=price2num($this->multicurrency_amount_ttc);
 
-        if (empty($this->multicurrency_amount_ht)) $this->multicurrency_amount_ht=0;
-        if (empty($this->multicurrency_amount_tva)) $this->multicurrency_amount_tva=0;
-        if (empty($this->multicurrency_amount_ttc)) $this->multicurrency_amount_ttc=0;
+        if (empty($this->multicurrency_amount_ht)) {
+            $this->multicurrency_amount_ht=0;
+        }
+        if (empty($this->multicurrency_amount_tva)) {
+            $this->multicurrency_amount_tva=0;
+        }
+        if (empty($this->multicurrency_amount_ttc)) {
+            $this->multicurrency_amount_ttc=0;
+        }
 
         // Check parameters
         if (empty($this->description))
@@ -238,8 +248,7 @@ 
         {
             $this->id=$this->db->last_insert_id(MAIN_DB_PREFIX."societe_remise_except");
             return $this->id;
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror().' - sql='.$sql;
             return -1;
@@ -277,8 +286,7 @@ 
                     $this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
                     return -2;
                 }
-            }
-            else
+            } else
             {
                 dol_print_error($this->db);
                 return -1;
@@ -305,8 +313,7 @@ 
         			$this->error='ErrorThisPartOrAnotherIsAlreadyUsedSoDiscountSerieCantBeRemoved';
         			return -2;
         		}
-        	}
-        	else
+        	} else
         	{
         		dol_print_error($this->db);
         		return -1;
@@ -317,9 +324,18 @@ 
 
         // Delete but only if not used
         $sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_remise_except ";
-        if ($this->fk_facture_source) $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;	// Delete all lines of same serie
-        elseif ($this->fk_invoice_supplier_source) $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;	// Delete all lines of same serie
-        else $sql.= " WHERE rowid = ".$this->id;	// Delete only line
+        if ($this->fk_facture_source) {
+            $sql.= " WHERE fk_facture_source = ".$this->fk_facture_source;
+        }
+        // Delete all lines of same serie
+        elseif ($this->fk_invoice_supplier_source) {
+            $sql.= " WHERE fk_invoice_supplier_source = ".$this->fk_invoice_supplier_source;
+        }
+        // Delete all lines of same serie
+        else {
+            $sql.= " WHERE rowid = ".$this->id;
+        }
+        // Delete only line
         $sql.= " AND (fk_facture_line IS NULL";	// Not used as absolute simple discount
         $sql.= " AND fk_facture IS NULL)";		// Not used as credit note and not used as deposit
         $sql.= " AND (fk_invoice_supplier_line IS NULL";	// Not used as absolute simple discount
@@ -342,15 +358,13 @@ 
                 {
                     $this->db->commit();
                     return 1;
-                }
-                else
+                } else
                 {
                     $this->error=$this->db->lasterror();
                     $this->db->rollback();
                     return -1;
                 }
-            }
-            elseif($this->fk_invoice_supplier_source) {
+            } elseif($this->fk_invoice_supplier_source) {
 
             	$sql = "UPDATE ".MAIN_DB_PREFIX."facture_fourn";
             	$sql.=" set paye=0, fk_statut=1";
@@ -362,21 +376,18 @@ 
             	{
             		$this->db->commit();
             		return 1;
-            	}
-            	else
+            	} else
             	{
             		$this->error=$this->db->lasterror();
             		$this->db->rollback();
             		return -1;
             	}
-            }
-            else
+            } else
             {
                 $this->db->commit();
                 return 1;
             }
-        }
-        else
+        } else
         {
             $this->error=$this->db->lasterror();
             $this->db->rollback();
@@ -413,11 +424,19 @@ 
 
         $sql ="UPDATE ".MAIN_DB_PREFIX."societe_remise_except";
         if(! empty($this->discount_type)) {
-        	if ($rowidline)    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        	if ($rowidline) {
+        	    $sql.=" SET fk_invoice_supplier_line = ".$rowidline;
+        	}
+        	if ($rowidinvoice) {
+        	    $sql.=" SET fk_invoice_supplier = ".$rowidinvoice;
+        	}
         } else {
-        	if ($rowidline)    $sql.=" SET fk_facture_line = ".$rowidline;
-        	if ($rowidinvoice) $sql.=" SET fk_facture = ".$rowidinvoice;
+        	if ($rowidline) {
+        	    $sql.=" SET fk_facture_line = ".$rowidline;
+        	}
+        	if ($rowidinvoice) {
+        	    $sql.=" SET fk_facture = ".$rowidinvoice;
+        	}
         }
         $sql.=" WHERE rowid = ".$this->id;
 
@@ -433,8 +452,7 @@ 
         		$this->fk_facture=$rowidinvoice;
         	}
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -465,8 +483,7 @@ 
         if ($resql)
         {
             return 1;
-        }
-        else
+        } else
         {
             $this->error=$this->db->error();
             return -3;
@@ -498,10 +515,18 @@ 
         } else {
         	$sql.= " AND (rc.fk_facture IS NULL AND rc.fk_facture_line IS NULL)"; // Available to customer
         }
-        if (is_object($company)) $sql.= " AND rc.fk_soc = ".$company->id;
-        if (is_object($user))    $sql.= " AND rc.fk_user = ".$user->id;
-        if ($filter)   $sql.=' AND ('.$filter.')';
-        if ($maxvalue) $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        if (is_object($company)) {
+            $sql.= " AND rc.fk_soc = ".$company->id;
+        }
+        if (is_object($user)) {
+            $sql.= " AND rc.fk_user = ".$user->id;
+        }
+        if ($filter) {
+            $sql.=' AND ('.$filter.')';
+        }
+        if ($maxvalue) {
+            $sql.=' AND rc.amount_ttc <= '.price2num($maxvalue);
+        }
 
         dol_syslog(get_class($this)."::getAvailableDiscounts", LOG_DEBUG);
         $resql=$this->db->query($sql);
@@ -537,15 +562,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND f.type = 3';
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumDepositsUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -556,10 +579,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+                return $obj->multicurrency_amount;
+            } else {
+			    return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -583,15 +608,13 @@ 
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture as f';
             $sql.= ' WHERE rc.fk_facture_source=f.rowid AND rc.fk_facture = '.$invoice->id;
             $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess received
-        }
-        else if ($invoice->element == 'invoice_supplier')
+        } else if ($invoice->element == 'invoice_supplier')
         {
             $sql = 'SELECT sum(rc.amount_ttc) as amount, sum(rc.multicurrency_amount_ttc) as multicurrency_amount';
             $sql.= ' FROM '.MAIN_DB_PREFIX.'societe_remise_except as rc, '.MAIN_DB_PREFIX.'facture_fourn as f';
             $sql.= ' WHERE rc.fk_invoice_supplier_source=f.rowid AND rc.fk_invoice_supplier = '.$invoice->id;
             $sql.= ' AND (f.type = 2 OR f.type = 0)';	// Find discount coming from credit note or excess paid
-        }
-        else
+        } else
         {
             $this->error=get_class($this)."::getSumCreditNotesUsed was called with a bad object as a first parameter";
             dol_print_error($this->error);
@@ -602,10 +625,12 @@ 
         if ($resql)
         {
             $obj = $this->db->fetch_object($resql);
-            if ($multicurrency) return $obj->multicurrency_amount;
-			else return $obj->amount;
-        }
-        else
+            if ($multicurrency) {
+                return $obj->multicurrency_amount;
+            } else {
+			    return $obj->amount;
+			}
+        } else
         {
             $this->error = $this->db->lasterror();
             return -1;
@@ -643,8 +668,12 @@ 
         }
 
 
-        if ($withpicto) $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
-        if ($withpicto && $withpicto != 2) $result.=' ';
+        if ($withpicto) {
+            $result.=($link.img_object($label, $picto, 'class="classfortooltip"').$linkend);
+        }
+        if ($withpicto && $withpicto != 2) {
+            $result.=' ';
+        }
         $result.=$link.$ref.$linkend;
         return $result;
     }

dolibarr/htdocs/core/class/openid.class.php

Indentation +20 added lines, -20 removed lines

@@ -30,8 +30,8 @@ 
     var $URLs = array();
     var $error = array();
     var $fields = array(
-		'required' => array(),
-		'optional' => array(),
+        'required' => array(),
+        'optional' => array(),
     );
 
     /**
@@ -399,8 +399,8 @@ 
         // phpcs:enable
         global $conf;
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+        if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
         $response = getURLContent($url);
 
@@ -475,9 +475,9 @@ 
     {
         // phpcs:enable
         $params = array(
-			'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
-			'openid.signed' => urlencode($_GET['openid_signed']),
-			'openid.sig' => urlencode($_GET['openid_sig'])
+            'openid.assoc_handle' => urlencode($_GET['openid_assoc_handle']),
+            'openid.signed' => urlencode($_GET['openid_signed']),
+            'openid.sig' => urlencode($_GET['openid_sig'])
         );
         // Send only required parameters to confirm validity
         $arr_signed = explode(",",str_replace('sreg.','sreg_',$_GET['openid_signed']));
@@ -520,16 +520,16 @@ 
      */
     function sendDiscoveryRequestToGetXRDS($url='')
     {
-    	global $conf;
+        global $conf;
 
-		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+        include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+        if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
-		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
+        dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
-		$addheaders=array('Accept: application/xrds+xml');
+        $addheaders=array('Accept: application/xrds+xml');
         $response = getURLContent($url, 'GET', '', 1, $addheaders);
-		/* response should like this:
+        /* response should like this:
 		<?xml version="1.0" encoding="UTF-8"?>
 		<xrds:XRDS xmlns:xrds="xri://$xrds" xmlns="xri://$xrd*($v*2.0)">
 		<XRD>
@@ -542,12 +542,12 @@ 
 		</XRD>
 		</xrds:XRDS>
 		*/
-		$content=$response['content'];
+        $content=$response['content'];
 
         $server='';
         if (preg_match('/'.preg_quote('<URI>','/').'(.*)'.preg_quote('</URI>','/').'/is', $content, $reg))
         {
-        	$server=$reg[1];
+            $server=$reg[1];
         }
 
         if (empty($server))
@@ -556,10 +556,10 @@ 
             return false;
         }
         else
-       {
-       		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
-        	$this->SetOpenIDServer($server);
-        	return $server;
-	    }
+        {
+                dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
+            $this->SetOpenIDServer($server);
+            return $server;
+        }
     }
 }

Spacing +37 added lines, -37 removed lines

@@ -185,7 +185,7 @@ 
     {
         // phpcs:enable
         $e = $this->error;
-        return array('code'=>$e[0],'description'=>$e[1]);
+        return array('code'=>$e[0], 'description'=>$e[1]);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -200,10 +200,10 @@ 
     {
         // phpcs:enable
         $errs['OPENID_NOSERVERSFOUND'] = 'Cannot find OpenID Server TAG on Identity page.';
-        if ($desc == null){
+        if ($desc == null) {
             $desc = $errs[$code];
         }
-        $this->error = array($code,$desc);
+        $this->error = array($code, $desc);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -235,7 +235,7 @@ 
     {
         $r = array();
         $response = explode("\n", $response);
-        foreach($response as $line) {
+        foreach ($response as $line) {
             $line = trim($line);
             if ($line != "") {
                 list($key, $value) = explode(":", $line, 2);
@@ -263,13 +263,13 @@ 
         if (!isset($u['path']) || ($u['path'] == '/')) {
             $u['path'] = '';
         }
-        if(substr($u['path'],-1,1) == '/'){
-            $u['path'] = substr($u['path'], 0, strlen($u['path'])-1);
+        if (substr($u['path'], -1, 1) == '/') {
+            $u['path'] = substr($u['path'], 0, strlen($u['path']) - 1);
         }
-        if (isset($u['query'])){ // If there is a query string, then use identity as is
-            return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
-            return $u['host'] . $u['path'];
+        if (isset($u['query'])) { // If there is a query string, then use identity as is
+            return $u['host'].$u['path'].'?'.$u['query'];
+        } else {
+            return $u['host'].$u['path'];
         }
     }
 
@@ -282,12 +282,12 @@ 
     function array2url($arr)
     {
         // converts associated array to URL Query String
-        if (!is_array($arr)){
+        if (!is_array($arr)) {
             return false;
         }
         $query = '';
-        foreach($arr as $key => $value){
-            $query .= $key . "=" . $value . "&";
+        foreach ($arr as $key => $value) {
+            $query .= $key."=".$value."&";
         }
         return $query;
     }
@@ -301,7 +301,7 @@ 
      * @param string	$params		Params
      * @return boolean|unknown
      */
-    function FSOCK_Request($url, $method="GET", $params = "")
+    function FSOCK_Request($url, $method = "GET", $params = "")
     {
         // phpcs:enable
         $fp = fsockopen("ssl://www.myopenid.com", 443, $errno, $errstr, 3); // Connection timeout is 3 seconds
@@ -309,7 +309,7 @@ 
             $this->ErrorStore('OPENID_SOCKETERROR', $errstr);
             return false;
         } else {
-            $request = $method . " /server HTTP/1.0\r\n";
+            $request = $method." /server HTTP/1.0\r\n";
             $request .= "User-Agent: Dolibarr\r\n";
             $request .= "Connection: close\r\n\r\n";
             fwrite($fp, $request);
@@ -335,13 +335,13 @@ 
      * @param 	string	$params		Params
      * @return string
      */
-    function CURL_Request($url, $method="GET", $params = "")
+    function CURL_Request($url, $method = "GET", $params = "")
     {
         // phpcs:enable
         // Remember, SSL MUST BE SUPPORTED
         if (is_array($params)) $params = $this->array2url($params);
 
-        $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
+        $curl = curl_init($url.($method == "GET" && $params != "" ? "?".$params : ""));
         @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
         curl_setopt($curl, CURLOPT_HEADER, false);
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
@@ -351,9 +351,9 @@ 
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curl);
 
-        if (curl_errno($curl) == 0){
+        if (curl_errno($curl) == 0) {
             $response;
-        }else{
+        } else {
             $this->ErrorStore('OPENID_CURL', curl_error($curl));
         }
         return $response;
@@ -394,13 +394,13 @@ 
      * @param	string	$url	Url to found endpoint
      * @return 	string			Endpoint
      */
-    function GetOpenIDServer($url='')
+    function GetOpenIDServer($url = '')
     {
         // phpcs:enable
         global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
         $response = getURLContent($url);
 
@@ -434,13 +434,13 @@ 
 
         if (isset($this->fields['required'])
         && (count($this->fields['required']) > 0)) {
-            $params['openid.sreg.required'] = implode(',',$this->fields['required']);
+            $params['openid.sreg.required'] = implode(',', $this->fields['required']);
         }
         if (isset($this->fields['optional'])
         && (count($this->fields['optional']) > 0)) {
-            $params['openid.sreg.optional'] = implode(',',$this->fields['optional']);
+            $params['openid.sreg.optional'] = implode(',', $this->fields['optional']);
         }
-        return $this->URLs['openid_server'] . "?". $this->array2url($params);
+        return $this->URLs['openid_server']."?".$this->array2url($params);
     }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -461,7 +461,7 @@ 
         }
         else
         {	// Default Header Redirect
-            header('Location: ' . $redirect_to);
+            header('Location: '.$redirect_to);
         }
     }
 
@@ -480,14 +480,14 @@ 
 			'openid.sig' => urlencode($_GET['openid_sig'])
         );
         // Send only required parameters to confirm validity
-        $arr_signed = explode(",",str_replace('sreg.','sreg_',$_GET['openid_signed']));
+        $arr_signed = explode(",", str_replace('sreg.', 'sreg_', $_GET['openid_signed']));
         $num = count($arr_signed);
         for ($i = 0; $i < $num; $i++)
         {
-            $s = str_replace('sreg_','sreg.', $arr_signed[$i]);
-            $c = $_GET['openid_' . $arr_signed[$i]];
+            $s = str_replace('sreg_', 'sreg.', $arr_signed[$i]);
+            $c = $_GET['openid_'.$arr_signed[$i]];
             // if ($c != ""){
-            $params['openid.' . $s] = urlencode($c);
+            $params['openid.'.$s] = urlencode($c);
             // }
         }
         $params['openid.mode'] = "check_authentication";
@@ -497,7 +497,7 @@ 
         {
             return false;
         }
-        $response = $this->CURL_Request($openid_server,'POST',$params);
+        $response = $this->CURL_Request($openid_server, 'POST', $params);
         $data = $this->splitResponse($response);
         if ($data['is_valid'] == "true")
         {
@@ -518,16 +518,16 @@ 
      * @param	string	$url	Url of endpoint to request
      * @return 	string			First endpoint OpenID server found. False if it failed to found.
      */
-    function sendDiscoveryRequestToGetXRDS($url='')
+    function sendDiscoveryRequestToGetXRDS($url = '')
     {
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) $url = $conf->global->MAIN_AUTHENTICATION_OPENID_URL;
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
-		$addheaders=array('Accept: application/xrds+xml');
+		$addheaders = array('Accept: application/xrds+xml');
         $response = getURLContent($url, 'GET', '', 1, $addheaders);
 		/* response should like this:
 		<?xml version="1.0" encoding="UTF-8"?>
@@ -542,12 +542,12 @@ 
 		</XRD>
 		</xrds:XRDS>
 		*/
-		$content=$response['content'];
+		$content = $response['content'];
 
-        $server='';
-        if (preg_match('/'.preg_quote('<URI>','/').'(.*)'.preg_quote('</URI>','/').'/is', $content, $reg))
+        $server = '';
+        if (preg_match('/'.preg_quote('<URI>', '/').'(.*)'.preg_quote('</URI>', '/').'/is', $content, $reg))
         {
-        	$server=$reg[1];
+        	$server = $reg[1];
         }
 
         if (empty($server))

Braces +21 added lines, -16 removed lines

@@ -218,8 +218,7 @@ 
         if (count($this->error) > 0)
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -255,8 +254,9 @@ 
     function OpenID_Standarize($openid_identity = null)
     {
         // phpcs:enable
-        if ($openid_identity === null)
-        $openid_identity = $this->openid_url_identity;
+        if ($openid_identity === null) {
+                $openid_identity = $this->openid_url_identity;
+        }
 
         $u = parse_url(strtolower(trim($openid_identity)));
 
@@ -268,7 +268,7 @@ 
         }
         if (isset($u['query'])){ // If there is a query string, then use identity as is
             return $u['host'] . $u['path'] . '?' . $u['query'];
-        }else{
+        } else{
             return $u['host'] . $u['path'];
         }
     }
@@ -339,7 +339,9 @@ 
     {
         // phpcs:enable
         // Remember, SSL MUST BE SUPPORTED
-        if (is_array($params)) $params = $this->array2url($params);
+        if (is_array($params)) {
+            $params = $this->array2url($params);
+        }
 
         $curl = curl_init($url . ($method == "GET" && $params != "" ? "?" . $params : ""));
         @curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
@@ -347,13 +349,15 @@ 
         curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false);
         curl_setopt($curl, CURLOPT_HTTPGET, ($method == "GET"));
         curl_setopt($curl, CURLOPT_POST, ($method == "POST"));
-        if ($method == "POST") curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        if ($method == "POST") {
+            curl_setopt($curl, CURLOPT_POSTFIELDS, $params);
+        }
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
         $response = curl_exec($curl);
 
         if (curl_errno($curl) == 0){
             $response;
-        }else{
+        } else{
             $this->ErrorStore('OPENID_CURL', curl_error($curl));
         }
         return $response;
@@ -400,7 +404,9 @@ 
         global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+		    $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
         $response = getURLContent($url);
 
@@ -458,8 +464,7 @@ 
             echo '<script language="JavaScript" type="text/javascript">window.location=\'';
             echo $redirect_to;
             echo '\';</script>';
-        }
-        else
+        } else
         {	// Default Header Redirect
             header('Location: ' . $redirect_to);
         }
@@ -502,8 +507,7 @@ 
         if ($data['is_valid'] == "true")
         {
             return true;
-        }
-        else
+        } else
         {
             return false;
         }
@@ -523,7 +527,9 @@ 
     	global $conf;
 
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-		if (empty($url)) $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		if (empty($url)) {
+		    $url=$conf->global->MAIN_AUTHENTICATION_OPENID_URL;
+		}
 
 		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS get XRDS');
 
@@ -554,8 +560,7 @@ 
         {
             $this->ErrorStore('OPENID_NOSERVERSFOUND');
             return false;
-        }
-        else
+        } else
        {
        		dol_syslog(get_class($this).'::sendDiscoveryRequestToGetXRDS found endpoint = '.$server);
         	$this->SetOpenIDServer($server);

dolibarr/htdocs/core/class/emailsenderprofile.class.php

Indentation +385 added lines, -385 removed lines

@@ -35,401 +35,401 @@
  */
 class EmailSenderProfile extends CommonObject
 {
-	/**
-	 * @var string ID to identify managed object
-	 */
-	public $element = 'emailsenderprofile';
-
-	/**
-	 * @var string Name of table without prefix where object is stored
-	 */
-	public $table_element = 'c_email_senderprofile';
-
-	/**
-	 * @var array  Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
-	 */
-	public $ismultientitymanaged = 1;
-
-	/**
-	 * @var string String with name of icon for emailsenderprofile
-	 */
-	public $picto = 'emailsenderprofile@monmodule';
-
-
-	/**
-	 *             'type' if the field format.
-	 *             'label' the translation key.
-	 *             'enabled' is a condition when the filed must be managed.
-	 *             'visible' says if field is visible in list (-1 means not shown by default but can be added into list to be viewed).
-	 *             'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
-	 *             'index' if we want an index in database.
-	 *             'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
-	 *             'position' is the sort order of field.
-	 *             'searchall' is 1 if we want to search in this field when making a search from the quick search button.
-	 *             'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
-	 *             'help' is a string visible as a tooltip on field
-	 *             'comment' is not used. You can store here any text of your choice.
-	 */
-
-	// BEGIN MODULEBUILDER PROPERTIES
-	/**
-	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
-	 */
-	public $fields=array(
-		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
-		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
-		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1),
-		'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1),
-		//'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		//'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
-		'signature' => array('type'=>'text', 'label'=>'Signature', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'position' => array('type'=>'integer', 'label'=>'Position', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
-		'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
-		'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
-	);
-
-	/**
-	 * @var int ID
-	 */
-	public $rowid;
-
-	/**
-	 * @var int Entity
-	 */
-	public $entity;
-
-	/**
+    /**
+     * @var string ID to identify managed object
+     */
+    public $element = 'emailsenderprofile';
+
+    /**
+     * @var string Name of table without prefix where object is stored
+     */
+    public $table_element = 'c_email_senderprofile';
+
+    /**
+     * @var array  Does emailsenderprofile support multicompany module ? 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
+     */
+    public $ismultientitymanaged = 1;
+
+    /**
+     * @var string String with name of icon for emailsenderprofile
+     */
+    public $picto = 'emailsenderprofile@monmodule';
+
+
+    /**
+     *             'type' if the field format.
+     *             'label' the translation key.
+     *             'enabled' is a condition when the filed must be managed.
+     *             'visible' says if field is visible in list (-1 means not shown by default but can be added into list to be viewed).
+     *             'notnull' is set to 1 if not null in database. Set to -1 if we must set data to null if empty ('' or 0).
+     *             'index' if we want an index in database.
+     *             'foreignkey'=>'tablename.field' if the field is a foreign key (it is recommanded to name the field fk_...).
+     *             'position' is the sort order of field.
+     *             'searchall' is 1 if we want to search in this field when making a search from the quick search button.
+     *             'isameasure' must be set to 1 if you want to have a total on list for this field. Field type must be summable like integer or double(24,8).
+     *             'help' is a string visible as a tooltip on field
+     *             'comment' is not used. You can store here any text of your choice.
+     */
+
+    // BEGIN MODULEBUILDER PROPERTIES
+    /**
+     * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
+     */
+    public $fields=array(
+        'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
+        'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
+        'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1),
+        'email' => array('type'=>'varchar(255)', 'label'=>'Email', 'visible'=>1, 'enabled'=>1, 'position'=>40, 'notnull'=>-1),
+        //'fk_user_creat' => array('type'=>'integer', 'label'=>'UserAuthor', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        //'fk_user_modif' => array('type'=>'integer', 'label'=>'UserModif', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>-1,),
+        'signature' => array('type'=>'text', 'label'=>'Signature', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
+        'position' => array('type'=>'integer', 'label'=>'Position', 'visible'=>-1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1,),
+        'date_creation' => array('type'=>'datetime', 'label'=>'DateCreation', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'visible'=>-1, 'enabled'=>1, 'position'=>500, 'notnull'=>1,),
+        'active' => array('type'=>'integer', 'label'=>'Status', 'visible'=>1, 'enabled'=>1, 'position'=>1000, 'notnull'=>-1, 'index'=>1),
+    );
+
+    /**
+     * @var int ID
+     */
+    public $rowid;
+
+    /**
+     * @var int Entity
+     */
+    public $entity;
+
+    /**
      * @var string Email Sender Profile label
      */
     public $label;
 
-	public $email;
-	public $date_creation;
-	public $tms;
-	//public $fk_user_creat;
-	//public $fk_user_modif;
-	public $signature;
-	public $position;
-	public $active;
-	// END MODULEBUILDER PROPERTIES
-
-
-
-	// If this object has a subtable with lines
-
-	/**
-	 * @var int    Name of subtable line
-	 */
-	//public $table_element_line = 'emailsenderprofiledet';
-	/**
-	 * @var int    Field with ID of parent key if this field has a parent
-	 */
-	//public $fk_element = 'fk_emailsenderprofile';
-	/**
-	 * @var int    Name of subtable class that manage subtable lines
-	 */
-	//public $class_element_line = 'EmailSenderProfileline';
-	/**
-	 * @var array  Array of child tables (child tables to delete before deleting a record)
-	 */
-	//protected $childtables=array('emailsenderprofiledet');
-	/**
-	 * @var EmailSenderProfileLine[]     Array of subtable lines
-	 */
-	//public $lines = array();
-
-
-
-	/**
-	 * Constructor
-	 *
-	 * @param DoliDb $db Database handler
-	 */
-	public function __construct(DoliDB $db)
-	{
-		global $conf;
-
-		$this->db = $db;
-
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
-	}
-
-	/**
-	 * Create object into database
-	 *
-	 * @param  User $user      User that creates
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, Id of created object if OK
-	 */
-	public function create(User $user, $notrigger = false)
-	{
-		return $this->createCommon($user, $notrigger);
-	}
-
-	/**
-	 * Clone and object into another one
-	 *
-	 * @param  	User 	$user      	User that creates
-	 * @param  	int 	$fromid     Id of object to clone
-	 * @return 	mixed 				New object created, <0 if KO
-	 */
-	public function createFromClone(User $user, $fromid)
-	{
-		global $hookmanager, $langs;
-		$error = 0;
-
-		dol_syslog(__METHOD__, LOG_DEBUG);
-
-		$object = new self($this->db);
-
-		$this->db->begin();
-
-		// Load source object
-		$object->fetchCommon($fromid);
-		// Reset some properties
-		unset($object->id);
-		unset($object->fk_user_creat);
-		unset($object->import_key);
-
-		// Clear fields
-		$object->ref = "copy_of_".$object->ref;
-		$object->title = $langs->trans("CopyOf")." ".$object->title;
-		// ...
-
-		// Create clone
-		$object->context['createfromclone'] = 'createfromclone';
-		$result = $object->createCommon($user);
-		if ($result < 0) {
-			$error++;
-			$this->error = $object->error;
-			$this->errors = $object->errors;
-		}
-
-		// End
-		if (!$error) {
-			$this->db->commit();
-			return $object;
-		} else {
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 * Load object in memory from the database
-	 *
-	 * @param int    $id   Id object
-	 * @param string $ref  Ref
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetch($id, $ref = null)
-	{
-		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
-		return $result;
-	}
-
-	/**
-	 * Load object lines in memory from the database
-	 *
-	 * @return int         <0 if KO, 0 if not found, >0 if OK
-	 */
-	public function fetchLines()
-	{
-		$this->lines=array();
-
-		// Load lines with object EmailSenderProfileLine
-
-		return count($this->lines)?1:0;
-	}
-
-	/**
-	 * Update object into database
-	 *
-	 * @param  User $user      User that modifies
-	 * @param  bool $notrigger false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function update(User $user, $notrigger = false)
-	{
-		return $this->updateCommon($user, $notrigger);
-	}
-
-	/**
-	 * Delete object in database
-	 *
-	 * @param User $user       User that deletes
-	 * @param bool $notrigger  false=launch triggers after, true=disable triggers
-	 * @return int             <0 if KO, >0 if OK
-	 */
-	public function delete(User $user, $notrigger = false)
-	{
-		return $this->deleteCommon($user, $notrigger);
-	}
-
-	/**
-	 *  Return a link to the object card (with optionaly the picto)
-	 *
-	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
-	 *	@return	string								String with URL
-	 */
-	function getNomUrl($withpicto=0)
-	{
-		global $db, $conf, $langs;
-		global $dolibarr_main_authentication, $dolibarr_main_demo;
-		global $menumanager;
-
-		$result = '';
-		$companylink = '';
+    public $email;
+    public $date_creation;
+    public $tms;
+    //public $fk_user_creat;
+    //public $fk_user_modif;
+    public $signature;
+    public $position;
+    public $active;
+    // END MODULEBUILDER PROPERTIES
+
+
+
+    // If this object has a subtable with lines
+
+    /**
+     * @var int    Name of subtable line
+     */
+    //public $table_element_line = 'emailsenderprofiledet';
+    /**
+     * @var int    Field with ID of parent key if this field has a parent
+     */
+    //public $fk_element = 'fk_emailsenderprofile';
+    /**
+     * @var int    Name of subtable class that manage subtable lines
+     */
+    //public $class_element_line = 'EmailSenderProfileline';
+    /**
+     * @var array  Array of child tables (child tables to delete before deleting a record)
+     */
+    //protected $childtables=array('emailsenderprofiledet');
+    /**
+     * @var EmailSenderProfileLine[]     Array of subtable lines
+     */
+    //public $lines = array();
+
+
+
+    /**
+     * Constructor
+     *
+     * @param DoliDb $db Database handler
+     */
+    public function __construct(DoliDB $db)
+    {
+        global $conf;
+
+        $this->db = $db;
+
+        if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
+        if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+    }
+
+    /**
+     * Create object into database
+     *
+     * @param  User $user      User that creates
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, Id of created object if OK
+     */
+    public function create(User $user, $notrigger = false)
+    {
+        return $this->createCommon($user, $notrigger);
+    }
+
+    /**
+     * Clone and object into another one
+     *
+     * @param  	User 	$user      	User that creates
+     * @param  	int 	$fromid     Id of object to clone
+     * @return 	mixed 				New object created, <0 if KO
+     */
+    public function createFromClone(User $user, $fromid)
+    {
+        global $hookmanager, $langs;
+        $error = 0;
+
+        dol_syslog(__METHOD__, LOG_DEBUG);
+
+        $object = new self($this->db);
+
+        $this->db->begin();
+
+        // Load source object
+        $object->fetchCommon($fromid);
+        // Reset some properties
+        unset($object->id);
+        unset($object->fk_user_creat);
+        unset($object->import_key);
+
+        // Clear fields
+        $object->ref = "copy_of_".$object->ref;
+        $object->title = $langs->trans("CopyOf")." ".$object->title;
+        // ...
+
+        // Create clone
+        $object->context['createfromclone'] = 'createfromclone';
+        $result = $object->createCommon($user);
+        if ($result < 0) {
+            $error++;
+            $this->error = $object->error;
+            $this->errors = $object->errors;
+        }
+
+        // End
+        if (!$error) {
+            $this->db->commit();
+            return $object;
+        } else {
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     * Load object in memory from the database
+     *
+     * @param int    $id   Id object
+     * @param string $ref  Ref
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetch($id, $ref = null)
+    {
+        $result = $this->fetchCommon($id, $ref);
+        if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+        return $result;
+    }
+
+    /**
+     * Load object lines in memory from the database
+     *
+     * @return int         <0 if KO, 0 if not found, >0 if OK
+     */
+    public function fetchLines()
+    {
+        $this->lines=array();
+
+        // Load lines with object EmailSenderProfileLine
+
+        return count($this->lines)?1:0;
+    }
+
+    /**
+     * Update object into database
+     *
+     * @param  User $user      User that modifies
+     * @param  bool $notrigger false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function update(User $user, $notrigger = false)
+    {
+        return $this->updateCommon($user, $notrigger);
+    }
+
+    /**
+     * Delete object in database
+     *
+     * @param User $user       User that deletes
+     * @param bool $notrigger  false=launch triggers after, true=disable triggers
+     * @return int             <0 if KO, >0 if OK
+     */
+    public function delete(User $user, $notrigger = false)
+    {
+        return $this->deleteCommon($user, $notrigger);
+    }
+
+    /**
+     *  Return a link to the object card (with optionaly the picto)
+     *
+     *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
+     *	@return	string								String with URL
+     */
+    function getNomUrl($withpicto=0)
+    {
+        global $db, $conf, $langs;
+        global $dolibarr_main_authentication, $dolibarr_main_demo;
+        global $menumanager;
+
+        $result = '';
+        $companylink = '';
 
     $label=$this->label;
 
     $url='';
-		//$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
-
-		$linkstart = '';
-		$linkend='';
-
-		if ($withpicto)
-		{
-			$result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result.=' ';
-		}
-		$result.= $linkstart . $this->label . $linkend;
-		return $result;
-	}
-
-	/**
-	 * Return link to download file from a direct external access
-	 *
-	 * @param	int				$withpicto			Add download picto into link
-	 * @return	string			HTML link to file
-	 */
-	function getDirectExternalLink($withpicto=0)
-	{
-		return 'todo';
-	}
-
-	/**
-	 *  Retourne le libelle du status d'un user (actif, inactif)
-	 *
-	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
-	 *  @return	string 			       Label of status
-	 */
-	function getLibStatut($mode=0)
-	{
-		return $this->LibStatut($this->status,$mode);
-	}
+        //$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
+
+        $linkstart = '';
+        $linkend='';
+
+        if ($withpicto)
+        {
+            $result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
+            if ($withpicto != 2) $result.=' ';
+        }
+        $result.= $linkstart . $this->label . $linkend;
+        return $result;
+    }
+
+    /**
+     * Return link to download file from a direct external access
+     *
+     * @param	int				$withpicto			Add download picto into link
+     * @return	string			HTML link to file
+     */
+    function getDirectExternalLink($withpicto=0)
+    {
+        return 'todo';
+    }
+
+    /**
+     *  Retourne le libelle du status d'un user (actif, inactif)
+     *
+     *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
+     *  @return	string 			       Label of status
+     */
+    function getLibStatut($mode=0)
+    {
+        return $this->LibStatut($this->status,$mode);
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *  Return the status
-	 *
-	 *  @param	int		$status        	Id status
-	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
-	 *  @return string 			       	Label of status
-	 */
-	static function LibStatut($status,$mode=0)
-	{
-		global $langs;
-
-		if ($mode == 0 || $mode == 1)
-		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
-		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
-		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-	}
-
-	/**
-	 *	Charge les informations d'ordre info dans l'objet commande
-	 *
-	 *	@param  int		$id       Id of order
-	 *	@return	void
-	 */
-	function info($id)
-	{
-		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
-		if ($result)
-		{
-			if ($this->db->num_rows($result))
-			{
-				$obj = $this->db->fetch_object($result);
-				$this->id = $obj->rowid;
-				if ($obj->fk_user_author)
-				{
-					$cuser = new User($this->db);
-					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
-				}
-
-				if ($obj->fk_user_valid)
-				{
-					$vuser = new User($this->db);
-					$vuser->fetch($obj->fk_user_valid);
-					$this->user_validation = $vuser;
-				}
-
-				if ($obj->fk_user_cloture)
-				{
-					$cluser = new User($this->db);
-					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
-				}
-
-				$this->date_creation     = $this->db->jdate($obj->datec);
-				$this->date_modification = $this->db->jdate($obj->datem);
-				$this->date_validation   = $this->db->jdate($obj->datev);
-			}
-
-			$this->db->free($result);
-		}
-		else
-		{
-			dol_print_error($this->db);
-		}
-	}
-
-	/**
-	 * Initialise object with example values
-	 * Id must be 0 if object instance is a specimen
-	 *
-	 * @return void
-	 */
-	public function initAsSpecimen()
-	{
-		$this->initAsSpecimenCommon();
-	}
+    /**
+     *  Return the status
+     *
+     *  @param	int		$status        	Id status
+     *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
+     *  @return string 			       	Label of status
+     */
+    static function LibStatut($status,$mode=0)
+    {
+        global $langs;
+
+        if ($mode == 0 || $mode == 1)
+        {
+            if ($status == 1) return $langs->trans('Enabled');
+            if ($status == 0) return $langs->trans('Disabled');
+        }
+        elseif ($mode == 2)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 3)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 4)
+        {
+            if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+            if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+        }
+        elseif ($mode == 5)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+        elseif ($mode == 6)
+        {
+            if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+            if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+        }
+    }
+
+    /**
+     *	Charge les informations d'ordre info dans l'objet commande
+     *
+     *	@param  int		$id       Id of order
+     *	@return	void
+     */
+    function info($id)
+    {
+        $sql = 'SELECT rowid, date_creation as datec, tms as datem,';
+        $sql.= ' fk_user_creat, fk_user_modif';
+        $sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+        $sql.= ' WHERE t.rowid = '.$id;
+        $result=$this->db->query($sql);
+        if ($result)
+        {
+            if ($this->db->num_rows($result))
+            {
+                $obj = $this->db->fetch_object($result);
+                $this->id = $obj->rowid;
+                if ($obj->fk_user_author)
+                {
+                    $cuser = new User($this->db);
+                    $cuser->fetch($obj->fk_user_author);
+                    $this->user_creation   = $cuser;
+                }
+
+                if ($obj->fk_user_valid)
+                {
+                    $vuser = new User($this->db);
+                    $vuser->fetch($obj->fk_user_valid);
+                    $this->user_validation = $vuser;
+                }
+
+                if ($obj->fk_user_cloture)
+                {
+                    $cluser = new User($this->db);
+                    $cluser->fetch($obj->fk_user_cloture);
+                    $this->user_cloture   = $cluser;
+                }
+
+                $this->date_creation     = $this->db->jdate($obj->datec);
+                $this->date_modification = $this->db->jdate($obj->datem);
+                $this->date_validation   = $this->db->jdate($obj->datev);
+            }
+
+            $this->db->free($result);
+        }
+        else
+        {
+            dol_print_error($this->db);
+        }
+    }
+
+    /**
+     * Initialise object with example values
+     * Id must be 0 if object instance is a specimen
+     *
+     * @return void
+     */
+    public function initAsSpecimen()
+    {
+        $this->initAsSpecimenCommon();
+    }
 }
 
 /**

Spacing +34 added lines, -34 removed lines

@@ -26,7 +26,7 @@ 
  */
 
 // Put here all includes required by your class file
-require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php';
 //require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
 
@@ -75,7 +75,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'visible'=>-1, 'enabled'=>1, 'position'=>1, 'notnull'=>1, 'index'=>1, 'comment'=>'Id',),
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'visible'=>-1, 'enabled'=>1, 'position'=>20, 'notnull'=>1, 'index'=>1,),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'notnull'=>-1),
@@ -152,8 +152,8 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible'] = 0;
+		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled'] = 0;
 	}
 
 	/**
@@ -227,7 +227,7 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && !empty($this->table_element_line)) $this->fetchLines();
 		return $result;
 	}
 
@@ -238,11 +238,11 @@ 
 	 */
 	public function fetchLines()
 	{
-		$this->lines=array();
+		$this->lines = array();
 
 		// Load lines with object EmailSenderProfileLine
 
-		return count($this->lines)?1:0;
+		return count($this->lines) ? 1 : 0;
 	}
 
 	/**
@@ -275,7 +275,7 @@ 
 	 *	@param	int		$withpicto					Include picto in link (0=No picto, 1=Include picto into link, 2=Only picto)
 	 *	@return	string								String with URL
 	 */
-	function getNomUrl($withpicto=0)
+	function getNomUrl($withpicto = 0)
 	{
 		global $db, $conf, $langs;
 		global $dolibarr_main_authentication, $dolibarr_main_demo;
@@ -284,20 +284,20 @@ 
 		$result = '';
 		$companylink = '';
 
-    $label=$this->label;
+    $label = $this->label;
 
-    $url='';
+    $url = '';
 		//$url = dol_buildpath('/monmodule/emailsenderprofile_card.php',1).'?id='.$this->id;
 
 		$linkstart = '';
-		$linkend='';
+		$linkend = '';
 
 		if ($withpicto)
 		{
-			$result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result.=' ';
+			$result .= ($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
+			if ($withpicto != 2) $result .= ' ';
 		}
-		$result.= $linkstart . $this->label . $linkend;
+		$result .= $linkstart.$this->label.$linkend;
 		return $result;
 	}
 
@@ -307,7 +307,7 @@ 
 	 * @param	int				$withpicto			Add download picto into link
 	 * @return	string			HTML link to file
 	 */
-	function getDirectExternalLink($withpicto=0)
+	function getDirectExternalLink($withpicto = 0)
 	{
 		return 'todo';
 	}
@@ -318,9 +318,9 @@ 
 	 *  @param	int		$mode          0=libelle long, 1=libelle court, 2=Picto + Libelle court, 3=Picto, 4=Picto + Libelle long, 5=Libelle court + Picto
 	 *  @return	string 			       Label of status
 	 */
-	function getLibStatut($mode=0)
+	function getLibStatut($mode = 0)
 	{
-		return $this->LibStatut($this->status,$mode);
+		return $this->LibStatut($this->status, $mode);
 	}
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
@@ -331,7 +331,7 @@ 
 	 *  @param  int		$mode          	0=long label, 1=short label, 2=Picto + short label, 3=Picto, 4=Picto + long label, 5=Short label + Picto, 6=Long label + Picto
 	 *  @return string 			       	Label of status
 	 */
-	static function LibStatut($status,$mode=0)
+	static function LibStatut($status, $mode = 0)
 	{
 		global $langs;
 
@@ -342,28 +342,28 @@ 
 		}
 		elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			if ($status == 1) return img_picto($langs->trans('Enabled'), 'statut4').' '.$langs->trans('Enabled');
+			if ($status == 0) return img_picto($langs->trans('Disabled'), 'statut5').' '.$langs->trans('Disabled');
 		}
 		elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 		elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'), 'statut4');
+			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'), 'statut5');
 		}
 	}
 
@@ -376,10 +376,10 @@ 
 	function info($id)
 	{
 		$sql = 'SELECT rowid, date_creation as datec, tms as datem,';
-		$sql.= ' fk_user_creat, fk_user_modif';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
-		$sql.= ' WHERE t.rowid = '.$id;
-		$result=$this->db->query($sql);
+		$sql .= ' fk_user_creat, fk_user_modif';
+		$sql .= ' FROM '.MAIN_DB_PREFIX.$this->table_element.' as t';
+		$sql .= ' WHERE t.rowid = '.$id;
+		$result = $this->db->query($sql);
 		if ($result)
 		{
 			if ($this->db->num_rows($result))
@@ -390,7 +390,7 @@ 
 				{
 					$cuser = new User($this->db);
 					$cuser->fetch($obj->fk_user_author);
-					$this->user_creation   = $cuser;
+					$this->user_creation = $cuser;
 				}
 
 				if ($obj->fk_user_valid)
@@ -404,7 +404,7 @@ 
 				{
 					$cluser = new User($this->db);
 					$cluser->fetch($obj->fk_user_cloture);
-					$this->user_cloture   = $cluser;
+					$this->user_cloture = $cluser;
 				}
 
 				$this->date_creation     = $this->db->jdate($obj->datec);

Braces +54 added lines, -28 removed lines

@@ -152,8 +152,12 @@ 
 
 		$this->db = $db;
 
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) $this->fields['rowid']['visible']=0;
-		if (empty($conf->multicompany->enabled)) $this->fields['entity']['enabled']=0;
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID)) {
+		    $this->fields['rowid']['visible']=0;
+		}
+		if (empty($conf->multicompany->enabled)) {
+		    $this->fields['entity']['enabled']=0;
+		}
 	}
 
 	/**
@@ -227,7 +231,9 @@ 
 	public function fetch($id, $ref = null)
 	{
 		$result = $this->fetchCommon($id, $ref);
-		if ($result > 0 && ! empty($this->table_element_line)) $this->fetchLines();
+		if ($result > 0 && ! empty($this->table_element_line)) {
+		    $this->fetchLines();
+		}
 		return $result;
 	}
 
@@ -295,7 +301,9 @@ 
 		if ($withpicto)
 		{
 			$result.=($linkstart.img_object($label, 'label', 'class="classfortooltip"').$linkend);
-			if ($withpicto != 2) $result.=' ';
+			if ($withpicto != 2) {
+			    $result.=' ';
+			}
 		}
 		$result.= $linkstart . $this->label . $linkend;
 		return $result;
@@ -337,33 +345,52 @@ 
 
 		if ($mode == 0 || $mode == 1)
 		{
-			if ($status == 1) return $langs->trans('Enabled');
-			if ($status == 0) return $langs->trans('Disabled');
-		}
-		elseif ($mode == 2)
+			if ($status == 1) {
+			    return $langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled');
+			}
+		} elseif ($mode == 2)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 3)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 3)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 4)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 4)
 		{
-			if ($status == 1) return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
-			if ($status == 0) return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
-		}
-		elseif ($mode == 5)
+			if ($status == 1) {
+			    return img_picto($langs->trans('Enabled'),'statut4').' '.$langs->trans('Enabled');
+			}
+			if ($status == 0) {
+			    return img_picto($langs->trans('Disabled'),'statut5').' '.$langs->trans('Disabled');
+			}
+		} elseif ($mode == 5)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
-		}
-		elseif ($mode == 6)
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
+		} elseif ($mode == 6)
 		{
-			if ($status == 1) return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
-			if ($status == 0) return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			if ($status == 1) {
+			    return $langs->trans('Enabled').' '.img_picto($langs->trans('Enabled'),'statut4');
+			}
+			if ($status == 0) {
+			    return $langs->trans('Disabled').' '.img_picto($langs->trans('Disabled'),'statut5');
+			}
 		}
 	}
 
@@ -413,8 +440,7 @@ 
 			}
 
 			$this->db->free($result);
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 		}

dolibarr/htdocs/core/class/html.formwebsite.class.php

Indentation +83 added lines, -83 removed lines

@@ -30,9 +30,9 @@ 
     private $db;
 
     /**
-	 * @var string Error code (or message)
-	 */
-	public $error;
+     * @var string Error code (or message)
+     */
+    public $error;
 
 
     /**
@@ -56,7 +56,7 @@ 
      */
     function selectWebsite($selected='',$htmlname='exportmodelid',$useempty=0)
     {
-    	$out='';
+        $out='';
 
         $sql = "SELECT rowid, ref";
         $sql.= " FROM ".MAIN_DB_PREFIX."website";
@@ -109,55 +109,55 @@ 
      */
     function selectTypeOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
     {
-    	global $langs, $conf, $user;
-
-    	$langs->load("admin");
-
-    	$sql = "SELECT rowid, code, label, entity";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-    	$sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-    	$sql.= " ORDER BY label";
-
-    	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
-    	$result = $this->db->query($sql);
-    	if ($result)
-    	{
-    		$num = $this->db->num_rows($result);
-    		$i = 0;
-    		if ($num)
-    		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-    			if ($useempty == 1 || ($useempty == 2 && $num > 1))
-    			{
-    				print '<option value="-1">&nbsp;</option>';
-    			}
-
-    			while ($i < $num)
-    			{
-    				$obj = $this->db->fetch_object($result);
-    				if ($selected == $obj->rowid || $selected == $obj->code)
-    				{
-    					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
-    				{
-    					print '<option value="'.$obj->code.'">';
-    				}
-    				print $obj->label;
-    				print '</option>';
-    				$i++;
-    			}
-    			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-    		}
-    		else
-    		{
-    			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
-    		}
-    	}
-    	else {
-    		dol_print_error($this->db);
-    	}
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+
+        $sql = "SELECT rowid, code, label, entity";
+        $sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+        $sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+        $sql.= " ORDER BY label";
+
+        dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            if ($num)
+            {
+                print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+                if ($useempty == 1 || ($useempty == 2 && $num > 1))
+                {
+                    print '<option value="-1">&nbsp;</option>';
+                }
+
+                while ($i < $num)
+                {
+                    $obj = $this->db->fetch_object($result);
+                    if ($selected == $obj->rowid || $selected == $obj->code)
+                    {
+                        print '<option value="'.$obj->code.'" selected>';
+                    }
+                    else
+                    {
+                        print '<option value="'.$obj->code.'">';
+                    }
+                    print $obj->label;
+                    print '</option>';
+                    $i++;
+                }
+                print "</select>";
+                if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+            }
+            else
+            {
+                print $langs->trans("NoTypeOfPagePleaseEditDictionary");
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
     }
 
 
@@ -172,35 +172,35 @@ 
      */
     function selectSampleOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
     {
-    	global $langs, $conf, $user;
-
-    	$langs->load("admin");
-
-    	$arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
-
-    	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
-
-    	if ($useempty == 1 || $useempty == 2)
-    	{
-    		$out .= '<option value="-1">&nbsp;</option>';
-    	}
-
-    	foreach($arrayofsamples as $key => $val)
-    	{
-    		if ($selected == $key)
-    		{
-    			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
-    		{
-    			$out .= '<option value="'.$key.'">';
-    		}
-    		$out .= $langs->trans($val);
-    		$out .= '</option>';
-    	}
-    	$out .= "</select>";
-
-    	return $out;
+        global $langs, $conf, $user;
+
+        $langs->load("admin");
+
+        $arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
+
+        $out = '';
+        $out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+
+        if ($useempty == 1 || $useempty == 2)
+        {
+            $out .= '<option value="-1">&nbsp;</option>';
+        }
+
+        foreach($arrayofsamples as $key => $val)
+        {
+            if ($selected == $key)
+            {
+                $out .= '<option value="'.$key.'" selected>';
+            }
+            else
+            {
+                $out .= '<option value="'.$key.'">';
+            }
+            $out .= $langs->trans($val);
+            $out .= '</option>';
+        }
+        $out .= "</select>";
+
+        return $out;
     }
 }

Spacing +22 added lines, -22 removed lines

@@ -54,21 +54,21 @@ 
      *    @param    int		$useempty          Show empty value or not
      *    @return	string					   Html component
      */
-    function selectWebsite($selected='',$htmlname='exportmodelid',$useempty=0)
+    function selectWebsite($selected = '', $htmlname = 'exportmodelid', $useempty = 0)
     {
-    	$out='';
+    	$out = '';
 
         $sql = "SELECT rowid, ref";
-        $sql.= " FROM ".MAIN_DB_PREFIX."website";
-        $sql.= " WHERE 1 = 1";
-        $sql.= " ORDER BY rowid";
+        $sql .= " FROM ".MAIN_DB_PREFIX."website";
+        $sql .= " WHERE 1 = 1";
+        $sql .= " ORDER BY rowid";
         $result = $this->db->query($sql);
         if ($result)
         {
-            $out.='<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
+            $out .= '<select class="flat minwidth100" name="'.$htmlname.'" id="'.$htmlname.'">';
             if ($useempty)
             {
-                $out.='<option value="-1">&nbsp;</option>';
+                $out .= '<option value="-1">&nbsp;</option>';
             }
 
             $num = $this->db->num_rows($result);
@@ -78,17 +78,17 @@ 
                 $obj = $this->db->fetch_object($result);
                 if ($selected == $obj->rowid)
                 {
-                    $out.='<option value="'.$obj->rowid.'" selected>';
+                    $out .= '<option value="'.$obj->rowid.'" selected>';
                 }
                 else
                 {
-                    $out.='<option value="'.$obj->rowid.'">';
+                    $out .= '<option value="'.$obj->rowid.'">';
                 }
-                $out.=$obj->ref;
-                $out.='</option>';
+                $out .= $obj->ref;
+                $out .= '</option>';
                 $i++;
             }
-            $out.="</select>";
+            $out .= "</select>";
         }
         else {
             dol_print_error($this->db);
@@ -107,16 +107,16 @@ 
      *  @param  string  $moreattrib         More attributes on HTML select tag
      * 	@return	void
      */
-    function selectTypeOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
+    function selectTypeOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
     {
     	global $langs, $conf, $user;
 
     	$langs->load("admin");
 
     	$sql = "SELECT rowid, code, label, entity";
-    	$sql.= " FROM ".MAIN_DB_PREFIX.'c_type_container';
-    	$sql.= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
-    	$sql.= " ORDER BY label";
+    	$sql .= " FROM ".MAIN_DB_PREFIX.'c_type_container';
+    	$sql .= " WHERE active = 1 AND entity IN (".getEntity('c_type_container').")";
+    	$sql .= " ORDER BY label";
 
     	dol_syslog(get_class($this)."::selectTypeOfContainer", LOG_DEBUG);
     	$result = $this->db->query($sql);
@@ -126,7 +126,7 @@ 
     		$i = 0;
     		if ($num)
     		{
-    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    			print '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
     			if ($useempty == 1 || ($useempty == 2 && $num > 1))
     			{
     				print '<option value="-1">&nbsp;</option>';
@@ -148,7 +148,7 @@ 
     				$i++;
     			}
     			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"), 1);
     		}
     		else
     		{
@@ -170,23 +170,23 @@ 
      *  @param  string  $moreattrib         More attributes on HTML select tag
      * 	@return	void
      */
-    function selectSampleOfContainer($htmlname, $selected='', $useempty=0, $moreattrib='')
+    function selectSampleOfContainer($htmlname, $selected = '', $useempty = 0, $moreattrib = '')
     {
     	global $langs, $conf, $user;
 
     	$langs->load("admin");
 
-    	$arrayofsamples=array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
+    	$arrayofsamples = array('empty'=>'EmptyPage', 'corporatehome'=>'CorporateHomePage');
 
     	$out = '';
-    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib?' '.$moreattrib:'').'>';
+    	$out .= '<select id="select'.$htmlname.'" class="flat selectTypeOfContainer" name="'.$htmlname.'"'.($moreattrib ? ' '.$moreattrib : '').'>';
 
     	if ($useempty == 1 || $useempty == 2)
     	{
     		$out .= '<option value="-1">&nbsp;</option>';
     	}
 
-    	foreach($arrayofsamples as $key => $val)
+    	foreach ($arrayofsamples as $key => $val)
     	{
     		if ($selected == $key)
     		{

Braces +9 added lines, -13 removed lines

@@ -79,8 +79,7 @@ 
                 if ($selected == $obj->rowid)
                 {
                     $out.='<option value="'.$obj->rowid.'" selected>';
-                }
-                else
+                } else
                 {
                     $out.='<option value="'.$obj->rowid.'">';
                 }
@@ -89,8 +88,7 @@ 
                 $i++;
             }
             $out.="</select>";
-        }
-        else {
+        } else {
             dol_print_error($this->db);
         }
 
@@ -138,8 +136,7 @@ 
     				if ($selected == $obj->rowid || $selected == $obj->code)
     				{
     					print '<option value="'.$obj->code.'" selected>';
-    				}
-    				else
+    				} else
     				{
     					print '<option value="'.$obj->code.'">';
     				}
@@ -148,14 +145,14 @@ 
     				$i++;
     			}
     			print "</select>";
-    			if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
-    		}
-    		else
+    			if ($user->admin) {
+    			    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+    			}
+    		} else
     		{
     			print $langs->trans("NoTypeOfPagePleaseEditDictionary");
     		}
-    	}
-    	else {
+    	} else {
     		dol_print_error($this->db);
     	}
     }
@@ -191,8 +188,7 @@ 
     		if ($selected == $key)
     		{
     			$out .= '<option value="'.$key.'" selected>';
-    		}
-    		else
+    		} else
     		{
     			$out .= '<option value="'.$key.'">';
     		}

dolibarr/htdocs/core/actions_addupdatedelete.inc.php

Indentation +158 added lines, -158 removed lines

@@ -32,187 +32,187 @@
 
 if ($cancel)
 {
-	if (! empty($backtopage))
-	{
-		header("Location: ".$backtopage);
-		exit;
-	}
-	$action='';
+    if (! empty($backtopage))
+    {
+        header("Location: ".$backtopage);
+        exit;
+    }
+    $action='';
 }
 
 // Action to add record
 if ($action == 'add' && ! empty($permissiontoadd))
 {
-	foreach ($object->fields as $key => $val)
-	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
-
-		// Set value to insert
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
-			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
-			$value = price2num(GETPOST($key));
-		} else {
-			$value = GETPOST($key,'alpha');
-		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
-
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-		}
-	}
-
-	if (! $error)
-	{
-		$result=$object->create($user);
-		if ($result > 0)
-		{
-			// Creation OK
-			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
-			header("Location: ".$urltogo);
-			exit;
-		}
-		else
-		{
-			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
-		}
-	}
-	else
-	{
-		$action='create';
-	}
+    foreach ($object->fields as $key => $val)
+    {
+        if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+
+        // Set value to insert
+        if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
+            $value = GETPOST($key,'none');
+        } elseif ($object->fields[$key]['type']=='date') {
+            $value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='datetime') {
+            $value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='price') {
+            $value = price2num(GETPOST($key));
+        } else {
+            $value = GETPOST($key,'alpha');
+        }
+        if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
+        if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+
+        $object->$key=$value;
+        if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $result=$object->create($user);
+        if ($result > 0)
+        {
+            // Creation OK
+            $urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
+            header("Location: ".$urltogo);
+            exit;
+        }
+        else
+        {
+            // Creation KO
+            if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+            else  setEventMessages($object->error, null, 'errors');
+            $action='create';
+        }
+    }
+    else
+    {
+        $action='create';
+    }
 }
 
 // Action to update record
 if ($action == 'update' && ! empty($permissiontoadd))
 {
-	foreach ($object->fields as $key => $val)
-	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
-
-		// Set value to update
-		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
-			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
-			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
-			$value = price2num(GETPOST($key));
-		} else {
-			$value = GETPOST($key,'alpha');
-		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
-
-		$object->$key=$value;
-		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
-		{
-			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
-		}
-	}
-
-	if (! $error)
-	{
-		$result=$object->update($user);
-		if ($result > 0)
-		{
-			$action='view';
-		}
-		else
-		{
-			// Creation KO
-			setEventMessages($object->error, $object->errors, 'errors');
-			$action='edit';
-		}
-	}
-	else
-	{
-		$action='edit';
-	}
+    foreach ($object->fields as $key => $val)
+    {
+        if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
+        if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+
+        // Set value to update
+        if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
+            $value = GETPOST($key,'none');
+        } elseif ($object->fields[$key]['type']=='date') {
+            $value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='datetime') {
+            $value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
+        } elseif ($object->fields[$key]['type']=='price') {
+            $value = price2num(GETPOST($key));
+        } else {
+            $value = GETPOST($key,'alpha');
+        }
+        if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
+        if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+
+        $object->$key=$value;
+        if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
+        {
+            $error++;
+            setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+        }
+    }
+
+    if (! $error)
+    {
+        $result=$object->update($user);
+        if ($result > 0)
+        {
+            $action='view';
+        }
+        else
+        {
+            // Creation KO
+            setEventMessages($object->error, $object->errors, 'errors');
+            $action='edit';
+        }
+    }
+    else
+    {
+        $action='edit';
+    }
 }
 
 // Action to update one extrafield
 if ($action == "update_extras" && ! empty($permissiontoadd))
 {
-	$object->fetch(GETPOST('id','int'));
-	$attributekey = GETPOST('attribute','alpha');
-	$attributekeylong = 'options_'.$attributekey;
-	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
-
-	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
-	if ($result > 0)
-	{
-		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
-		$action = 'view';
-	}
-	else
-	{
-		setEventMessages($object->error, $object->errors, 'errors');
-		$action = 'edit_extras';
-	}
+    $object->fetch(GETPOST('id','int'));
+    $attributekey = GETPOST('attribute','alpha');
+    $attributekeylong = 'options_'.$attributekey;
+    $object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+
+    $result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+    if ($result > 0)
+    {
+        setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
+        $action = 'view';
+    }
+    else
+    {
+        setEventMessages($object->error, $object->errors, 'errors');
+        $action = 'edit_extras';
+    }
 }
 
 // Action to delete
 if ($action == 'confirm_delete' && ! empty($permissiontodelete))
 {
-	$result=$object->delete($user);
-	if ($result > 0)
-	{
-		// Delete OK
-		setEventMessages("RecordDeleted", null, 'mesgs');
-		header("Location: ".$backurlforlist);
-		exit;
-	}
-	else
-	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-		else setEventMessages($object->error, null, 'errors');
-	}
+    $result=$object->delete($user);
+    if ($result > 0)
+    {
+        // Delete OK
+        setEventMessages("RecordDeleted", null, 'mesgs');
+        header("Location: ".$backurlforlist);
+        exit;
+    }
+    else
+    {
+        if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+        else setEventMessages($object->error, null, 'errors');
+    }
 }
 
 // Action clone object
 if ($action == 'confirm_clone' && $confirm == 'yes' && ! empty($permissiontoadd))
 {
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
-	{
-		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
-	{
-		if ($object->id > 0)
-		{
-			// Because createFromClone modifies the object, we must clone it so that we can restore it later
-			$orig = clone $object;
-
-			$result=$object->createFromClone($user, $object->id);
-			if ($result > 0)
-			{
-				$newid = 0;
-				if (is_object($result)) $newid = $result->id;
-				else $newid = $result;
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
-				exit;
-			}
-			else
-			{
-				setEventMessages($object->error, $object->errors, 'errors');
-				$object = $orig;
-				$action='';
-			}
-		}
-	}
+    if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+    {
+        setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
+    }
+    else
+    {
+        if ($object->id > 0)
+        {
+            // Because createFromClone modifies the object, we must clone it so that we can restore it later
+            $orig = clone $object;
+
+            $result=$object->createFromClone($user, $object->id);
+            if ($result > 0)
+            {
+                $newid = 0;
+                if (is_object($result)) $newid = $result->id;
+                else $newid = $result;
+                header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
+                exit;
+            }
+            else
+            {
+                setEventMessages($object->error, $object->errors, 'errors');
+                $object = $orig;
+                $action='';
+            }
+        }
+    }
 }

Spacing +49 added lines, -49 removed lines

@@ -32,128 +32,128 @@ 
 
 if ($cancel)
 {
-	if (! empty($backtopage))
+	if (!empty($backtopage))
 	{
 		header("Location: ".$backtopage);
 		exit;
 	}
-	$action='';
+	$action = '';
 }
 
 // Action to add record
-if ($action == 'add' && ! empty($permissiontoadd))
+if ($action == 'add' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+			$value = GETPOST($key, 'none');
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
+		} elseif ($object->fields[$key]['type'] == 'price') {
 			$value = price2num(GETPOST($key));
 		} else {
-			$value = GETPOST($key,'alpha');
+			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
+		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->create($user);
+		$result = $object->create($user);
 		if ($result > 0)
 		{
 			// Creation OK
-			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
+			$urltogo = $backtopage ?str_replace('__ID__', $result, $backtopage) : $backurlforlist;
 			header("Location: ".$urltogo);
 			exit;
 		}
 		else
 		{
 			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+			if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 			else  setEventMessages($object->error, null, 'errors');
-			$action='create';
+			$action = 'create';
 		}
 	}
 	else
 	{
-		$action='create';
+		$action = 'create';
 	}
 }
 
 // Action to update record
-if ($action == 'update' && ! empty($permissiontoadd))
+if ($action == 'update' && !empty($permissiontoadd))
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (!GETPOSTISSET($key)) continue; // The field was not submited to be edited
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue; // Ignore special fields
 
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
-			$value = GETPOST($key,'none');
-		} elseif ($object->fields[$key]['type']=='date') {
+			$value = GETPOST($key, 'none');
+		} elseif ($object->fields[$key]['type'] == 'date') {
 			$value = dol_mktime(12, 0, 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='datetime') {
+		} elseif ($object->fields[$key]['type'] == 'datetime') {
 			$value = dol_mktime(GETPOST($key.'hour'), GETPOST($key.'min'), 0, GETPOST($key.'month'), GETPOST($key.'day'), GETPOST($key.'year'));
-		} elseif ($object->fields[$key]['type']=='price') {
+		} elseif ($object->fields[$key]['type'] == 'price') {
 			$value = price2num(GETPOST($key));
 		} else {
-			$value = GETPOST($key,'alpha');
+			$value = GETPOST($key, 'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value = ''; // This is an implicit foreign key field
+		if (!empty($object->fields[$key]['foreignkey']) && $value == '-1') $value = ''; // This is an explicit foreign key field
 
-		$object->$key=$value;
+		$object->$key = $value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
 		{
 			$error++;
-			setEventMessages($langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv($val['label'])), null, 'errors');
+			setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv($val['label'])), null, 'errors');
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
-		$result=$object->update($user);
+		$result = $object->update($user);
 		if ($result > 0)
 		{
-			$action='view';
+			$action = 'view';
 		}
 		else
 		{
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
-			$action='edit';
+			$action = 'edit';
 		}
 	}
 	else
 	{
-		$action='edit';
+		$action = 'edit';
 	}
 }
 
 // Action to update one extrafield
-if ($action == "update_extras" && ! empty($permissiontoadd))
+if ($action == "update_extras" && !empty($permissiontoadd))
 {
-	$object->fetch(GETPOST('id','int'));
-	$attributekey = GETPOST('attribute','alpha');
+	$object->fetch(GETPOST('id', 'int'));
+	$attributekey = GETPOST('attribute', 'alpha');
 	$attributekeylong = 'options_'.$attributekey;
-	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong,' alpha');
+	$object->array_options['options_'.$attributekey] = GETPOST($attributekeylong, ' alpha');
 
-	$result = $object->insertExtraFields(empty($triggermodname)?'':$triggermodname, $user);
+	$result = $object->insertExtraFields(empty($triggermodname) ? '' : $triggermodname, $user);
 	if ($result > 0)
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
@@ -167,9 +167,9 @@ 
 }
 
 // Action to delete
-if ($action == 'confirm_delete' && ! empty($permissiontodelete))
+if ($action == 'confirm_delete' && !empty($permissiontodelete))
 {
-	$result=$object->delete($user);
+	$result = $object->delete($user);
 	if ($result > 0)
 	{
 		// Delete OK
@@ -179,15 +179,15 @@ 
 	}
 	else
 	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
+		if (!empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
 		else setEventMessages($object->error, null, 'errors');
 	}
 }
 
 // Action clone object
-if ($action == 'confirm_clone' && $confirm == 'yes' && ! empty($permissiontoadd))
+if ($action == 'confirm_clone' && $confirm == 'yes' && !empty($permissiontoadd))
 {
-	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
+	if (1 == 0 && !GETPOST('clone_content') && !GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
 	}
@@ -198,20 +198,20 @@ 
 			// Because createFromClone modifies the object, we must clone it so that we can restore it later
 			$orig = clone $object;
 
-			$result=$object->createFromClone($user, $object->id);
+			$result = $object->createFromClone($user, $object->id);
 			if ($result > 0)
 			{
 				$newid = 0;
 				if (is_object($result)) $newid = $result->id;
 				else $newid = $result;
-				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
+				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid); // Open record of new object
 				exit;
 			}
 			else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$object = $orig;
-				$action='';
+				$action = '';
 			}
 		}
 	}

Braces +51 added lines, -29 removed lines

@@ -45,7 +45,10 @@ 
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) {
+		    continue;
+		}
+		// Ignore special fields
 
 		// Set value to insert
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
@@ -59,8 +62,14 @@ 
 		} else {
 			$value = GETPOST($key,'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an implicit foreign key field
+		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an explicit foreign key field
 
 		$object->$key=$value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
@@ -79,16 +88,17 @@ 
 			$urltogo=$backtopage?str_replace('__ID__', $result, $backtopage):$backurlforlist;
 			header("Location: ".$urltogo);
 			exit;
-		}
-		else
+		} else
 		{
 			// Creation KO
-			if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-			else  setEventMessages($object->error, null, 'errors');
+			if (! empty($object->errors)) {
+			    setEventMessages(null, $object->errors, 'errors');
+			} else {
+			    setEventMessages($object->error, null, 'errors');
+			}
 			$action='create';
 		}
-	}
-	else
+	} else
 	{
 		$action='create';
 	}
@@ -99,8 +109,14 @@ 
 {
 	foreach ($object->fields as $key => $val)
 	{
-		if (! GETPOSTISSET($key)) continue;		// The field was not submited to be edited
-		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) continue;	// Ignore special fields
+		if (! GETPOSTISSET($key)) {
+		    continue;
+		}
+		// The field was not submited to be edited
+		if (in_array($key, array('rowid', 'entity', 'date_creation', 'tms', 'fk_user_creat', 'fk_user_modif', 'import_key'))) {
+		    continue;
+		}
+		// Ignore special fields
 
 		// Set value to update
 		if (in_array($object->fields[$key]['type'], array('text', 'html'))) {
@@ -114,8 +130,14 @@ 
 		} else {
 			$value = GETPOST($key,'alpha');
 		}
-		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') $value='';		// This is an implicit foreign key field
-		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') $value='';					// This is an explicit foreign key field
+		if (preg_match('/^integer:/i', $object->fields[$key]['type']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an implicit foreign key field
+		if (! empty($object->fields[$key]['foreignkey']) && $value == '-1') {
+		    $value='';
+		}
+		// This is an explicit foreign key field
 
 		$object->$key=$value;
 		if ($val['notnull'] > 0 && $object->$key == '' && is_null($val['default']))
@@ -131,15 +153,13 @@ 
 		if ($result > 0)
 		{
 			$action='view';
-		}
-		else
+		} else
 		{
 			// Creation KO
 			setEventMessages($object->error, $object->errors, 'errors');
 			$action='edit';
 		}
-	}
-	else
+	} else
 	{
 		$action='edit';
 	}
@@ -158,8 +178,7 @@ 
 	{
 		setEventMessages($langs->trans('RecordSaved'), null, 'mesgs');
 		$action = 'view';
-	}
-	else
+	} else
 	{
 		setEventMessages($object->error, $object->errors, 'errors');
 		$action = 'edit_extras';
@@ -176,11 +195,13 @@ 
 		setEventMessages("RecordDeleted", null, 'mesgs');
 		header("Location: ".$backurlforlist);
 		exit;
-	}
-	else
+	} else
 	{
-		if (! empty($object->errors)) setEventMessages(null, $object->errors, 'errors');
-		else setEventMessages($object->error, null, 'errors');
+		if (! empty($object->errors)) {
+		    setEventMessages(null, $object->errors, 'errors');
+		} else {
+		    setEventMessages($object->error, null, 'errors');
+		}
 	}
 }
 
@@ -190,8 +211,7 @@ 
 	if (1==0 && ! GETPOST('clone_content') && ! GETPOST('clone_receivers'))
 	{
 		setEventMessages($langs->trans("NoCloneOptionsSpecified"), null, 'errors');
-	}
-	else
+	} else
 	{
 		if ($object->id > 0)
 		{
@@ -202,12 +222,14 @@ 
 			if ($result > 0)
 			{
 				$newid = 0;
-				if (is_object($result)) $newid = $result->id;
-				else $newid = $result;
+				if (is_object($result)) {
+				    $newid = $result->id;
+				} else {
+				    $newid = $result;
+				}
 				header("Location: ".$_SERVER['PHP_SELF'].'?id='.$newid);	// Open record of new object
 				exit;
-			}
-			else
+			} else
 			{
 				setEventMessages($object->error, $object->errors, 'errors');
 				$object = $orig;