Dolibarr / dolibarr

htdocs/core/class/utils.class.php

Indentation +231 added lines, -231 removed lines

@@ -90,10 +90,10 @@ 
 
 		if ($choice=='logfile')
 		{
-		    // Define files log
+			// Define files log
 			if ($dolibarr_main_data_root)
 			{
-                $filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*$', 'install\.lock$');
+				$filesarray=dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*$', 'install\.lock$');
 			}
 
 			$filelog='';
@@ -105,7 +105,7 @@ 
 				$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');
 			}
@@ -121,24 +121,24 @@ 
 				//print "x ".$filesarray[$key]['fullname']."-".$filesarray[$key]['type']."<br>\n";
 				if ($filesarray[$key]['type'] == 'dir')
 				{
-				    $startcount=0;
-				    $tmpcountdeleted=0;
+					$startcount=0;
+					$tmpcountdeleted=0;
 					$result=dol_delete_dir_recursive($filesarray[$key]['fullname'], $startcount, 1, 0, $tmpcountdeleted);
-				    $count+=$result;
-				    $countdeleted+=$tmpcountdeleted;
+					$count+=$result;
+					$countdeleted+=$tmpcountdeleted;
 				}
 				elseif ($filesarray[$key]['type'] == 'file')
 				{
 					// If (file that is not logfile) or (if logfile with option logfile)
 					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
 					{
-					    $result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
-					    if ($result)
-					    {
-					        $count++;
-					        $countdeleted++;
-					    }
-					    else $counterror++;
+						$result=dol_delete_file($filesarray[$key]['fullname'], 1, 1);
+						if ($result)
+						{
+							$count++;
+							$countdeleted++;
+						}
+						else $counterror++;
 					}
 				}
 			}
@@ -154,8 +154,8 @@ 
 
 		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)':'');
 
@@ -189,29 +189,29 @@ 
 		// Check compression parameter
 		if (! in_array($compression, array('none', 'gz', 'bz', 'zip')))
 		{
-		    $langs->load("errors");
-		    $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $compression, "Compression");
-		    return -1;
+			$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('pgsql', 'mysql', 'mysqli','mysqlnobin')))
 		{
-		    $langs->load("errors");
-		    $this->error=$langs->transnoentitiesnoconv("ErrorBadValueForParameter", $type, "Basetype");
-		    return -1;
+			$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;
+			$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';
@@ -221,229 +221,229 @@ 
 		// 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='';
-
-		    // Debut appel methode execution
-		    $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)
-		    {
-		        $ok=0;
-		        dol_syslog("Run command ".$fullcommandcrypted);
-		        $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);
-		            @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'];
+			$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='';
+
+			// Debut appel methode execution
+			$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)
+			{
+				$ok=0;
+				dol_syslog("Run command ".$fullcommandcrypted);
+				$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);
+					@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')
-		    {
-		        backup_tables($outputfiletemp);
-		        dol_compress_file($outputfiletemp, $outputfile, $compression);
-		        unlink($outputfiletemp);
-		    }
-		    else
-		    {
-		        backup_tables($outputfile);
-		    }
-
-		    $this->output = "";
-		    $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => "");
+			$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')
+			{
+				backup_tables($outputfiletemp);
+				dol_compress_file($outputfiletemp, $outputfile, $compression);
+				unlink($outputfiletemp);
+			}
+			else
+			{
+				backup_tables($outputfile);
+			}
+
+			$this->output = "";
+			$this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => "");
 		}
 
 		// POSTGRESQL
 		if ($type == 'postgresql')
 		{
-		    $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))
+			$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;
+			$paramcrypted.=" -w ".$dolibarr_main_db_name;
+			$paramclear.=" -w ".$dolibarr_main_db_name;
 
-		    $this->output = "";
-		    $this->result = array("commandbackuplastdone" => "", "commandbackuptorun" => $command." ".$paramcrypted);
+			$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']);
-		    }
+			$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']);
+			}
 		}
 
 

Spacing +124 added lines, -124 removed lines

@@ -29,8 +29,8 @@ 
 {
 	var $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
@@ -50,7 +50,7 @@ 
 	 *  @param	string		$choice		Choice of purge mode ('tempfiles', '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;
 
@@ -59,80 +59,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$','','','',2);
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "directories", 1, '^temp$', '', '', '', 2);
 				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)
 			if ($dolibarr_main_data_root)
 			{
-				$filesarray=dol_dir_list($dolibarr_main_data_root,"all",0,'','install\.lock$');
+				$filesarray = dol_dir_list($dolibarr_main_data_root, "all", 0, '', 'install\.lock$');
 			}
 		}
 
-		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]*$', 'install\.lock$');
+                $filesarray = dol_dir_list($dolibarr_main_data_root, "files", 0, '.*\.log[\.0-9]*$', 'install\.lock$');
 			}
 
-			$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 logfile with option 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++;
@@ -144,7 +144,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);
@@ -154,13 +154,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
 	}
 
 
@@ -175,7 +175,7 @@ 
 	 *  @param  int         $keeplastnfiles    Keep only last n files (not used yet)
 	 *  @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)
+	function dumpDatabase($compression = 'none', $type = 'auto', $usedefault = 1, $file = 'auto', $keeplastnfiles = 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;
@@ -187,120 +187,120 @@ 
 		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('pgsql', 'mysql', 'mysqli','mysqlnobin')))
+		if (!in_array($type, array('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 = '';
 
 		    // Debut appel methode execution
-		    $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)
 		    {
-		        $ok=0;
+		        $ok = 0;
 		        dol_syslog("Run command ".$fullcommandcrypted);
 		        $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);
 
@@ -308,14 +308,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
@@ -325,23 +325,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);
-		            @rename($outputfile,$outputerror);
+		            @dol_delete_file($outputerror, 1);
+		            @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");
 		            }
 		        }
 		    }
@@ -359,9 +359,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');
 
@@ -383,51 +383,51 @@ 
 		// POSTGRESQL
 		if ($type == 'postgresql')
 		{
-		    $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);
@@ -437,8 +437,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;

Braces +169 added lines, -66 removed lines

@@ -60,7 +60,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')
 		{
@@ -73,7 +75,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
 					}
 				}
 			}
@@ -107,7 +112,9 @@ 
 				{
 				    if ($tmpcursor['fullname'] == $filelog) { $alreadyincluded=true; }
 				}
-				if (! $alreadyincluded) $filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				if (! $alreadyincluded) {
+					$filesarray[]=array('fullname'=>$filelog,'type'=>'file');
+				}
 			}
 		}
 
@@ -126,8 +133,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 logfile with option logfile)
 					if ($filesarray[$key]['fullname'] != $filelog || $choice=='logfile')
@@ -137,8 +143,9 @@ 
 					    {
 					        $count++;
 					        $countdeleted++;
+					    } else {
+					    	$counterror++;
 					    }
-					    else $counterror++;
 					}
 				}
 			}
@@ -155,9 +162,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
@@ -195,7 +205,9 @@ 
 		}
 
 		// Check type parameter
-		if ($type == 'auto') $type = $db->type;
+		if ($type == 'auto') {
+			$type = $db->type;
+		}
 		if (! in_array($type, array('pgsql', 'mysql', 'mysqli','mysqlnobin')))
 		{
 		    $langs->load("errors");
@@ -227,44 +239,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)
 		    }
@@ -282,9 +325,15 @@ 
 		    // Debut appel methode execution
 		    $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)
 		    {
@@ -297,21 +346,32 @@ 
 		            $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);
@@ -319,18 +379,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
@@ -360,8 +435,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');
 
@@ -370,8 +449,7 @@ 
 		        backup_tables($outputfiletemp);
 		        dol_compress_file($outputfiletemp, $outputfile, $compression);
 		        unlink($outputfiletemp);
-		    }
-		    else
+		    } else
 		    {
 		        backup_tables($outputfile);
 		    }
@@ -388,36 +466,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;
@@ -441,7 +542,9 @@ 
 		    foreach($tmpfiles as $key => $val)
 		    {
 		        $i++;
-		        if ($i <= $keeplastnfiles) continue;
+		        if ($i <= $keeplastnfiles) {
+		        	continue;
+		        }
 		        dol_delete_file($val['fullname']);
 		    }
 		}

htdocs/core/class/hookmanager.class.php

Indentation +135 added lines, -135 removed lines

@@ -33,8 +33,8 @@ 
 	var $error;
 	var $errors=array();
 
-    // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
-    var $contextarray=array();
+	// Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
+	var $contextarray=array();
 
 	// Array with instantiated classes
 	var $hooks=array();
@@ -73,9 +73,9 @@ 
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+		if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
 
-        // For backward compatibility
+		// For backward compatibility
 		if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
 
 		$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
@@ -86,8 +86,8 @@ 
 			{
 				foreach($arraycontext as $context)
 				{
-				    if (is_array($hooks)) $arrayhooks=$hooks;    // New system
-				    else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
+					if (is_array($hooks)) $arrayhooks=$hooks;    // New system
+					else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
 					if (in_array($context,$arrayhooks) || in_array('all',$arrayhooks))    // We instantiate action class only if hook is required
 					{
 						$path 		= '/'.$module.'/class/';
@@ -99,9 +99,9 @@ 
 						$resaction=dol_include_once($path.$actionfile);
 						if ($resaction)
 						{
-    						$controlclassname = 'Actions'.ucfirst($module);
-    						$actionInstance = new $controlclassname($this->db);
-    						$this->hooks[$context][$module] = $actionInstance;
+							$controlclassname = 'Actions'.ucfirst($module);
+							$actionInstance = new $controlclassname($this->db);
+							$this->hooks[$context][$module] = $actionInstance;
 						}
 					}
 				}
@@ -110,159 +110,159 @@ 
 		return 1;
 	}
 
-    /**
-     * 		Execute hooks (if they were initialized) for the given method
-     *
-     * 		@param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
-     * 	    @param		array	$parameters		Array of parameters
-     * 		@param		Object	$object			Object to use hooks on
-     * 	    @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
-     * 		@return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     * 											For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
-     *                                          All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
-     * 											$this->error or this->errors are also defined by class called by this function if error.
-     */
+	/**
+	 * 		Execute hooks (if they were initialized) for the given method
+	 *
+	 * 		@param		string	$method			Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
+	 * 	    @param		array	$parameters		Array of parameters
+	 * 		@param		Object	$object			Object to use hooks on
+	 * 	    @param		string	$action			Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
+	 * 		@return		mixed					For 'addreplace' hooks (doActions,formObjectOptions,pdf_xxx,...):  					Return 0 if we want to keep standard actions, >0 if we want to stop standard actions, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 * 											For 'output' hooks (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...):	Return 0, <0 if KO. Things to print are returned into ->resprints and set into ->resPrint. Things to return are returned into ->results by hook and set into ->resArray for caller.
+	 *                                          All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
+	 * 											$this->error or this->errors are also defined by class called by this function if error.
+	 */
 	function executeHooks($method, $parameters=array(), &$object='', &$action='')
 	{
-        if (! is_array($this->hooks) || empty($this->hooks)) return '';
+		if (! is_array($this->hooks) || empty($this->hooks)) return '';
 
-        $parameters['context']=join(':',$this->contextarray);
-        //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
+		$parameters['context']=join(':',$this->contextarray);
+		//dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
-        // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
-        $hooktype='output';
+		// Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
+		$hooktype='output';
 		if (in_array(
 			$method,
 			array(
-                'addCalendarChoice',
-			    'addMoreActionsButtons',
-			    'addMoreMassActions',
-			    'addSearchEntry',
+				'addCalendarChoice',
+				'addMoreActionsButtons',
+				'addMoreMassActions',
+				'addSearchEntry',
 				'addStatisticLine',
-			    'deleteFile',
+				'deleteFile',
 				'doActions',
-			    'doMassActions',
+				'doMassActions',
 				'formCreateThirdpartyOptions',
 				'formObjectOptions',
 				'formattachOptions',
 				'formBuilddocLineOptions',
-			    'formatNotificationMessage',
-			    'getFormMail',
-			    'getIdProfUrl',
-			    'getDirList',
+				'formatNotificationMessage',
+				'getFormMail',
+				'getIdProfUrl',
+				'getDirList',
 				'moveUploadedFile',
-			    'pdf_build_address',
+				'pdf_build_address',
 				'pdf_writelinedesc',
-			    'pdf_getlinenum',
-			    'pdf_getlineref',
-			    'pdf_getlineref_supplier',
-			    'pdf_getlinevatrate',
-			    'pdf_getlineupexcltax',
-			    'pdf_getlineupwithtax',
-			    'pdf_getlineqty',
-			    'pdf_getlineqty_asked',
-			    'pdf_getlineqty_shipped',
-			    'pdf_getlineqty_keeptoship',
-			    'pdf_getlineunit',
-			    'pdf_getlineremisepercent',
-			    'pdf_getlineprogress',
-			    'pdf_getlinetotalexcltax',
-			    'pdf_getlinetotalwithtax',
+				'pdf_getlinenum',
+				'pdf_getlineref',
+				'pdf_getlineref_supplier',
+				'pdf_getlinevatrate',
+				'pdf_getlineupexcltax',
+				'pdf_getlineupwithtax',
+				'pdf_getlineqty',
+				'pdf_getlineqty_asked',
+				'pdf_getlineqty_shipped',
+				'pdf_getlineqty_keeptoship',
+				'pdf_getlineunit',
+				'pdf_getlineremisepercent',
+				'pdf_getlineprogress',
+				'pdf_getlinetotalexcltax',
+				'pdf_getlinetotalwithtax',
 				'paymentsupplierinvoices',
 				'printAddress',
 				'printSearchForm',
 				'printTabsHead',
 				'formatEvent',
-                'printObjectLine',
-                'printObjectSubLine',
+				'printObjectLine',
+				'printObjectSubLine',
 				'createDictionaryFieldList',
 				'editDictionaryFieldlist',
 				'getFormMail',
-			    'showLinkToObjectBlock'
+				'showLinkToObjectBlock'
 				)
 			)) $hooktype='addreplace';
 
-        if ($method == 'insertExtraFields')
-        {
-        	$hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
-        	dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
-        }
-
-        // Init return properties
-        $this->resPrint=''; $this->resArray=array(); $this->resNbOfHooks=0;
-
-        // Loop on each hook to qualify modules that have declared context
-        $modulealreadyexecuted=array();
-        $resaction=0; $error=0; $result='';
-        foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
-        {
-            if (! empty($modules))
-            {
-                foreach($modules as $module => $actionclassinstance)
-                {
-                	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
-
-                    // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module,$modulealreadyexecuted)) continue;
-
-                	// jump to next module/class if method does not exist
-                    if (! method_exists($actionclassinstance,$method)) continue;
-
-                    $this->resNbOfHooks++;
-
-                    dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
-
-                    $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
-
-                    // Clean class (an error may have been set from a previous call of another method for same module/hook)
-                    $actionclassinstance->error=0;
-                    $actionclassinstance->errors=array();
-
-                    // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
-                    $parameters['currentcontext'] = $context;
-                    // Hooks that must return int (hooks with type 'addreplace')
-                    if ($hooktype == 'addreplace')
-                    {
-                    	dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                    	if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
-                    	{
-                    		$error++;
-                    		$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
-                    	}
-
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
-                    }
-                    // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
-                    else
+		if ($method == 'insertExtraFields')
+		{
+			$hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
+			dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
+		}
+
+		// Init return properties
+		$this->resPrint=''; $this->resArray=array(); $this->resNbOfHooks=0;
+
+		// Loop on each hook to qualify modules that have declared context
+		$modulealreadyexecuted=array();
+		$resaction=0; $error=0; $result='';
+		foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+		{
+			if (! empty($modules))
+			{
+				foreach($modules as $module => $actionclassinstance)
+				{
+					//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
+
+					// test to avoid running twice a hook, when a module implements several active contexts
+					if (in_array($module,$modulealreadyexecuted)) continue;
+
+					// jump to next module/class if method does not exist
+					if (! method_exists($actionclassinstance,$method)) continue;
+
+					$this->resNbOfHooks++;
+
+					dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
+
+					$modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
+
+					// Clean class (an error may have been set from a previous call of another method for same module/hook)
+					$actionclassinstance->error=0;
+					$actionclassinstance->errors=array();
+
+					// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
+					$parameters['currentcontext'] = $context;
+					// Hooks that must return int (hooks with type 'addreplace')
+					if ($hooktype == 'addreplace')
 					{
-                    	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
-
-                    	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
-                    	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-
-                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
-                    	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-                    	if (! is_array($resaction) && ! is_numeric($resaction))
-                    	{
-                    		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
-                    	}
-                    }
-
-                    //print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
-
-                    unset($actionclassinstance->results);
-                    unset($actionclassinstance->resprints);
-                }
-            }
-        }
-
-        return ($error?-1:$resaction);
+						dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
+						$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+						if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+						{
+							$error++;
+							$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
+							dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
+						}
+
+						if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+						if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+					}
+					// Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
+					else
+					{
+						// TODO. this test should be done into the method of hook by returning nothing
+						if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+
+						//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
+						$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
+
+						if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+						if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+						// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
+						if (! is_array($resaction) && ! is_numeric($resaction))
+						{
+							dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
+							if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
+						}
+					}
+
+					//print "After hook  ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
+
+					unset($actionclassinstance->results);
+					unset($actionclassinstance->resprints);
+				}
+			}
+		}
+
+		return ($error?-1:$resaction);
 	}
 
 }

Spacing +46 added lines, -46 removed lines

@@ -31,20 +31,20 @@ 
 {
 	var $db;
 	var $error;
-	var $errors=array();
+	var $errors = array();
 
     // Context hookmanager was created for ('thirdpartycard', 'thirdpartydao', ...)
-    var $contextarray=array();
+    var $contextarray = array();
 
 	// Array with instantiated classes
-	var $hooks=array();
+	var $hooks = array();
 
 	// Array result
-	var $resArray=array();
+	var $resArray = array();
 	// Printable result
-	var $resPrint='';
+	var $resPrint = '';
 	// Nb of qualified hook ran
-	var $resNbOfHooks=0;
+	var $resNbOfHooks = 0;
 
 	/**
 	 * Constructor
@@ -73,30 +73,30 @@ 
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+        if (!is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
 
         // For backward compatibility
-		if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
+		if (!is_array($arraycontext)) $arraycontext = array($arraycontext);
 
-		$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
+		$this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
 
-		foreach($conf->modules_parts['hooks'] as $module => $hooks)
+		foreach ($conf->modules_parts['hooks'] as $module => $hooks)
 		{
 			if ($conf->$module->enabled)
 			{
-				foreach($arraycontext as $context)
+				foreach ($arraycontext as $context)
 				{
-				    if (is_array($hooks)) $arrayhooks=$hooks;    // New system
-				    else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
-					if (in_array($context,$arrayhooks) || in_array('all',$arrayhooks))    // We instantiate action class only if hook is required
+				    if (is_array($hooks)) $arrayhooks = $hooks; // New system
+				    else $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
+					if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks))    // We instantiate action class only if hook is required
 					{
-						$path 		= '/'.$module.'/class/';
+						$path = '/'.$module.'/class/';
 						$actionfile = 'actions_'.$module.'.class.php';
-						$pathroot	= '';
+						$pathroot = '';
 
 						// Include actions class overwriting hooks
-						dol_syslog('Loading hook:' . $actionfile, LOG_INFO);
-						$resaction=dol_include_once($path.$actionfile);
+						dol_syslog('Loading hook:'.$actionfile, LOG_INFO);
+						$resaction = dol_include_once($path.$actionfile);
 						if ($resaction)
 						{
     						$controlclassname = 'Actions'.ucfirst($module);
@@ -122,15 +122,15 @@ 
      *                                          All types can also return some values into an array ->results that will be finaly merged into this->resArray for caller.
      * 											$this->error or this->errors are also defined by class called by this function if error.
      */
-	function executeHooks($method, $parameters=array(), &$object='', &$action='')
+	function executeHooks($method, $parameters = array(), &$object = '', &$action = '')
 	{
-        if (! is_array($this->hooks) || empty($this->hooks)) return '';
+        if (!is_array($this->hooks) || empty($this->hooks)) return '';
 
-        $parameters['context']=join(':',$this->contextarray);
+        $parameters['context'] = join(':', $this->contextarray);
         //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
 
         // Define type of hook ('output' or 'addreplace'. 'returnvalue' is deprecated because a 'addreplace' hook can also return resPrint and resArray).
-        $hooktype='output';
+        $hooktype = 'output';
 		if (in_array(
 			$method,
 			array(
@@ -180,43 +180,43 @@ 
 				'getFormMail',
 			    'showLinkToObjectBlock'
 				)
-			)) $hooktype='addreplace';
+			)) $hooktype = 'addreplace';
 
         if ($method == 'insertExtraFields')
         {
-        	$hooktype='returnvalue';	// @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
+        	$hooktype = 'returnvalue'; // @deprecated. TODO Remove all code with "executeHooks('insertExtraFields'" as soon as there is a trigger available.
         	dol_syslog("Warning: The hook 'insertExtraFields' is deprecated and must not be used. Use instead trigger on CRUD event (ask it to dev team if not implemented)", LOG_WARNING);
         }
 
         // Init return properties
-        $this->resPrint=''; $this->resArray=array(); $this->resNbOfHooks=0;
+        $this->resPrint = ''; $this->resArray = array(); $this->resNbOfHooks = 0;
 
         // Loop on each hook to qualify modules that have declared context
-        $modulealreadyexecuted=array();
-        $resaction=0; $error=0; $result='';
-        foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+        $modulealreadyexecuted = array();
+        $resaction = 0; $error = 0; $result = '';
+        foreach ($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
         {
-            if (! empty($modules))
+            if (!empty($modules))
             {
-                foreach($modules as $module => $actionclassinstance)
+                foreach ($modules as $module => $actionclassinstance)
                 {
                 	//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
 
                     // test to avoid running twice a hook, when a module implements several active contexts
-                    if (in_array($module,$modulealreadyexecuted)) continue;
+                    if (in_array($module, $modulealreadyexecuted)) continue;
 
                 	// jump to next module/class if method does not exist
-                    if (! method_exists($actionclassinstance,$method)) continue;
+                    if (!method_exists($actionclassinstance, $method)) continue;
 
                     $this->resNbOfHooks++;
 
                     dol_syslog(get_class($this).'::executeHooks a qualified hook was found for method='.$method.' module='.$module." action=".$action." context=".$context);
 
-                    $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method to avoid running twice
+                    $modulealreadyexecuted[$module] = $module; // Use the $currentcontext in method to avoid running twice
 
                     // Clean class (an error may have been set from a previous call of another method for same module/hook)
-                    $actionclassinstance->error=0;
-                    $actionclassinstance->errors=array();
+                    $actionclassinstance->error = 0;
+                    $actionclassinstance->errors = array();
 
                     // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
                     $parameters['currentcontext'] = $context;
@@ -225,32 +225,32 @@ 
                     {
                     	dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$resaction += $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
-                    	if ($resaction < 0 || ! empty($actionclassinstance->error) || (! empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
+                    	if ($resaction < 0 || !empty($actionclassinstance->error) || (!empty($actionclassinstance->errors) && count($actionclassinstance->errors) > 0))
                     	{
                     		$error++;
-                    		$this->error=$actionclassinstance->error; $this->errors=array_merge($this->errors, (array) $actionclassinstance->errors);
-                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
+                    		$this->error = $actionclassinstance->error; $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
+                    		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
                     	}
 
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
                     else
 					{
                     	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+                    	if (is_array($parameters) && !empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
 
                     	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (!empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray = array_merge($this->resArray, $actionclassinstance->results);
+                    	if (!empty($actionclassinstance->resprints)) $this->resPrint .= $actionclassinstance->resprints;
                     	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
-                    	if (! is_array($resaction) && ! is_numeric($resaction))
+                    	if (!is_array($resaction) && !is_numeric($resaction))
                     	{
                     		dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
-                    		if (empty($actionclassinstance->resprints)) { $this->resPrint.=$resaction; $resaction=0; }
+                    		if (empty($actionclassinstance->resprints)) { $this->resPrint .= $resaction; $resaction = 0; }
                     	}
                     }
 
@@ -262,7 +262,7 @@ 
             }
         }
 
-        return ($error?-1:$resaction);
+        return ($error ?-1 : $resaction);
 	}
 
 }

Braces +44 added lines, -14 removed lines

@@ -73,10 +73,14 @@ 
 		global $conf;
 
 		// Test if there is hooks to manage
-        if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) return;
+        if (! is_array($conf->modules_parts['hooks']) || empty($conf->modules_parts['hooks'])) {
+        	return;
+        }
 
         // For backward compatibility
-		if (! is_array($arraycontext)) $arraycontext=array($arraycontext);
+		if (! is_array($arraycontext)) {
+			$arraycontext=array($arraycontext);
+		}
 
 		$this->contextarray=array_unique(array_merge($arraycontext,$this->contextarray));    // All contexts are concatenated
 
@@ -86,11 +90,19 @@ 
 			{
 				foreach($arraycontext as $context)
 				{
-				    if (is_array($hooks)) $arrayhooks=$hooks;    // New system
-				    else $arrayhooks=explode(':',$hooks);        // Old system (for backward compatibility)
-					if (in_array($context,$arrayhooks) || in_array('all',$arrayhooks))    // We instantiate action class only if hook is required
+				    if (is_array($hooks)) {
+				    	$arrayhooks=$hooks;
+				    }
+				    // New system
+				    else {
+				    	$arrayhooks=explode(':',$hooks);
+				    }
+				    // Old system (for backward compatibility)
+					if (in_array($context,$arrayhooks) || in_array('all',$arrayhooks)) {
+						// We instantiate action class only if hook is required
 					{
 						$path 		= '/'.$module.'/class/';
+					}
 						$actionfile = 'actions_'.$module.'.class.php';
 						$pathroot	= '';
 
@@ -124,7 +136,9 @@ 
      */
 	function executeHooks($method, $parameters=array(), &$object='', &$action='')
 	{
-        if (! is_array($this->hooks) || empty($this->hooks)) return '';
+        if (! is_array($this->hooks) || empty($this->hooks)) {
+        	return '';
+        }
 
         $parameters['context']=join(':',$this->contextarray);
         //dol_syslog(get_class($this).'::executeHooks method='.$method." action=".$action." context=".$parameters['context']);
@@ -180,7 +194,9 @@ 
 				'getFormMail',
 			    'showLinkToObjectBlock'
 				)
-			)) $hooktype='addreplace';
+			)) {
+			$hooktype='addreplace';
+		}
 
         if ($method == 'insertExtraFields')
         {
@@ -194,7 +210,8 @@ 
         // Loop on each hook to qualify modules that have declared context
         $modulealreadyexecuted=array();
         $resaction=0; $error=0; $result='';
-        foreach($this->hooks as $context => $modules)    // $this->hooks is an array with context as key and value is an array of modules that handle this context
+        foreach($this->hooks as $context => $modules) {
+        	// $this->hooks is an array with context as key and value is an array of modules that handle this context
         {
             if (! empty($modules))
             {
@@ -204,9 +221,12 @@ 
 
                     // test to avoid running twice a hook, when a module implements several active contexts
                     if (in_array($module,$modulealreadyexecuted)) continue;
+        }
 
                 	// jump to next module/class if method does not exist
-                    if (! method_exists($actionclassinstance,$method)) continue;
+                    if (! method_exists($actionclassinstance,$method)) {
+                    	continue;
+                    }
 
                     $this->resNbOfHooks++;
 
@@ -232,20 +252,30 @@ 
                     		dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error)?'':" ".$this->error).(empty($this->errors)?'':" ".join(",",$this->errors)), LOG_ERR);
                     	}
 
-                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))  $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+                    		$this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	}
+                    	if (! empty($actionclassinstance->resprints)) {
+                    		$this->resPrint.=$actionclassinstance->resprints;
+                    	}
                     }
                     // Generic hooks that return a string or array (printLeftBlock, formAddObjectLine, formBuilddocOptions, ...)
                     else
 					{
                     	// TODO. this test should be done into the method of hook by returning nothing
-                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) continue;
+                    	if (is_array($parameters) && ! empty($parameters['special_code']) && $parameters['special_code'] > 3 && $parameters['special_code'] != $actionclassinstance->module_number) {
+                    		continue;
+                    	}
 
                     	//dol_syslog("Call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", hooktype=".$hooktype, LOG_DEBUG);
                     	$resaction = $actionclassinstance->$method($parameters, $object, $action, $this); // $object and $action can be changed by method ($object->id during creation for example or $action to go back to other action for example)
 
-                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) $this->resArray =array_merge($this->resArray, $actionclassinstance->results);
-                    	if (! empty($actionclassinstance->resprints)) $this->resPrint.=$actionclassinstance->resprints;
+                    	if (! empty($actionclassinstance->results) && is_array($actionclassinstance->results)) {
+                    		$this->resArray =array_merge($this->resArray, $actionclassinstance->results);
+                    	}
+                    	if (! empty($actionclassinstance->resprints)) {
+                    		$this->resPrint.=$actionclassinstance->resprints;
+                    	}
                     	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
                     	if (! is_array($resaction) && ! is_numeric($resaction))
                     	{

htdocs/core/class/dolreceiptprinter.class.php

Indentation +555 added lines, -555 removed lines

@@ -100,591 +100,591 @@
  */
 class dolReceiptPrinter extends Escpos
 {
-    const CONNECTOR_DUMMY = 1;
-    const CONNECTOR_FILE_PRINT = 2;
-    const CONNECTOR_NETWORK_PRINT = 3;
-    const CONNECTOR_WINDOWS_PRINT = 4;
-    //const CONNECTOR_JAVA = 5;
-    var $db;
-    var $tags;
-    var $printer;
-    var $template;
-    var $error;
-    var $errors;
+	const CONNECTOR_DUMMY = 1;
+	const CONNECTOR_FILE_PRINT = 2;
+	const CONNECTOR_NETWORK_PRINT = 3;
+	const CONNECTOR_WINDOWS_PRINT = 4;
+	//const CONNECTOR_JAVA = 5;
+	var $db;
+	var $tags;
+	var $printer;
+	var $template;
+	var $error;
+	var $errors;
 
 
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB      $db         database
-     */
-    function __construct($db)
-    {
-        $this->db=$db;
-        $this->tags = array(
-            'dol_align_left',
-            'dol_align_center',
-            'dol_align_right',
-            'dol_use_font_a',
-            'dol_use_font_b',
-            'dol_use_font_c',
-            'dol_bold',
-            '/dol_bold',
-            'dol_double_height',
-            '/dol_double_height',
-            'dol_double_width',
-            '/dol_double_width',
-            'dol_underline',
-            '/dol_underline',
-            'dol_underline_2dots',
-            '/dol_underline',
-            'dol_emphasized',
-            '/dol_emphasized',
-            'dol_switch_colors',
-            '/dol_switch_colors',
-            'dol_print_barcode',
-            'dol_print_barcode_customer_id',
-            'dol_set_print_width_57',
-            'dol_cut_paper_full',
-            'dol_cut_paper_partial',
-            'dol_open_drawer',
-            'dol_activate_buzzer',
-            'dol_print_qrcode',
-            'dol_print_date',
-            'dol_print_date_time',
-            'dol_print_year',
-            'dol_print_month_letters',
-            'dol_print_month',
-            'dol_print_day',
-            'dol_print_day_letters',
-            'dol_print_table',
-            'dol_print_cutlery',
-            'dol_print_payment',
-            'dol_print_logo',
-            'dol_print_logo_old',
-            'dol_print_order_lines',
-            'dol_print_order_tax',
-            'dol_print_order_local_tax',
-            'dol_print_order_total',
-            'dol_print_order_number',
-            'dol_print_order_number_unique',
-            'dol_print_customer_firstname',
-            'dol_print_customer_lastname',
-            'dol_print_customer_mail',
-            'dol_print_customer_phone',
-            'dol_print_customer_mobile',
-            'dol_print_customer_skype',
-            'dol_print_customer_tax_number',
-            'dol_print_customer_account_balance',
-            'dol_print_vendor_lastname',
-            'dol_print_vendor_firstname',
-            'dol_print_vendor_mail',
-            'dol_print_customer_points',
-            'dol_print_order_points',
-            'dol_print_if_customer',
-            'dol_print_if_vendor',
-            'dol_print_if_happy_hour',
-            'dol_print_if_num_order_unique',
-            'dol_print_if_customer_points',
-            'dol_print_if_order_points',
-            'dol_print_if_customer_tax_number',
-            'dol_print_if_customer_account_balance_positive',
-        );
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB      $db         database
+	 */
+	function __construct($db)
+	{
+		$this->db=$db;
+		$this->tags = array(
+			'dol_align_left',
+			'dol_align_center',
+			'dol_align_right',
+			'dol_use_font_a',
+			'dol_use_font_b',
+			'dol_use_font_c',
+			'dol_bold',
+			'/dol_bold',
+			'dol_double_height',
+			'/dol_double_height',
+			'dol_double_width',
+			'/dol_double_width',
+			'dol_underline',
+			'/dol_underline',
+			'dol_underline_2dots',
+			'/dol_underline',
+			'dol_emphasized',
+			'/dol_emphasized',
+			'dol_switch_colors',
+			'/dol_switch_colors',
+			'dol_print_barcode',
+			'dol_print_barcode_customer_id',
+			'dol_set_print_width_57',
+			'dol_cut_paper_full',
+			'dol_cut_paper_partial',
+			'dol_open_drawer',
+			'dol_activate_buzzer',
+			'dol_print_qrcode',
+			'dol_print_date',
+			'dol_print_date_time',
+			'dol_print_year',
+			'dol_print_month_letters',
+			'dol_print_month',
+			'dol_print_day',
+			'dol_print_day_letters',
+			'dol_print_table',
+			'dol_print_cutlery',
+			'dol_print_payment',
+			'dol_print_logo',
+			'dol_print_logo_old',
+			'dol_print_order_lines',
+			'dol_print_order_tax',
+			'dol_print_order_local_tax',
+			'dol_print_order_total',
+			'dol_print_order_number',
+			'dol_print_order_number_unique',
+			'dol_print_customer_firstname',
+			'dol_print_customer_lastname',
+			'dol_print_customer_mail',
+			'dol_print_customer_phone',
+			'dol_print_customer_mobile',
+			'dol_print_customer_skype',
+			'dol_print_customer_tax_number',
+			'dol_print_customer_account_balance',
+			'dol_print_vendor_lastname',
+			'dol_print_vendor_firstname',
+			'dol_print_vendor_mail',
+			'dol_print_customer_points',
+			'dol_print_order_points',
+			'dol_print_if_customer',
+			'dol_print_if_vendor',
+			'dol_print_if_happy_hour',
+			'dol_print_if_num_order_unique',
+			'dol_print_if_customer_points',
+			'dol_print_if_order_points',
+			'dol_print_if_customer_tax_number',
+			'dol_print_if_customer_account_balance_positive',
+		);
 
-    }
+	}
 
-    /**
-     * list printers
-     *
-     * @return  int                     0 if OK; >0 if KO
-     */
-    function listPrinters()
-    {
-        global $conf;
-        $error = 0;
-        $line = 0;
-        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            while ($line < $num) {
-                $row = $this->db->fetch_array($resql);
-                switch ($row['fk_type']) {
-                    case 1:
-                        $row['fk_type_name'] = 'CONNECTOR_DUMMY';
-                        break;
-                    case 2:
-                        $row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';
-                        break;
-                    case 3:
-                        $row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';
-                        break;
-                    case 4:
-                        $row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';
-                        break;
-                    case 5:
-                        $row['fk_type_name'] = 'CONNECTOR_JAVA';
-                        break;
-                    default:
-                        $row['fk_type_name'] = 'CONNECTOR_UNKNOWN';
-                        break;
-                }
-                switch ($row['fk_profile']) {
-                    case 0:
-                        $row['fk_profile_name'] = 'PROFILE_DEFAULT';
-                        break;
-                    case 1:
-                        $row['fk_profile_name'] = 'PROFILE_SIMPLE';
-                        break;
-                    case 2:
-                        $row['fk_profile_name'] = 'PROFILE_EPOSTEP';
-                        break;
-                    case 3:
-                        $row['fk_profile_name'] = 'PROFILE_P822D';
-                        break;
-                    default:
-                        $row['fk_profile_name'] = 'PROFILE_STAR';
-                        break;
-                }
-                $obj[] = $row;
-                $line++;
-            }
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        $this->listprinters = $obj;
-        return $error;
-    }
+	/**
+	 * list printers
+	 *
+	 * @return  int                     0 if OK; >0 if KO
+	 */
+	function listPrinters()
+	{
+		global $conf;
+		$error = 0;
+		$line = 0;
+		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql.= ' WHERE entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			while ($line < $num) {
+				$row = $this->db->fetch_array($resql);
+				switch ($row['fk_type']) {
+					case 1:
+						$row['fk_type_name'] = 'CONNECTOR_DUMMY';
+						break;
+					case 2:
+						$row['fk_type_name'] = 'CONNECTOR_FILE_PRINT';
+						break;
+					case 3:
+						$row['fk_type_name'] = 'CONNECTOR_NETWORK_PRINT';
+						break;
+					case 4:
+						$row['fk_type_name'] = 'CONNECTOR_WINDOWS_PRINT';
+						break;
+					case 5:
+						$row['fk_type_name'] = 'CONNECTOR_JAVA';
+						break;
+					default:
+						$row['fk_type_name'] = 'CONNECTOR_UNKNOWN';
+						break;
+				}
+				switch ($row['fk_profile']) {
+					case 0:
+						$row['fk_profile_name'] = 'PROFILE_DEFAULT';
+						break;
+					case 1:
+						$row['fk_profile_name'] = 'PROFILE_SIMPLE';
+						break;
+					case 2:
+						$row['fk_profile_name'] = 'PROFILE_EPOSTEP';
+						break;
+					case 3:
+						$row['fk_profile_name'] = 'PROFILE_P822D';
+						break;
+					default:
+						$row['fk_profile_name'] = 'PROFILE_STAR';
+						break;
+				}
+				$obj[] = $row;
+				$line++;
+			}
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		$this->listprinters = $obj;
+		return $error;
+	}
 
 
-    /**
-     * List printers templates
-     *
-     * @return  int                     0 if OK; >0 if KO
-     */
-    function listPrintersTemplates()
-    {
-        global $conf;
-        $error = 0;
-        $line = 0;
-        $sql = 'SELECT rowid, name, template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $num = $this->db->num_rows($resql);
-            while ($line < $num) {
-                $obj[] = $this->db->fetch_array($resql);
-                $line++;
-            }
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        $this->listprinterstemplates = $obj;
-        return $error;
-    }
+	/**
+	 * List printers templates
+	 *
+	 * @return  int                     0 if OK; >0 if KO
+	 */
+	function listPrintersTemplates()
+	{
+		global $conf;
+		$error = 0;
+		$line = 0;
+		$sql = 'SELECT rowid, name, template';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql.= ' WHERE entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$num = $this->db->num_rows($resql);
+			while ($line < $num) {
+				$obj[] = $this->db->fetch_array($resql);
+				$line++;
+			}
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		$this->listprinterstemplates = $obj;
+		return $error;
+	}
 
 
-    /**
-     *  Form to Select type printer
-     *
-     *  @param    string    $selected       Id printer type pre-selected
-     *  @param    string    $htmlname       select html name
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function selectTypePrinter($selected='', $htmlname='printertypeid')
-    {
-        global $langs;
+	/**
+	 *  Form to Select type printer
+	 *
+	 *  @param    string    $selected       Id printer type pre-selected
+	 *  @param    string    $htmlname       select html name
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function selectTypePrinter($selected='', $htmlname='printertypeid')
+	{
+		global $langs;
         
-        $options = array(
-            1 => $langs->trans('CONNECTOR_DUMMY'),
-            2 => $langs->trans('CONNECTOR_FILE_PRINT'),
-            3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),
-            4 => $langs->trans('CONNECTOR_WINDOWS_PRINT')
-        );
+		$options = array(
+			1 => $langs->trans('CONNECTOR_DUMMY'),
+			2 => $langs->trans('CONNECTOR_FILE_PRINT'),
+			3 => $langs->trans('CONNECTOR_NETWORK_PRINT'),
+			4 => $langs->trans('CONNECTOR_WINDOWS_PRINT')
+		);
         
-        $this->resprint = Form::selectarray($htmlname, $options, $selected);
+		$this->resprint = Form::selectarray($htmlname, $options, $selected);
         
-        return 0;
-    }
+		return 0;
+	}
 
 
-    /**
-     *  Form to Select Profile printer
-     *
-     *  @param    string    $selected       Id printer profile pre-selected
-     *  @param    string    $htmlname       select html name
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function selectProfilePrinter($selected='', $htmlname='printerprofileid')
-    {
-        global $langs;
+	/**
+	 *  Form to Select Profile printer
+	 *
+	 *  @param    string    $selected       Id printer profile pre-selected
+	 *  @param    string    $htmlname       select html name
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function selectProfilePrinter($selected='', $htmlname='printerprofileid')
+	{
+		global $langs;
         
-        $options = array(
-            0 => $langs->trans('PROFILE_DEFAULT'),
-            1 => $langs->trans('PROFILE_SIMPLE'),
-            2 => $langs->trans('PROFILE_EPOSTEP'),
-            3 => $langs->trans('PROFILE_P822D'),
-            4 => $langs->trans('PROFILE_STAR')
-        );
+		$options = array(
+			0 => $langs->trans('PROFILE_DEFAULT'),
+			1 => $langs->trans('PROFILE_SIMPLE'),
+			2 => $langs->trans('PROFILE_EPOSTEP'),
+			3 => $langs->trans('PROFILE_P822D'),
+			4 => $langs->trans('PROFILE_STAR')
+		);
         
-        $this->profileresprint = Form::selectarray($htmlname, $options, $selected);
-        return 0;
-    }
+		$this->profileresprint = Form::selectarray($htmlname, $options, $selected);
+		return 0;
+	}
 
 
-    /**
-     *  Function to Add a printer in db
-     *
-     *  @param    string    $name           Printer name
-     *  @param    int       $type           Printer type
-     *  @param    int       $profile        Printer profile
-     *  @param    string    $parameter      Printer parameter
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function AddPrinter($name, $type, $profile, $parameter)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' (name, fk_type, fk_profile, parameter, entity)';
-        $sql.= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
-        $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Add a printer in db
+	 *
+	 *  @param    string    $name           Printer name
+	 *  @param    int       $type           Printer type
+	 *  @param    int       $profile        Printer profile
+	 *  @param    string    $parameter      Printer parameter
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function AddPrinter($name, $type, $profile, $parameter)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql.= ' (name, fk_type, fk_profile, parameter, entity)';
+		$sql.= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Update a printer in db
-     *
-     *  @param    string    $name           Printer name
-     *  @param    int       $type           Printer type
-     *  @param    int       $profile        Printer profile
-     *  @param    string    $parameter      Printer parameter
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function UpdatePrinter($name, $type, $profile, $parameter, $printerid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', fk_type='.$type;
-        $sql.= ', fk_profile='.$profile;
-        $sql.= ', parameter="'.$this->db->escape($parameter).'"';
-        $sql.= ' WHERE rowid='.$printerid;
-        $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Update a printer in db
+	 *
+	 *  @param    string    $name           Printer name
+	 *  @param    int       $type           Printer type
+	 *  @param    int       $profile        Printer profile
+	 *  @param    string    $parameter      Printer parameter
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function UpdatePrinter($name, $type, $profile, $parameter, $printerid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql.= ' SET name="'.$this->db->escape($name).'"';
+		$sql.= ', fk_type='.$type;
+		$sql.= ', fk_profile='.$profile;
+		$sql.= ', parameter="'.$this->db->escape($parameter).'"';
+		$sql.= ' WHERE rowid='.$printerid;
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Delete a printer from db
-     *
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function DeletePrinter($printerid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid='.$printerid;
-        $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Delete a printer from db
+	 *
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function DeletePrinter($printerid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql.= ' WHERE rowid='.$printerid;
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Update a printer template in db
-     *
-     *  @param    string    $name           Template name
-     *  @param    int       $template       Template
-     *  @param    int       $templateid     Template id
-     *  @return   int                       0 if OK; >0 if KO
-     */
-    function UpdateTemplate($name, $template, $templateid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', template="'.$this->db->escape($template).'"';
-        $sql.= ' WHERE rowid='.$templateid;
-        $resql = $this->db->query($sql);
-        if (! $resql) {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        return $error;
-    }
+	/**
+	 *  Function to Update a printer template in db
+	 *
+	 *  @param    string    $name           Template name
+	 *  @param    int       $template       Template
+	 *  @param    int       $templateid     Template id
+	 *  @return   int                       0 if OK; >0 if KO
+	 */
+	function UpdateTemplate($name, $template, $templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql.= ' SET name="'.$this->db->escape($name).'"';
+		$sql.= ', template="'.$this->db->escape($template).'"';
+		$sql.= ' WHERE rowid='.$templateid;
+		$resql = $this->db->query($sql);
+		if (! $resql) {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		return $error;
+	}
 
 
-    /**
-     *  Function to Send Test page to Printer
-     *
-     *  @param    int       $printerid      Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function SendTestToPrinter($printerid)
-    {
-        global $conf;
-        $error = 0;
-        $img = new EscposImage(DOL_DOCUMENT_ROOT .'/theme/common/dolibarr_logo_bw.png');
-        $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
-            setEventMessages($this->error, $this->errors, 'errors');
-        } else {
-            try {
-                $this->printer->graphics($img);
-                $this->printer->text("Hello World!\n");
-                $testStr = "Testing 123";
-                $this->printer->qrCode($testStr);
-                $this->printer->text("Most simple example\n");
-                $this->printer->feed();
-                $this->printer->cut();
-                //print '<pre>'.print_r($this->connector, true).'</pre>';
-                $this->printer->close();
+	/**
+	 *  Function to Send Test page to Printer
+	 *
+	 *  @param    int       $printerid      Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function SendTestToPrinter($printerid)
+	{
+		global $conf;
+		$error = 0;
+		$img = new EscposImage(DOL_DOCUMENT_ROOT .'/theme/common/dolibarr_logo_bw.png');
+		$ret = $this->InitPrinter($printerid);
+		if ($ret>0) {
+			setEventMessages($this->error, $this->errors, 'errors');
+		} else {
+			try {
+				$this->printer->graphics($img);
+				$this->printer->text("Hello World!\n");
+				$testStr = "Testing 123";
+				$this->printer->qrCode($testStr);
+				$this->printer->text("Most simple example\n");
+				$this->printer->feed();
+				$this->printer->cut();
+				//print '<pre>'.print_r($this->connector, true).'</pre>';
+				$this->printer->close();
 
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        return $error;
-    }
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to Print Receipt Ticket
-     *
-     *  @param   object    $object          order or invoice object
-     *  @param   int       $templateid      Template id
-     *  @param   int       $printerid       Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function SendToPrinter($object, $templateid, $printerid)
-    {
-        global $conf;
-        $error = 0;
-        $ret = $this->loadTemplate($templateid);
+	/**
+	 *  Function to Print Receipt Ticket
+	 *
+	 *  @param   object    $object          order or invoice object
+	 *  @param   int       $templateid      Template id
+	 *  @param   int       $printerid       Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function SendToPrinter($object, $templateid, $printerid)
+	{
+		global $conf;
+		$error = 0;
+		$ret = $this->loadTemplate($templateid);
 
-        // tags a remplacer par leur valeur avant de parser
-        $this->template = str_replace('<dol_print_num_order>', $object->id, $this->template);
-        $this->template = str_replace('<dol_print_customer_firstname>', $object->customer_firstname, $this->template);
-        $this->template = str_replace('<dol_print_customer_lastname>', $object->customer_lastname, $this->template);
-        $this->template = str_replace('<dol_print_customer_mail>', $object->customer_mail, $this->template);
-        $this->template = str_replace('<dol_print_customer_phone>', $object->customer_phone, $this->template);
-        $this->template = str_replace('<dol_print_customer_mobile>', $object->customer_mobile, $this->template);
-        $this->template = str_replace('<dol_print_customer_skype>', $object->customer_skype, $this->template);
-        $this->template = str_replace('<dol_print_customer_tax_number>', $object->customer_tax_number, $this->template);
-        $this->template = str_replace('<dol_print_customer_account_balance>', $object->customer_account_balance, $this->template);
-        $this->template = str_replace('<dol_print_customer_points>', $object->customer_points, $this->template);
-        $this->template = str_replace('<dol_print_order_points>', $object->order_points, $this->template);
-        $this->template = str_replace('<dol_print_vendor_firstname>', $object->vendor_firstname, $this->template);
-        $this->template = str_replace('<dol_print_vendor_lastname>', $object->vendor_lastname, $this->template);
-        $this->template = str_replace('<dol_print_vendor_mail>', $object->vendor_mail, $this->template);
-        $this->template = str_replace('<dol_print_date>', $object->date, $this->template);
-        $this->template = str_replace('<dol_print_date_time>', $object->date_time, $this->template);
-        $this->template = str_replace('<dol_print_year>', $object->date_time, $this->template);
-        $this->template = str_replace('<dol_print_month_letters>', $object->date_time, $this->template);
-        $this->template = str_replace('<dol_print_month>', $object->date_time, $this->template);
-        $this->template = str_replace('<dol_print_day>', $object->date_time, $this->template);
-        $this->template = str_replace('<dol_print_day_letters>', $object->date_time, $this->template);
-        $this->template = str_replace('<dol_print_table>', $object->table, $this->template);
-        $this->template = str_replace('<dol_print_cutlery>', $object->cutlery, $this->template);
+		// tags a remplacer par leur valeur avant de parser
+		$this->template = str_replace('<dol_print_num_order>', $object->id, $this->template);
+		$this->template = str_replace('<dol_print_customer_firstname>', $object->customer_firstname, $this->template);
+		$this->template = str_replace('<dol_print_customer_lastname>', $object->customer_lastname, $this->template);
+		$this->template = str_replace('<dol_print_customer_mail>', $object->customer_mail, $this->template);
+		$this->template = str_replace('<dol_print_customer_phone>', $object->customer_phone, $this->template);
+		$this->template = str_replace('<dol_print_customer_mobile>', $object->customer_mobile, $this->template);
+		$this->template = str_replace('<dol_print_customer_skype>', $object->customer_skype, $this->template);
+		$this->template = str_replace('<dol_print_customer_tax_number>', $object->customer_tax_number, $this->template);
+		$this->template = str_replace('<dol_print_customer_account_balance>', $object->customer_account_balance, $this->template);
+		$this->template = str_replace('<dol_print_customer_points>', $object->customer_points, $this->template);
+		$this->template = str_replace('<dol_print_order_points>', $object->order_points, $this->template);
+		$this->template = str_replace('<dol_print_vendor_firstname>', $object->vendor_firstname, $this->template);
+		$this->template = str_replace('<dol_print_vendor_lastname>', $object->vendor_lastname, $this->template);
+		$this->template = str_replace('<dol_print_vendor_mail>', $object->vendor_mail, $this->template);
+		$this->template = str_replace('<dol_print_date>', $object->date, $this->template);
+		$this->template = str_replace('<dol_print_date_time>', $object->date_time, $this->template);
+		$this->template = str_replace('<dol_print_year>', $object->date_time, $this->template);
+		$this->template = str_replace('<dol_print_month_letters>', $object->date_time, $this->template);
+		$this->template = str_replace('<dol_print_month>', $object->date_time, $this->template);
+		$this->template = str_replace('<dol_print_day>', $object->date_time, $this->template);
+		$this->template = str_replace('<dol_print_day_letters>', $object->date_time, $this->template);
+		$this->template = str_replace('<dol_print_table>', $object->table, $this->template);
+		$this->template = str_replace('<dol_print_cutlery>', $object->cutlery, $this->template);
 
-        // parse template
-        $p = xml_parser_create();
-        xml_parse_into_struct($p, $this->template, $vals, $index);
-        xml_parser_free($p);
-        //print '<pre>'.print_r($index, true).'</pre>';
-        //print '<pre>'.print_r($vals, true).'</pre>';
-        // print ticket
-        $level = 0;
-        $html = '<table border="1" style="width:210px"><pre>';
-        $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
-            setEventMessages($this->error, $this->errors, 'errors');
-        } 
-        else 
-        {
-            $nboflines = count($vals);
-            for ($line=0; $line < $nboflines; $line++) 
-            {
-                switch ($vals[$line]['tag']) {
-                    case 'DOL_ALIGN_CENTER':
-                        $this->printer->setJustification(Escpos::JUSTIFY_CENTER);
-                        $html.='<center>';
-                        $this->printer->text($vals[$line]['value']);
-                        break;
-                    case 'DOL_ALIGN_RIGHT':
-                        $this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
-                        $html.='<right>';
-                        break;
-                    case 'DOL_ALIGN_LEFT':
-                        $this->printer->setJustification(Escpos::JUSTIFY_LEFT);
-                        $html.='<left>';
-                        break;
-                    case 'DOL_OPEN_DRAWER':
-                        $this->printer->pulse();
-                        $html.= ' &#991;'.nl2br($vals[$line]['value']);
-                        break;
-                    case 'DOL_ACTIVATE_BUZZER':
-                        //$this->printer->buzzer();
-                        $html.= ' &#x266b;'.nl2br($vals[$line]['value']);
-                        break;
-                    case 'DOL_PRINT_BARCODE':
-                        // $vals[$line]['value'] -> barcode($content, $type)
-                        $this->printer->barcode($object->barcode);
-                        break;
-                    case 'DOL_PRINT_BARCODE_CUSTOMER_ID':
-                        // $vals[$line]['value'] -> barcode($content, $type)
-                        $this->printer->barcode($object->customer_id);
-                        break;
-                    case 'DOL_PRINT_QRCODE':
-                        // $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
-                        $this->printer->qrcode($vals[$line]['value']);
-                        $html.='QRCODE: '.$vals[$line]['value'];
-                        break;
-                    case 'DOL_CUT_PAPER_FULL':
-                        $this->printer->cut(Escpos::CUT_FULL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
-                        break;
-                    case 'DOL_CUT_PAPER_PARTIAL':
-                        $this->printer->cut(Escpos::CUT_PARTIAL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
-                        break;
-                    case 'DOL_USE_FONT_A':
-                        $this->printer->setFont(Escpos::FONT_A);
-                        $this->printer->text($vals[$line]['value']);
-                        break;
-                    case 'DOL_USE_FONT_B':
-                        $this->printer->setFont(Escpos::FONT_B);
-                        $this->printer->text($vals[$line]['value']);
-                        break;
-                    case 'DOL_USE_FONT_C':
-                        $this->printer->setFont(Escpos::FONT_C);
-                        $this->printer->text($vals[$line]['value']);
-                        break;
-                    default:
-                        $this->printer->text($vals[$line]['value']);
-                        $html.= nl2br($vals[$line]['value']);
-                        $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
-                        $error++;
-                        break;
-                }
-            }
-            $html.= '</pre></table>';
-            print $html;
-            // Close and print
-            // uncomment next line to see content sent to printer
-            //print '<pre>'.print_r($this->connector, true).'</pre>';
-            $this->printer->close();
+		// parse template
+		$p = xml_parser_create();
+		xml_parse_into_struct($p, $this->template, $vals, $index);
+		xml_parser_free($p);
+		//print '<pre>'.print_r($index, true).'</pre>';
+		//print '<pre>'.print_r($vals, true).'</pre>';
+		// print ticket
+		$level = 0;
+		$html = '<table border="1" style="width:210px"><pre>';
+		$ret = $this->InitPrinter($printerid);
+		if ($ret>0) {
+			setEventMessages($this->error, $this->errors, 'errors');
+		} 
+		else 
+		{
+			$nboflines = count($vals);
+			for ($line=0; $line < $nboflines; $line++) 
+			{
+				switch ($vals[$line]['tag']) {
+					case 'DOL_ALIGN_CENTER':
+						$this->printer->setJustification(Escpos::JUSTIFY_CENTER);
+						$html.='<center>';
+						$this->printer->text($vals[$line]['value']);
+						break;
+					case 'DOL_ALIGN_RIGHT':
+						$this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
+						$html.='<right>';
+						break;
+					case 'DOL_ALIGN_LEFT':
+						$this->printer->setJustification(Escpos::JUSTIFY_LEFT);
+						$html.='<left>';
+						break;
+					case 'DOL_OPEN_DRAWER':
+						$this->printer->pulse();
+						$html.= ' &#991;'.nl2br($vals[$line]['value']);
+						break;
+					case 'DOL_ACTIVATE_BUZZER':
+						//$this->printer->buzzer();
+						$html.= ' &#x266b;'.nl2br($vals[$line]['value']);
+						break;
+					case 'DOL_PRINT_BARCODE':
+						// $vals[$line]['value'] -> barcode($content, $type)
+						$this->printer->barcode($object->barcode);
+						break;
+					case 'DOL_PRINT_BARCODE_CUSTOMER_ID':
+						// $vals[$line]['value'] -> barcode($content, $type)
+						$this->printer->barcode($object->customer_id);
+						break;
+					case 'DOL_PRINT_QRCODE':
+						// $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
+						$this->printer->qrcode($vals[$line]['value']);
+						$html.='QRCODE: '.$vals[$line]['value'];
+						break;
+					case 'DOL_CUT_PAPER_FULL':
+						$this->printer->cut(Escpos::CUT_FULL);
+						$html.= ' &#9986;'.nl2br($vals[$line]['value']);
+						break;
+					case 'DOL_CUT_PAPER_PARTIAL':
+						$this->printer->cut(Escpos::CUT_PARTIAL);
+						$html.= ' &#9986;'.nl2br($vals[$line]['value']);
+						break;
+					case 'DOL_USE_FONT_A':
+						$this->printer->setFont(Escpos::FONT_A);
+						$this->printer->text($vals[$line]['value']);
+						break;
+					case 'DOL_USE_FONT_B':
+						$this->printer->setFont(Escpos::FONT_B);
+						$this->printer->text($vals[$line]['value']);
+						break;
+					case 'DOL_USE_FONT_C':
+						$this->printer->setFont(Escpos::FONT_C);
+						$this->printer->text($vals[$line]['value']);
+						break;
+					default:
+						$this->printer->text($vals[$line]['value']);
+						$html.= nl2br($vals[$line]['value']);
+						$this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
+						$error++;
+						break;
+				}
+			}
+			$html.= '</pre></table>';
+			print $html;
+			// Close and print
+			// uncomment next line to see content sent to printer
+			//print '<pre>'.print_r($this->connector, true).'</pre>';
+			$this->printer->close();
 
-        }
-        return $error;
-    }
+		}
+		return $error;
+	}
 
-    /**
-     *  Function to load Template
-     *
-     *  @param   int       $templateid        Template id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function loadTemplate($templateid)
-    {
-        global $conf;
-        $error = 0;
-        $sql = 'SELECT template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE rowid='.$templateid;
-        $sql.= ' AND entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_array($resql);
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        if (empty($obj)) {
-            $error++;
-            $this->errors[] = 'TemplateDontExist';
-        } else {
-            $this->template = $obj['0'];
-        }
+	/**
+	 *  Function to load Template
+	 *
+	 *  @param   int       $templateid        Template id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function loadTemplate($templateid)
+	{
+		global $conf;
+		$error = 0;
+		$sql = 'SELECT template';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+		$sql.= ' WHERE rowid='.$templateid;
+		$sql.= ' AND entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_array($resql);
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		if (empty($obj)) {
+			$error++;
+			$this->errors[] = 'TemplateDontExist';
+		} else {
+			$this->template = $obj['0'];
+		}
 
-        return $error;
-    }
+		return $error;
+	}
 
 
-    /**
-     *  Function Init Printer
-     *
-     *  @param   int       $printerid       Printer id
-     *  @return  int                        0 if OK; >0 if KO
-     */
-    function InitPrinter($printerid)
-    {
-        global $conf;
-        $error=0;
-        $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid = '.$printerid;
-        $sql.= ' AND entity = '.$conf->entity;
-        $resql = $this->db->query($sql);
-        if ($resql) {
-            $obj = $this->db->fetch_array($resql);
-        } else {
-            $error++;
-            $this->errors[] = $this->db->lasterror;
-        }
-        if (empty($obj)) {
-            $error++;
-            $this->errors[] = 'PrinterDontExist';
-        }
-        if (! $error) {
-            $parameter = $obj['parameter'];
-            try {
-                switch ($obj['fk_type']) {
-                    case 1:
-                        require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
-                        $this->connector = new DummyPrintConnector();
-                        break;
-                    case 2:
-                        $this->connector = new FilePrintConnector($parameter);
-                        break;
-                    case 3:
-                        $parameters = explode(':', $parameter);
-                        $this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
-                        break;
-                    case 4:
-                        $this->connector = new WindowsPrintConnector($parameter);
-                        break;
-                    default:
-                        $this->connector = 'CONNECTOR_UNKNOWN';
-                        break;
-                }
-                $this->printer = new Escpos($this->connector);
-            } catch (Exception $e) {
-                $this->errors[] = $e->getMessage();
-                $error++;
-            }
-        }
-        return $error;
-    }
+	/**
+	 *  Function Init Printer
+	 *
+	 *  @param   int       $printerid       Printer id
+	 *  @return  int                        0 if OK; >0 if KO
+	 */
+	function InitPrinter($printerid)
+	{
+		global $conf;
+		$error=0;
+		$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
+		$sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+		$sql.= ' WHERE rowid = '.$printerid;
+		$sql.= ' AND entity = '.$conf->entity;
+		$resql = $this->db->query($sql);
+		if ($resql) {
+			$obj = $this->db->fetch_array($resql);
+		} else {
+			$error++;
+			$this->errors[] = $this->db->lasterror;
+		}
+		if (empty($obj)) {
+			$error++;
+			$this->errors[] = 'PrinterDontExist';
+		}
+		if (! $error) {
+			$parameter = $obj['parameter'];
+			try {
+				switch ($obj['fk_type']) {
+					case 1:
+						require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
+						$this->connector = new DummyPrintConnector();
+						break;
+					case 2:
+						$this->connector = new FilePrintConnector($parameter);
+						break;
+					case 3:
+						$parameters = explode(':', $parameter);
+						$this->connector = new NetworkPrintConnector($parameters[0], $parameters[1]);
+						break;
+					case 4:
+						$this->connector = new WindowsPrintConnector($parameter);
+						break;
+					default:
+						$this->connector = 'CONNECTOR_UNKNOWN';
+						break;
+				}
+				$this->printer = new Escpos($this->connector);
+			} catch (Exception $e) {
+				$this->errors[] = $e->getMessage();
+				$error++;
+			}
+		}
+		return $error;
+	}
 }

Spacing +46 added lines, -46 removed lines

@@ -92,7 +92,7 @@ 
  *
  */
 
-require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/Escpos.php';
+require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/Escpos.php';
 
  
 /**
@@ -121,7 +121,7 @@ 
      */
     function __construct($db)
     {
-        $this->db=$db;
+        $this->db = $db;
         $this->tags = array(
             'dol_align_left',
             'dol_align_center',
@@ -205,8 +205,8 @@ 
         $error = 0;
         $line = 0;
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -272,8 +272,8 @@ 
         $error = 0;
         $line = 0;
         $sql = 'SELECT rowid, name, template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $num = $this->db->num_rows($resql);
@@ -297,7 +297,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectTypePrinter($selected='', $htmlname='printertypeid')
+    function selectTypePrinter($selected = '', $htmlname = 'printertypeid')
     {
         global $langs;
         
@@ -321,7 +321,7 @@ 
      *  @param    string    $htmlname       select html name
      *  @return  int                        0 if OK; >0 if KO
      */
-    function selectProfilePrinter($selected='', $htmlname='printerprofileid')
+    function selectProfilePrinter($selected = '', $htmlname = 'printerprofileid')
     {
         global $langs;
         
@@ -352,10 +352,10 @@ 
         global $conf;
         $error = 0;
         $sql = 'INSERT INTO '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' (name, fk_type, fk_profile, parameter, entity)';
-        $sql.= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
+        $sql .= ' (name, fk_type, fk_profile, parameter, entity)';
+        $sql .= ' VALUES ("'.$this->db->escape($name).'", '.$type.', '.$profile.', "'.$this->db->escape($parameter).'", '.$conf->entity.')';
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -377,13 +377,13 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', fk_type='.$type;
-        $sql.= ', fk_profile='.$profile;
-        $sql.= ', parameter="'.$this->db->escape($parameter).'"';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', fk_type='.$type;
+        $sql .= ', fk_profile='.$profile;
+        $sql .= ', parameter="'.$this->db->escape($parameter).'"';
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -401,9 +401,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'DELETE FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid='.$printerid;
+        $sql .= ' WHERE rowid='.$printerid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -423,11 +423,11 @@ 
         global $conf;
         $error = 0;
         $sql = 'UPDATE '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' SET name="'.$this->db->escape($name).'"';
-        $sql.= ', template="'.$this->db->escape($template).'"';
-        $sql.= ' WHERE rowid='.$templateid;
+        $sql .= ' SET name="'.$this->db->escape($name).'"';
+        $sql .= ', template="'.$this->db->escape($template).'"';
+        $sql .= ' WHERE rowid='.$templateid;
         $resql = $this->db->query($sql);
-        if (! $resql) {
+        if (!$resql) {
             $error++;
             $this->errors[] = $this->db->lasterror;
         }
@@ -445,9 +445,9 @@ 
     {
         global $conf;
         $error = 0;
-        $img = new EscposImage(DOL_DOCUMENT_ROOT .'/theme/common/dolibarr_logo_bw.png');
+        $img = new EscposImage(DOL_DOCUMENT_ROOT.'/theme/common/dolibarr_logo_bw.png');
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         } else {
             try {
@@ -518,35 +518,35 @@ 
         $level = 0;
         $html = '<table border="1" style="width:210px"><pre>';
         $ret = $this->InitPrinter($printerid);
-        if ($ret>0) {
+        if ($ret > 0) {
             setEventMessages($this->error, $this->errors, 'errors');
         } 
         else 
         {
             $nboflines = count($vals);
-            for ($line=0; $line < $nboflines; $line++) 
+            for ($line = 0; $line < $nboflines; $line++) 
             {
                 switch ($vals[$line]['tag']) {
                     case 'DOL_ALIGN_CENTER':
                         $this->printer->setJustification(Escpos::JUSTIFY_CENTER);
-                        $html.='<center>';
+                        $html .= '<center>';
                         $this->printer->text($vals[$line]['value']);
                         break;
                     case 'DOL_ALIGN_RIGHT':
                         $this->printer->setJustification(Escpos::JUSTIFY_RIGHT);
-                        $html.='<right>';
+                        $html .= '<right>';
                         break;
                     case 'DOL_ALIGN_LEFT':
                         $this->printer->setJustification(Escpos::JUSTIFY_LEFT);
-                        $html.='<left>';
+                        $html .= '<left>';
                         break;
                     case 'DOL_OPEN_DRAWER':
                         $this->printer->pulse();
-                        $html.= ' &#991;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#991;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_ACTIVATE_BUZZER':
                         //$this->printer->buzzer();
-                        $html.= ' &#x266b;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#x266b;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_PRINT_BARCODE':
                         // $vals[$line]['value'] -> barcode($content, $type)
@@ -559,15 +559,15 @@ 
                     case 'DOL_PRINT_QRCODE':
                         // $vals[$line]['value'] -> qrCode($content, $ec, $size, $model)
                         $this->printer->qrcode($vals[$line]['value']);
-                        $html.='QRCODE: '.$vals[$line]['value'];
+                        $html .= 'QRCODE: '.$vals[$line]['value'];
                         break;
                     case 'DOL_CUT_PAPER_FULL':
                         $this->printer->cut(Escpos::CUT_FULL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_CUT_PAPER_PARTIAL':
                         $this->printer->cut(Escpos::CUT_PARTIAL);
-                        $html.= ' &#9986;'.nl2br($vals[$line]['value']);
+                        $html .= ' &#9986;'.nl2br($vals[$line]['value']);
                         break;
                     case 'DOL_USE_FONT_A':
                         $this->printer->setFont(Escpos::FONT_A);
@@ -583,13 +583,13 @@ 
                         break;
                     default:
                         $this->printer->text($vals[$line]['value']);
-                        $html.= nl2br($vals[$line]['value']);
+                        $html .= nl2br($vals[$line]['value']);
                         $this->errors[] = 'UnknowTag: &lt;'.strtolower($vals[$line]['tag']).'&gt;';
                         $error++;
                         break;
                 }
             }
-            $html.= '</pre></table>';
+            $html .= '</pre></table>';
             print $html;
             // Close and print
             // uncomment next line to see content sent to printer
@@ -611,9 +611,9 @@ 
         global $conf;
         $error = 0;
         $sql = 'SELECT template';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
-        $sql.= ' WHERE rowid='.$templateid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt_template';
+        $sql .= ' WHERE rowid='.$templateid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -641,11 +641,11 @@ 
     function InitPrinter($printerid)
     {
         global $conf;
-        $error=0;
+        $error = 0;
         $sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
-        $sql.= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
-        $sql.= ' WHERE rowid = '.$printerid;
-        $sql.= ' AND entity = '.$conf->entity;
+        $sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
+        $sql .= ' WHERE rowid = '.$printerid;
+        $sql .= ' AND entity = '.$conf->entity;
         $resql = $this->db->query($sql);
         if ($resql) {
             $obj = $this->db->fetch_array($resql);
@@ -657,12 +657,12 @@ 
             $error++;
             $this->errors[] = 'PrinterDontExist';
         }
-        if (! $error) {
+        if (!$error) {
             $parameter = $obj['parameter'];
             try {
                 switch ($obj['fk_type']) {
                     case 1:
-                        require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
+                        require_once DOL_DOCUMENT_ROOT.'/includes/mike42/escpos-php/src/DummyPrintConnector.php';
                         $this->connector = new DummyPrintConnector();
                         break;
                     case 2:

Braces +1 added lines, -2 removed lines

@@ -520,8 +520,7 @@
         $ret = $this->InitPrinter($printerid);
         if ($ret>0) {
             setEventMessages($this->error, $this->errors, 'errors');
-        } 
-        else 
+        } else 
         {
             $nboflines = count($vals);
             for ($line=0; $line < $nboflines; $line++) 

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

Indentation +19 added lines, -19 removed lines

@@ -27,19 +27,19 @@ 
  */
 class FormContract
 {
-    var $db;
-    var $error;
+	var $db;
+	var $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;
+	}
 
 
 	/**
@@ -160,15 +160,15 @@ 
 	 */
 	function formSelectContract($page, $socid=-1, $selected='', $htmlname='contrattid', $maxlength=16, $showempty=1)
 	{
-	    global $langs;
+		global $langs;
 	
-        print "\n";
-        print '<form method="post" action="'.$page.'">';
-        print '<input type="hidden" name="action" value="setcontract">';
-        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-        $this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty);
-        print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
-        print '</form>';
+		print "\n";
+		print '<form method="post" action="'.$page.'">';
+		print '<input type="hidden" name="action" value="setcontract">';
+		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+		$this->select_contract($socid, $selected, $htmlname, $maxlength, $showempty);
+		print '<input type="submit" class="button valignmiddle" value="'.$langs->trans("Modify").'">';
+		print '</form>';
 	}	
 	
 }

Spacing +25 added lines, -25 removed lines

@@ -52,24 +52,24 @@ 
 	 *	@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)
 	{
-		global $db,$user,$conf,$langs;
+		global $db, $user, $conf, $langs;
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (!empty($conf->global->PROJECT_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) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (c.fk_soc=".$socid." 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)";
+		if ($socid > 0)  $sql .= " AND (c.fk_soc=".$socid." 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.'">';
@@ -82,13 +82,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)
@@ -97,30 +97,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 ($socid > 0 && (! empty($obj->fk_soc) && $obj->fk_soc != $socid))
+							if ($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;
 						}
@@ -134,7 +134,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);
 			}
 			
@@ -158,7 +158,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, -13 removed lines

@@ -57,15 +57,21 @@ 
 		global $db,$user,$conf,$langs;
 
 		$hideunselectables = false;
-		if (! empty($conf->global->PROJECT_HIDE_UNSELECTABLES)) $hideunselectables = true;
+		if (! empty($conf->global->PROJECT_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) $sql.= " AND (c.fk_soc = 0 OR c.fk_soc IS NULL)";
-		if ($socid > 0)  $sql.= " AND (c.fk_soc=".$socid." 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=".$socid." OR c.fk_soc IS NULL)";
+		}
 		$sql.= " ORDER BY c.ref ";
 
 		dol_syslog(get_class($this)."::select_contract", LOG_DEBUG);
@@ -73,7 +79,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)
@@ -85,8 +93,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").')';
@@ -94,8 +101,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)
@@ -112,11 +118,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;
@@ -139,8 +146,7 @@ 
 			}
 			
 			return $num;
-		}
-		else
+		} else
 		{
 			dol_print_error($db);
 			return -1;

htdocs/core/class/dolprintipp.class.php

Indentation +96 added lines, -96 removed lines

@@ -26,108 +26,108 @@
  */
 class dolprintIPP
 {
-    var $host;
-    var $port;
-    var $userid;    /* user login */
-    var $user;
-    var $password;
-    var $error;
-    var $db;
+	var $host;
+	var $port;
+	var $userid;    /* user login */
+	var $user;
+	var $password;
+	var $error;
+	var $db;
 
 
 
-    /**
-     * Constructor
-     *
-     * @param   DoliDB      $db         database
-     * @param   string      $host       host of Cups
-     * @param   string      $port       port
-     * @param   string      $userid     userid
-     * @param   string      $user       user
-     * @param   string      $password   password
-     */
-    function __construct($db,$host,$port,$userid,$user,$password)
-    {
-        $this->db=$db;
-        $this->host=$host;
-        $this->port=$port;
-        $this->userid=$userid;
-        $this->user=$user;
-        $this->password=$password;
-    }
+	/**
+	 * Constructor
+	 *
+	 * @param   DoliDB      $db         database
+	 * @param   string      $host       host of Cups
+	 * @param   string      $port       port
+	 * @param   string      $userid     userid
+	 * @param   string      $user       user
+	 * @param   string      $password   password
+	 */
+	function __construct($db,$host,$port,$userid,$user,$password)
+	{
+		$this->db=$db;
+		$this->host=$host;
+		$this->port=$port;
+		$this->userid=$userid;
+		$this->user=$user;
+		$this->password=$password;
+	}
 
 
-    /**
-     *  List jobs print
-     *
-     * @param   string      $module     module
-     *
-     *  @return void
-     */
-    function list_jobs($module)
-    {
-        global $conf, $db, $bc, $langs;
-        include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
-        $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
-        $ipp->setHost($this->host);
-        $ipp->setPort($this->port);
-        $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
-        // select printer uri for module order, propal,...
-        $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
-        $result = $this->db->query($sql);
-        if ($result)
-        {
-            $obj = $this->db->fetch_object($result);
-            if ($obj)
-            {
-                $ipp->setPrinterURI($obj->printer_uri);
-            }
-            else
-            {
-                // All printers
-                $ipp->setPrinterURI("ipp://localhost:631/printers/");
-            }
-        }
-        // Getting Jobs
-        try {
-        	$ipp->getJobs(false,0,'completed',false);			// May return errors if setup not correct
-        }
-        catch(Exception $e)
-        {
-            setEventMessage('[printipp] '.$langs->trans('CoreErrorMessage'), 'errors');
-            dol_syslog($e->getMessage(), LOG_ERR);
-        }
+	/**
+	 *  List jobs print
+	 *
+	 * @param   string      $module     module
+	 *
+	 *  @return void
+	 */
+	function list_jobs($module)
+	{
+		global $conf, $db, $bc, $langs;
+		include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
+		$ipp = new CupsPrintIPP();
+		$ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
+		$ipp->setHost($this->host);
+		$ipp->setPort($this->port);
+		$ipp->setUserName($this->userid);
+		if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+		// select printer uri for module order, propal,...
+		$sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
+		$result = $this->db->query($sql);
+		if ($result)
+		{
+			$obj = $this->db->fetch_object($result);
+			if ($obj)
+			{
+				$ipp->setPrinterURI($obj->printer_uri);
+			}
+			else
+			{
+				// All printers
+				$ipp->setPrinterURI("ipp://localhost:631/printers/");
+			}
+		}
+		// Getting Jobs
+		try {
+			$ipp->getJobs(false,0,'completed',false);			// May return errors if setup not correct
+		}
+		catch(Exception $e)
+		{
+			setEventMessage('[printipp] '.$langs->trans('CoreErrorMessage'), 'errors');
+			dol_syslog($e->getMessage(), LOG_ERR);
+		}
 
-        print '<table width="100%" class="noborder">';
-        print '<tr class="liste_titre">';
-        print "<td>Id</td>";
-        print "<td>Owner</td>";
-        print "<td>Printer</td>";
-        print "<td>File</td>";
-        print "<td>Status</td>";
-        print "<td>Cancel</td>";
-        print "</tr>\n";
-        $jobs = $ipp->jobs_attributes;
-        $var = true;
-        //print '<pre>'.print_r($jobs,true).'</pre>';
-        if (is_array($jobs))
-        {
-	        foreach ($jobs as $value)
-	        {
+		print '<table width="100%" class="noborder">';
+		print '<tr class="liste_titre">';
+		print "<td>Id</td>";
+		print "<td>Owner</td>";
+		print "<td>Printer</td>";
+		print "<td>File</td>";
+		print "<td>Status</td>";
+		print "<td>Cancel</td>";
+		print "</tr>\n";
+		$jobs = $ipp->jobs_attributes;
+		$var = true;
+		//print '<pre>'.print_r($jobs,true).'</pre>';
+		if (is_array($jobs))
+		{
+			foreach ($jobs as $value)
+			{
 	            
-	            print '<tr class="oddeven">';
-	            print '<td>'.$value->job_id->_value0.'</td>';
-	            print '<td>'.$value->job_originating_user_name->_value0.'</td>';
-	            print '<td>'.$value->printer_uri->_value0.'</td>';
-	            print '<td>'.$value->job_name->_value0.'</td>';
-	            print '<td>'.$value->job_state->_value0.'</td>';
-	            print '<td>'.$value->job_uri->_value0.'</td>';
-	            print '</tr>';
-	        }
-        }
-        print "</table>";
-    }
+				print '<tr class="oddeven">';
+				print '<td>'.$value->job_id->_value0.'</td>';
+				print '<td>'.$value->job_originating_user_name->_value0.'</td>';
+				print '<td>'.$value->printer_uri->_value0.'</td>';
+				print '<td>'.$value->job_name->_value0.'</td>';
+				print '<td>'.$value->job_state->_value0.'</td>';
+				print '<td>'.$value->job_uri->_value0.'</td>';
+				print '</tr>';
+			}
+		}
+		print "</table>";
+	}
 
 }

Spacing +12 added lines, -12 removed lines

@@ -28,7 +28,7 @@ 
 {
     var $host;
     var $port;
-    var $userid;    /* user login */
+    var $userid; /* user login */
     var $user;
     var $password;
     var $error;
@@ -46,14 +46,14 @@ 
      * @param   string      $user       user
      * @param   string      $password   password
      */
-    function __construct($db,$host,$port,$userid,$user,$password)
+    function __construct($db, $host, $port, $userid, $user, $password)
     {
-        $this->db=$db;
-        $this->host=$host;
-        $this->port=$port;
-        $this->userid=$userid;
-        $this->user=$user;
-        $this->password=$password;
+        $this->db = $db;
+        $this->host = $host;
+        $this->port = $port;
+        $this->userid = $userid;
+        $this->user = $user;
+        $this->password = $password;
     }
 
 
@@ -69,11 +69,11 @@ 
         global $conf, $db, $bc, $langs;
         include_once DOL_DOCUMENT_ROOT.'/includes/printipp/CupsPrintIPP.php';
         $ipp = new CupsPrintIPP();
-        $ipp->setLog(DOL_DATA_ROOT.'/printipp.log','file',3); // logging very verbose
+        $ipp->setLog(DOL_DATA_ROOT.'/printipp.log', 'file', 3); // logging very verbose
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (!empty($this->user)) $ipp->setAuthentication($this->user, $this->password);
         // select printer uri for module order, propal,...
         $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
         $result = $this->db->query($sql);
@@ -92,9 +92,9 @@ 
         }
         // Getting Jobs
         try {
-        	$ipp->getJobs(false,0,'completed',false);			// May return errors if setup not correct
+        	$ipp->getJobs(false, 0, 'completed', false); // May return errors if setup not correct
         }
-        catch(Exception $e)
+        catch (Exception $e)
         {
             setEventMessage('[printipp] '.$langs->trans('CoreErrorMessage'), 'errors');
             dol_syslog($e->getMessage(), LOG_ERR);

Braces +5 added lines, -5 removed lines

@@ -73,7 +73,9 @@ 
         $ipp->setHost($this->host);
         $ipp->setPort($this->port);
         $ipp->setUserName($this->userid);
-        if (! empty($this->user)) $ipp->setAuthentication($this->user,$this->password);
+        if (! empty($this->user)) {
+        	$ipp->setAuthentication($this->user,$this->password);
+        }
         // select printer uri for module order, propal,...
         $sql = 'SELECT rowid,printer_uri,printer_name FROM '.MAIN_DB_PREFIX.'printer_ipp WHERE module="'.$module.'"';
         $result = $this->db->query($sql);
@@ -83,8 +85,7 @@ 
             if ($obj)
             {
                 $ipp->setPrinterURI($obj->printer_uri);
-            }
-            else
+            } else
             {
                 // All printers
                 $ipp->setPrinterURI("ipp://localhost:631/printers/");
@@ -93,8 +94,7 @@ 
         // Getting Jobs
         try {
         	$ipp->getJobs(false,0,'completed',false);			// May return errors if setup not correct
-        }
-        catch(Exception $e)
+        } catch(Exception $e)
         {
             setEventMessage('[printipp] '.$langs->trans('CoreErrorMessage'), 'errors');
             dol_syslog($e->getMessage(), LOG_ERR);

htdocs/core/actions_setmoduleoptions.inc.php

Indentation +53 added lines, -53 removed lines

@@ -29,61 +29,61 @@
 // Define constants for submodules that contains parameters (forms with param1, param2, ... and value1, value2, ...)
 if ($action == 'setModuleOptions')
 {
-    $db->begin();
+	$db->begin();
 
-    // Process common param fields
-    if (is_array($_POST))
-    {
-        foreach($_POST as $key => $val)
-        {
-            if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
-            {
-                $param=GETPOST("param".$reg[1],'alpha');
-                $value=GETPOST("value".$reg[1],'alpha');
-                if ($param)
-                {
-                    $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-                    if (! $res > 0) $error++;
-                }
-            }
-        }
-    }
+	// Process common param fields
+	if (is_array($_POST))
+	{
+		foreach($_POST as $key => $val)
+		{
+			if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+			{
+				$param=GETPOST("param".$reg[1],'alpha');
+				$value=GETPOST("value".$reg[1],'alpha');
+				if ($param)
+				{
+					$res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
+					if (! $res > 0) $error++;
+				}
+			}
+		}
+	}
 
-    // Process upload fields
-    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
-    {
-        include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
-        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
-        foreach($listofdir as $key=>$tmpdir)
-        {
-            $tmpdir=trim($tmpdir);
-            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-            if (! $tmpdir) {
-                unset($listofdir[$key]); continue;
-            }
-            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-            else
-            {
-                $upload_dir=$tmpdir;
-            }
-        }
-        if ($upload_dir)
-        {
-            $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
-            if ($result <= 0) $error++;
-        }
-    }
+	// Process upload fields
+	if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
+	{
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		$keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
+		$listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
+		foreach($listofdir as $key=>$tmpdir)
+		{
+			$tmpdir=trim($tmpdir);
+			$tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
+			if (! $tmpdir) {
+				unset($listofdir[$key]); continue;
+			}
+			if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+			else
+			{
+				$upload_dir=$tmpdir;
+			}
+		}
+		if ($upload_dir)
+		{
+			$result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
+			if ($result <= 0) $error++;
+		}
+	}
 
-    if (! $error)
-    {
-        $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
-    {
-        $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
-    }
+	if (! $error)
+	{
+		$db->commit();
+		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+	}
+	else
+	{
+		$db->rollback();
+		if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+	}
 }
 

Spacing +20 added lines, -20 removed lines

@@ -31,18 +31,18 @@ 
 {
 	$db->begin();
 
-	$ok=True;
-	foreach($arrayofparameters as $key => $val)
+	$ok = True;
+	foreach ($arrayofparameters as $key => $val)
 	{
-		$result=dolibarr_set_const($db,$key,GETPOST($key, 'alpha'),'chaine',0,'',$conf->entity);
+		$result = dolibarr_set_const($db, $key, GETPOST($key, 'alpha'), 'chaine', 0, '', $conf->entity);
 		if ($result < 0)
 		{
-			$ok=False;
+			$ok = False;
 			break;
 		}
 	}
 
-	if (! $error)
+	if (!$error)
 	{
 		$db->commit();
 		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -62,38 +62,38 @@ 
     // Process common param fields
     if (is_array($_POST))
     {
-        foreach($_POST as $key => $val)
+        foreach ($_POST as $key => $val)
         {
             if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
             {
-                $param=GETPOST("param".$reg[1],'alpha');
-                $value=GETPOST("value".$reg[1],'alpha');
+                $param = GETPOST("param".$reg[1], 'alpha');
+                $value = GETPOST("value".$reg[1], 'alpha');
                 if ($param)
                 {
-                    $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-                    if (! $res > 0) $error++;
+                    $res = dolibarr_set_const($db, $param, $value, 'chaine', 0, '', $conf->entity);
+                    if (!$res > 0) $error++;
                 }
             }
         }
     }
 
     // Process upload fields
-    if (GETPOST('upload','alpha') && GETPOST('keyforuploaddir','aZ09'))
+    if (GETPOST('upload', 'alpha') && GETPOST('keyforuploaddir', 'aZ09'))
     {
         include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-        $keyforuploaddir=GETPOST('keyforuploaddir','aZ09');
-        $listofdir=explode(',',preg_replace('/[\r\n]+/',',',trim($conf->global->$keyforuploaddir)));
-        foreach($listofdir as $key=>$tmpdir)
+        $keyforuploaddir = GETPOST('keyforuploaddir', 'aZ09');
+        $listofdir = explode(',', preg_replace('/[\r\n]+/', ',', trim($conf->global->$keyforuploaddir)));
+        foreach ($listofdir as $key=>$tmpdir)
         {
-            $tmpdir=trim($tmpdir);
-            $tmpdir=preg_replace('/DOL_DATA_ROOT/',DOL_DATA_ROOT,$tmpdir);
-            if (! $tmpdir) {
+            $tmpdir = trim($tmpdir);
+            $tmpdir = preg_replace('/DOL_DATA_ROOT/', DOL_DATA_ROOT, $tmpdir);
+            if (!$tmpdir) {
                 unset($listofdir[$key]); continue;
             }
-            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            if (!is_dir($tmpdir)) $texttitle .= img_warning($langs->trans("ErrorDirNotFound", $tmpdir), 0);
             else
             {
-                $upload_dir=$tmpdir;
+                $upload_dir = $tmpdir;
             }
         }
         if ($upload_dir)
@@ -103,7 +103,7 @@ 
         }
     }
 
-    if (! $error)
+    if (!$error)
     {
         $db->commit();
         if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');

Braces +26 added lines, -13 removed lines

@@ -45,12 +45,15 @@ 
 	if (! $error)
 	{
 		$db->commit();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-	}
-	else
+		if (empty($nomessageinupdate)) {
+			setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+		}
+	} else
 	{
 		$db->rollback();
-		if (empty($nomessageinupdate)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		if (empty($nomessageinupdate)) {
+			setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+		}
 	}
 }
 
@@ -64,14 +67,18 @@ 
     {
         foreach($_POST as $key => $val)
         {
-            if (preg_match('/^param(\d*)$/', $key, $reg))    // Works for POST['param'], POST['param1'], POST['param2'], ...
+            if (preg_match('/^param(\d*)$/', $key, $reg)) {
+            	// Works for POST['param'], POST['param1'], POST['param2'], ...
             {
                 $param=GETPOST("param".$reg[1],'alpha');
+            }
                 $value=GETPOST("value".$reg[1],'alpha');
                 if ($param)
                 {
                     $res = dolibarr_set_const($db,$param,$value,'chaine',0,'',$conf->entity);
-                    if (! $res > 0) $error++;
+                    if (! $res > 0) {
+                    	$error++;
+                    }
                 }
             }
         }
@@ -90,8 +97,9 @@ 
             if (! $tmpdir) {
                 unset($listofdir[$key]); continue;
             }
-            if (! is_dir($tmpdir)) $texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
-            else
+            if (! is_dir($tmpdir)) {
+            	$texttitle.=img_warning($langs->trans("ErrorDirNotFound",$tmpdir),0);
+            } else
             {
                 $upload_dir=$tmpdir;
             }
@@ -99,19 +107,24 @@ 
         if ($upload_dir)
         {
             $result = dol_add_file_process($upload_dir, 0, 1, 'uploadfile', '');
-            if ($result <= 0) $error++;
+            if ($result <= 0) {
+            	$error++;
+            }
         }
     }
 
     if (! $error)
     {
         $db->commit();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+        if (empty($nomessageinsetmoduleoptions)) {
+        	setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+    } else
     {
         $db->rollback();
-        if (empty($nomessageinsetmoduleoptions)) setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+        if (empty($nomessageinsetmoduleoptions)) {
+        	setEventMessages($langs->trans("SetupNotSaved"), null, 'errors');
+        }
     }
 }
 

htdocs/core/extrafieldsinexport.inc.php

Indentation +14 added lines, -14 removed lines

@@ -2,9 +2,9 @@ 
 
 if (empty($keyforselect) || empty($keyforelement) || empty($keyforaliasextra))
 {
-    //print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
-    dol_print_error('', 'include of file extrafieldsinexport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
-    exit;
+	//print $keyforselet.' - '.$keyforelement.' - '.$keyforaliasextra;
+	dol_print_error('', 'include of file extrafieldsinexport.inc.php was done but var $keyforselect or $keyforelement or $keyforaliasextra was not set');
+	exit;
 }
 
 // Add extra fields
@@ -44,20 +44,20 @@ 
 		}
 		if ($obj->type!='separate')
 		{
-		    // If not a computed field
-		    if (empty($obj->fieldcomputed))
-		    {
-    			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-    			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-    			$this->export_entities_array[$r][$fieldname]=$keyforelement;
-		    }
+			// If not a computed field
+			if (empty($obj->fieldcomputed))
+			{
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+				$this->export_entities_array[$r][$fieldname]=$keyforelement;
+			}
 			// If this is a computed field
 			else
 			{
-			    $this->export_fields_array[$r][$fieldname]=$fieldlabel;
-			    $this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
-			    $this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
-			    $this->export_entities_array[$r][$fieldname]=$keyforelement;
+				$this->export_fields_array[$r][$fieldname]=$fieldlabel;
+				$this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
+				$this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
+				$this->export_entities_array[$r][$fieldname]=$keyforelement;
 			}
 		}
 	}

Spacing +23 added lines, -23 removed lines

@@ -8,58 +8,58 @@
 }
 
 // Add extra fields
-$sql="SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
+$sql = "SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
 //print $sql;
-$resql=$this->db->query($sql);
+$resql = $this->db->query($sql);
 if ($resql)    // This can fail when class is used on old database (during migration for example)
 {
-	while ($obj=$this->db->fetch_object($resql))
+	while ($obj = $this->db->fetch_object($resql))
 	{
-		$fieldname=$keyforaliasextra.'.'.$obj->name;
-		$fieldlabel=ucfirst($obj->label);
-		$typeFilter="Text";
-		$typefield=preg_replace('/\(.*$/', '', $obj->type);	// double(24,8) -> double
+		$fieldname = $keyforaliasextra.'.'.$obj->name;
+		$fieldlabel = ucfirst($obj->label);
+		$typeFilter = "Text";
+		$typefield = preg_replace('/\(.*$/', '', $obj->type); // double(24,8) -> double
 		switch ($typefield) {
 			case 'int':
 			case 'integer':
 			case 'double':
 			case 'price':
-				$typeFilter="Numeric";
+				$typeFilter = "Numeric";
 				break;
 			case 'date':
 			case 'datetime':
 			case 'timestamp':
-				$typeFilter="Date";
+				$typeFilter = "Date";
 				break;
 			case 'boolean':
-				$typeFilter="Boolean";
+				$typeFilter = "Boolean";
 				break;
 			case 'sellist':
-				$tmp='';
-				$tmpparam=unserialize($obj->param);	// $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
+				$tmp = '';
+				$tmpparam = unserialize($obj->param); // $tmp ay be array 'options' => array 'c_currencies:code_iso:code_iso' => null
 				if ($tmpparam['options'] && is_array($tmpparam['options'])) {
-					$tmpkeys=array_keys($tmpparam['options']);
-					$tmp=array_shift($tmpkeys);
+					$tmpkeys = array_keys($tmpparam['options']);
+					$tmp = array_shift($tmpkeys);
 				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter = "List:".$tmp;
 				break;
 		}
-		if ($obj->type!='separate')
+		if ($obj->type != 'separate')
 		{
 		    // If not a computed field
 		    if (empty($obj->fieldcomputed))
 		    {
-    			$this->export_fields_array[$r][$fieldname]=$fieldlabel;
-    			$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
-    			$this->export_entities_array[$r][$fieldname]=$keyforelement;
+    			$this->export_fields_array[$r][$fieldname] = $fieldlabel;
+    			$this->export_TypeFields_array[$r][$fieldname] = $typeFilter;
+    			$this->export_entities_array[$r][$fieldname] = $keyforelement;
 		    }
 			// If this is a computed field
 			else
 			{
-			    $this->export_fields_array[$r][$fieldname]=$fieldlabel;
-			    $this->export_TypeFields_array[$r][$fieldname]=$typeFilter.'Compute';
-			    $this->export_special_array[$r][$fieldname]=$obj->fieldcomputed;
-			    $this->export_entities_array[$r][$fieldname]=$keyforelement;
+			    $this->export_fields_array[$r][$fieldname] = $fieldlabel;
+			    $this->export_TypeFields_array[$r][$fieldname] = $typeFilter.'Compute';
+			    $this->export_special_array[$r][$fieldname] = $obj->fieldcomputed;
+			    $this->export_entities_array[$r][$fieldname] = $keyforelement;
 			}
 		}
 	}

Braces +6 added lines, -2 removed lines

@@ -11,11 +11,13 @@ 
 $sql="SELECT name, label, type, param, fieldcomputed, fielddefault FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = '".$keyforselect."' AND type != 'separate' AND entity IN (0, ".$conf->entity.')';
 //print $sql;
 $resql=$this->db->query($sql);
-if ($resql)    // This can fail when class is used on old database (during migration for example)
+if ($resql) {
+	// This can fail when class is used on old database (during migration for example)
 {
 	while ($obj=$this->db->fetch_object($resql))
 	{
 		$fieldname=$keyforaliasextra.'.'.$obj->name;
+}
 		$fieldlabel=ucfirst($obj->label);
 		$typeFilter="Text";
 		$typefield=preg_replace('/\(.*$/', '', $obj->type);	// double(24,8) -> double
@@ -41,7 +43,9 @@ 
 					$tmpkeys=array_keys($tmpparam['options']);
 					$tmp=array_shift($tmpkeys);
 				}
-				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
+				if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) {
+					$typeFilter="List:".$tmp;
+				}
 				break;
 		}
 		if ($obj->type!='separate')

htdocs/core/actions_lineupdown.inc.php

Spacing +6 added lines, -6 removed lines

@@ -35,9 +35,9 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-	if (! empty($newlang)) {
+	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
@@ -46,7 +46,7 @@ 
 		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
-	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
 	exit();
 }
 
@@ -57,9 +57,9 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
 	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
-	if (! empty($newlang)) {
+	if (!empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
 	}
@@ -67,7 +67,7 @@ 
 		$object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref);
 	}
 
-	header('Location: ' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '#' . GETPOST('rowid'));
+	header('Location: '.$_SERVER["PHP_SELF"].'?id='.$object->id.'#'.GETPOST('rowid'));
 	exit();
 }
 

Braces +12 added lines, -4 removed lines

@@ -35,8 +35,12 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+		$newlang = GETPOST('lang_id','aZ09');
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+		$newlang = $object->thirdparty->default_lang;
+	}
 	if (! empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);
@@ -57,8 +61,12 @@ 
 	// Define output language
 	$outputlangs = $langs;
 	$newlang = '';
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang = GETPOST('lang_id','aZ09');
-	if ($conf->global->MAIN_MULTILANGS && empty($newlang))	$newlang = $object->thirdparty->default_lang;
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+		$newlang = GETPOST('lang_id','aZ09');
+	}
+	if ($conf->global->MAIN_MULTILANGS && empty($newlang)) {
+		$newlang = $object->thirdparty->default_lang;
+	}
 	if (! empty($newlang)) {
 		$outputlangs = new Translate("", $conf);
 		$outputlangs->setDefaultLang($newlang);

htdocs/core/actions_changeselectedfields.inc.php

Indentation +8 added lines, -8 removed lines

@@ -30,19 +30,19 @@
 // Save selection
 if (GETPOST('formfilteraction') == 'listafterchangingselectedfields')
 {
-    $tabparam=array();
+	$tabparam=array();
 
-    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+	$varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
+	if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
+	else $tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
 
-    include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+	include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
     
-    $result=dol_set_user_param($db, $conf, $user, $tabparam);
+	$result=dol_set_user_param($db, $conf, $user, $tabparam);
     
-    //$action='list';
-    //var_dump($tabparam);exit;
+	//$action='list';
+	//var_dump($tabparam);exit;
 }
 
 

Spacing +5 added lines, -5 removed lines

@@ -30,16 +30,16 @@
 // Save selection
 if (GETPOST('formfilteraction') == 'listafterchangingselectedfields')
 {
-    $tabparam=array();
+    $tabparam = array();
 
-    $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
+    $varpage = empty($contextpage) ? $_SERVER["PHP_SELF"] : $contextpage;
     
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
+    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = GETPOST("selectedfields");
+    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage] = '';
 
     include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
     
-    $result=dol_set_user_param($db, $conf, $user, $tabparam);
+    $result = dol_set_user_param($db, $conf, $user, $tabparam);
     
     //$action='list';
     //var_dump($tabparam);exit;

Braces +5 added lines, -2 removed lines

@@ -34,8 +34,11 @@
 
     $varpage=empty($contextpage)?$_SERVER["PHP_SELF"]:$contextpage;
     
-    if (GETPOST("selectedfields")) $tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
-    else $tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
+    if (GETPOST("selectedfields")) {
+    	$tabparam["MAIN_SELECTEDFIELDS_".$varpage]=GETPOST("selectedfields");
+    } else {
+    	$tabparam["MAIN_SELECTEDFIELDS_".$varpage]='';
+    }
 
     include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';