Inspection of "We continue solving problems with the single entry..." - alxarafe/alixar - Measure and Improve Code Quality continuously with Scrutinizer

Test Failed

Push — master ( bff6d4...ed0f4f )

by Alxarafe

created 2019-01-05 07:07 UTC

Status

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -1,16 +1,16 @@
 block discarded – undo
 <?php
-$force_install_message='KeepDefaultValuesMamp';
-$force_install_main_data_root='/Applications/MAMP/dolibarr_documents';
-$force_install_type='mysqli';
-$force_install_dbserver='localhost';
-$force_install_port='8889';
-$force_install_database='dolibarr';
-$force_install_createdatabase='1';
-$force_install_databaselogin='dolibarrmysql';
-$force_install_databasepass='root';
-$force_install_createuser='1';
-$force_install_databaserootlogin='root';
-$force_install_databaserootpass='root';
-$force_install_dolibarrlogin='admin';
-$force_install_nophpinfo='1';
-$force_install_lockinstall='444';
+$force_install_message = 'KeepDefaultValuesMamp';
+$force_install_main_data_root = '/Applications/MAMP/dolibarr_documents';
+$force_install_type = 'mysqli';
+$force_install_dbserver = 'localhost';
+$force_install_port = '8889';
+$force_install_database = 'dolibarr';
+$force_install_createdatabase = '1';
+$force_install_databaselogin = 'dolibarrmysql';
+$force_install_databasepass = 'root';
+$force_install_createuser = '1';
+$force_install_databaserootlogin = 'root';
+$force_install_databaserootpass = 'root';
+$force_install_dolibarrlogin = 'admin';
+$force_install_nophpinfo = '1';
+$force_install_lockinstall = '444';

Please login to merge, or discard this patch.

dolibarr/build/generate_filelist_xml.php 3 patches

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

@@ -72,9 +72,9 @@  discard block
 block discarded – undo
 
 if (empty($release))
 {
-	print "Error: Missing release paramater\n";
-	print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-	exit -1;
+    print "Error: Missing release paramater\n";
+    print "Usage: ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+    exit -1;
 }
 
 $savrelease = $release;
@@ -83,32 +83,32 @@  discard block
 block discarded – undo
 $tmpver=explode('-', $release, 2);
 if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
 {
-	$release=DOL_VERSION;
-	if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
+    $release=DOL_VERSION;
+    if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
 }
 
 if (empty($includecustom))
 {
-	$tmpverbis=explode('-', $release, 2);
-	if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable')
-	{
-		if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
-	    {
-	    	print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-	    	print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-	        exit -1;
-	    }
-	}
-	else
-	{
-		$tmpverter=explode('-', DOL_VERSION, 2);
-		if ($tmpverter[0] != $tmpverbis[0])
-		{
-			print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
-			print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
-			exit -1;
-		}
-	}
+    $tmpverbis=explode('-', $release, 2);
+    if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable')
+    {
+        if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
+        {
+            print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+            exit -1;
+        }
+    }
+    else
+    {
+        $tmpverter=explode('-', DOL_VERSION, 2);
+        if ($tmpverter[0] != $tmpverbis[0])
+        {
+            print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
+            print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
+            exit -1;
+        }
+    }
 }
 else
 {
@@ -169,10 +169,10 @@  discard block
 block discarded – undo
 $dir='';
 $needtoclose=0;
 foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	if ($newdir!=$dir) {
+    $file = $filetmp['fullname'];
+    //$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
+    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+    if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
 $dir='';
 $needtoclose=0;
 foreach ($files as $filetmp) {
-	$file = $filetmp['fullname'];
-	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+    $file = $filetmp['fullname'];
+    //$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
+    $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
+    $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
     if ($newdir!=$dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");

Please login to merge, or discard this patch.

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

@@ -22,11 +22,11 @@  discard block
 block discarded – undo
  * 		\brief      This script create a xml checksum file
  */
 
-if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');	// Do not create database handler $db
+if (!defined('NOREQUIREDB')) define('NOREQUIREDB', '1'); // Do not create database handler $db
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
  * Main
  */
 
-$includecustom=0;
-$includeconstants=array();
+$includecustom = 0;
+$includeconstants = array();
 
 if (empty($argv[1]))
 {
@@ -53,13 +53,13 @@  discard block
 block discarded – undo
 }
 parse_str($argv[1]);
 
-$i=0;
+$i = 0;
 while ($i < $argc)
 {
-    if (! empty($argv[$i])) parse_str($argv[$i]);
-    if (preg_match('/includeconstant=/',$argv[$i]))
+    if (!empty($argv[$i])) parse_str($argv[$i]);
+    if (preg_match('/includeconstant=/', $argv[$i]))
     {
-        $tmp=explode(':', $includeconstant, 3);
+        $tmp = explode(':', $includeconstant, 3);
         if (count($tmp) != 3)
         {
             print "Error: Bad parameter includeconstant ".$includeconstant."\n";
@@ -80,16 +80,16 @@  discard block
 block discarded – undo
 $savrelease = $release;
 
 // If release is auto, we take current version
-$tmpver=explode('-', $release, 2);
+$tmpver = explode('-', $release, 2);
 if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
 {
-	$release=DOL_VERSION;
-	if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
+	$release = DOL_VERSION;
+	if ($tmpver[1] && $tmpver[0] == 'auto') $release .= '-'.$tmpver[1];
 }
 
 if (empty($includecustom))
 {
-	$tmpverbis=explode('-', $release, 2);
+	$tmpverbis = explode('-', $release, 2);
 	if (empty($tmpverbis[1]) || $tmpver[0] == 'autostable')
 	{
 		if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
 	}
 	else
 	{
-		$tmpverter=explode('-', DOL_VERSION, 2);
+		$tmpverter = explode('-', DOL_VERSION, 2);
 		if ($tmpverter[0] != $tmpverbis[0])
 		{
 			print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
 }
 else
 {
-    if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
+    if (!preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release))
     {
         print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
         print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
 print "Include constants in signature : ";
 foreach ($includeconstants as $countrycode => $tmp)
 {
-    foreach($tmp as $constname => $constvalue)
+    foreach ($tmp as $constname => $constvalue)
     {
         print $constname.'='.$constvalue." ";
     }
@@ -133,24 +133,24 @@  discard block
 block discarded – undo
 print "\n";
 
 //$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
-$outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
+$outputdir = dirname(dirname(__FILE__)).'/htdocs/install';
 print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
-dol_delete_file($outputdir.'/filelist*.xml',0,1,1);
+dol_delete_file($outputdir.'/filelist*.xml', 0, 1, 1);
 
-$checksumconcat=array();
+$checksumconcat = array();
 
-$outputfile=$outputdir.'/filelist-'.$release.'.xml';
-$fp = fopen($outputfile,'w');
+$outputfile = $outputdir.'/filelist-'.$release.'.xml';
+$fp = fopen($outputfile, 'w');
 fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
 fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");
 
 foreach ($includeconstants as $countrycode => $tmp)
 {
     fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
-    foreach($tmp as $constname => $constvalue)
+    foreach ($tmp as $constname => $constvalue)
     {
-        $valueforchecksum=(empty($constvalue)?'0':$constvalue);
-        $checksumconcat[]=$valueforchecksum;
+        $valueforchecksum = (empty($constvalue) ? '0' : $constvalue);
+        $checksumconcat[] = $valueforchecksum;
         fputs($fp, '    <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
     }
     fputs($fp, '</dolibarr_constants>'."\n");
@@ -163,25 +163,25 @@  discard block
 block discarded – undo
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/|').'documents\/|conf\/|install\/))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude='('.($includecustom?'':'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$';  // Exclude dirs
+$regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$regextoexclude = '('.($includecustom ? '' : 'custom|').'documents|conf|install|public\/test|Shared\/PCLZip|nusoap\/lib\/Mail|php\/example|php\/test|geoip\/sample.*\.php|ckeditor\/samples|ckeditor\/adapters)$'; // Exclude dirs
 $files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
-$dir='';
-$needtoclose=0;
+$dir = '';
+$needtoclose = 0;
 foreach ($files as $filetmp) {
 	$file = $filetmp['fullname'];
 	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
-	if ($newdir!=$dir) {
+	if ($newdir != $dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
-        $needtoclose=1;
+        $needtoclose = 1;
     }
-    if (filetype($file)=="file") {
-        $md5=md5_file($file);
-        $checksumconcat[]=$md5;
+    if (filetype($file) == "file") {
+        $md5 = md5_file($file);
+        $checksumconcat[] = $md5;
         fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
     }
 }
@@ -191,11 +191,11 @@  discard block
 block discarded – undo
 asort($checksumconcat); // Sort list of checksum
 //var_dump($checksumconcat);
 fputs($fp, '<dolibarr_htdocs_dir_checksum>'."\n");
-fputs($fp, md5(join(',',$checksumconcat))."\n");
+fputs($fp, md5(join(',', $checksumconcat))."\n");
 fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");
 
 
-$checksumconcat=array();
+$checksumconcat = array();
 
 fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
 
@@ -205,26 +205,26 @@  discard block
 block discarded – undo
 // Need to ignore document custom etc. Note: this also ignore natively symbolic links.
 $files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom|documents|conf|install))[^/]+)+/[^/]+\.(?:php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$#i');
 */
-$regextoinclude='\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
-$regextoexclude='(custom|documents|conf|install)$';  // Exclude dirs
+$regextoinclude = '\.(php|css|html|js|json|tpl|jpg|png|gif|sql|lang)$';
+$regextoexclude = '(custom|documents|conf|install)$'; // Exclude dirs
 $files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
-$dir='';
-$needtoclose=0;
+$dir = '';
+$needtoclose = 0;
 foreach ($files as $filetmp) {
 	$file = $filetmp['fullname'];
 	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
 	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
-    if ($newdir!=$dir) {
+    if ($newdir != $dir) {
         if ($needtoclose)
             fputs($fp, '  </dir>'."\n");
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
-        $needtoclose=1;
+        $needtoclose = 1;
     }
-    if (filetype($file)=="file") {
-        $md5=md5_file($file);
-        $checksumconcat[]=$md5;
+    if (filetype($file) == "file") {
+        $md5 = md5_file($file);
+        $checksumconcat[] = $md5;
         fputs($fp, '    <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
     }
 }
@@ -233,7 +233,7 @@  discard block
 block discarded – undo
 
 asort($checksumconcat); // Sort list of checksum
 fputs($fp, '<dolibarr_script_dir_checksum>'."\n");
-fputs($fp, md5(join(',',$checksumconcat))."\n");
+fputs($fp, md5(join(',', $checksumconcat))."\n");
 fputs($fp, '</dolibarr_script_dir_checksum>'."\n");
 
 fputs($fp, '</checksum_list>'."\n");

Please login to merge, or discard this patch.

Braces +19 added lines, -12 removed lines patch added patch discarded remove patch

@@ -22,7 +22,10 @@  discard block
 block discarded – undo
  * 		\brief      This script create a xml checksum file
  */
 
-if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1');	// Do not create database handler $db
+if (! defined('NOREQUIREDB')) {
+    define('NOREQUIREDB','1');
+}
+// Do not create database handler $db
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
@@ -56,7 +59,9 @@  discard block
 block discarded – undo
 $i=0;
 while ($i < $argc)
 {
-    if (! empty($argv[$i])) parse_str($argv[$i]);
+    if (! empty($argv[$i])) {
+        parse_str($argv[$i]);
+    }
     if (preg_match('/includeconstant=/',$argv[$i]))
     {
         $tmp=explode(':', $includeconstant, 3);
@@ -84,8 +89,10 @@  discard block
 block discarded – undo
 if ($tmpver[0] == 'auto' || $tmpver[0] == 'autostable')
 {
 	$release=DOL_VERSION;
-	if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
-}
+	if ($tmpver[1] && $tmpver[0] == 'auto') {
+	    $release.='-'.$tmpver[1];
+	}
+	}
 
 if (empty($includecustom))
 {
@@ -98,8 +105,7 @@  discard block
 block discarded – undo
 	    	print "Usage:   ".$script_file." release=autostable|auto[-mybuild]|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
 	        exit -1;
 	    }
-	}
-	else
+	} else
 	{
 		$tmpverter=explode('-', DOL_VERSION, 2);
 		if ($tmpverter[0] != $tmpverbis[0])
@@ -109,8 +115,7 @@  discard block
 block discarded – undo
 			exit -1;
 		}
 	}
-}
-else
+} else
 {
     if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
     {
@@ -173,8 +178,9 @@  discard block
 block discarded – undo
 	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
 	if ($newdir!=$dir) {
-        if ($needtoclose)
-            fputs($fp, '  </dir>'."\n");
+        if ($needtoclose) {
+                    fputs($fp, '  </dir>'."\n");
+        }
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
         $needtoclose=1;
@@ -216,8 +222,9 @@  discard block
 block discarded – undo
 	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
 	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
     if ($newdir!=$dir) {
-        if ($needtoclose)
-            fputs($fp, '  </dir>'."\n");
+        if ($needtoclose) {
+                    fputs($fp, '  </dir>'."\n");
+        }
         fputs($fp, '  <dir name="'.$newdir.'" >'."\n");
         $dir = $newdir;
         $needtoclose=1;

Please login to merge, or discard this patch.

dolibarr/dev/tools/test/testtcpdf.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -64,11 +64,11 @@
 block discarded – undo
  - To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
 
 */
-$permissions=array('copy');
-$user_pass='aaa';
-$owner_pass=null;
-$mode=0;
-$pubkeys=null;
+$permissions = array('copy');
+$user_pass = 'aaa';
+$owner_pass = null;
+$mode = 0;
+$pubkeys = null;
 $pdf->SetProtection($permissions, $user_pass, $owner_pass, $mode, $pubkeys);
 
 // Example with public-key

Please login to merge, or discard this patch.

dolibarr/dev/examples/code/create_invoice.php 3 patches

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -83,19 +83,19 @@  discard block
 block discarded – undo
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {
-	// Change status to validated
-	$result=$obj->validate($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
-		$error++;
-		dol_print_error($db,$obj->error);
-	}
+    // Change status to validated
+    $result=$obj->validate($user);
+    if ($result > 0) print "OK Object created with id ".$idobject."\n";
+    else
+    {
+        $error++;
+        dol_print_error($db,$obj->error);
+    }
 }
 else
 {
-	$error++;
-	dol_print_error($db,$obj->error);
+    $error++;
+    dol_print_error($db,$obj->error);
 }
 
 
@@ -103,13 +103,13 @@  discard block
 block discarded – undo
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Please login to merge, or discard this patch.

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -65,43 +65,43 @@  discard block
 block discarded – undo
 //$obj->initAsSpecimen();
 
 $obj->ref            = 'ABCDE';
-$obj->socid          = 4;	// Put id of third party (rowid in llx_societe table)
+$obj->socid          = 4; // Put id of third party (rowid in llx_societe table)
 $obj->date           = mktime();
 $obj->note           = 'A comment';
 $obj->cond_reglement_id = 1;
 
-$line1=new FactureLigne($db);
-$line1->tva_tx=10.0;
-$line1->remise_percent=0;
-$line1->qty=1;
-$line1->total_ht=100;
-$line1->total_tva=10;
-$line1->total_ttc=110;
-$obj->lines[]=$line1;
+$line1 = new FactureLigne($db);
+$line1->tva_tx = 10.0;
+$line1->remise_percent = 0;
+$line1->qty = 1;
+$line1->total_ht = 100;
+$line1->total_tva = 10;
+$line1->total_ttc = 110;
+$obj->lines[] = $line1;
 
 // Create invoice
-$idobject=$obj->create($user);
+$idobject = $obj->create($user);
 if ($idobject > 0)
 {
 	// Change status to validated
-	$result=$obj->validate($user);
+	$result = $obj->validate($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
 	else
 	{
 		$error++;
-		dol_print_error($db,$obj->error);
+		dol_print_error($db, $obj->error);
 	}
 }
 else
 {
 	$error++;
-	dol_print_error($db,$obj->error);
+	dol_print_error($db, $obj->error);
 }
 
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

Please login to merge, or discard this patch.

Braces +5 added lines, -6 removed lines patch added patch discarded remove patch

@@ -85,14 +85,14 @@  discard block
 block discarded – undo
 {
 	// Change status to validated
 	$result=$obj->validate($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
+	if ($result > 0) {
+	    print "OK Object created with id ".$idobject."\n";
+	} else
 	{
 		$error++;
 		dol_print_error($db,$obj->error);
 	}
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$obj->error);
@@ -105,8 +105,7 @@  discard block
 block discarded – undo
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

Please login to merge, or discard this patch.

dolibarr/dev/examples/code/get_contracts.php 1 patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
 print "***** ".$script_file." (".$version.") *****\n";
-if (! isset($argv[1])) {	// Check parameters
+if (!isset($argv[1])) {	// Check parameters
     print "Usage: ".$script_file." id_thirdparty ...\n";
     exit;
 }
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
 
 // Create contract object
 $obj = new Contrat($db);
-$obj->socid=$argv[1];
+$obj->socid = $argv[1];
 
-$listofcontractsforcompany=$obj->getListOfContracts('all');
+$listofcontractsforcompany = $obj->getListOfContracts('all');
 
 print $listofcontractsforcompany;
 

Please login to merge, or discard this patch.

dolibarr/dev/examples/code/create_user.php 3 patches

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -71,23 +71,23 @@  discard block
 block discarded – undo
 $idobject=$obj->create($user);
 if ($idobject > 0)
 {
-	// Change status to validated
-	$result=$obj->setStatut(1);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
-		$error++;
-		dol_print_error($db,$obj->error);
-	}
+    // Change status to validated
+    $result=$obj->setStatut(1);
+    if ($result > 0) print "OK Object created with id ".$idobject."\n";
+    else
+    {
+        $error++;
+        dol_print_error($db,$obj->error);
+    }
 }
 else if ($obj->error == 'ErrorLoginAlreadyExists')
 {
-     print "User with login ".$obj->login." already exists\n";
+        print "User with login ".$obj->login." already exists\n";
 }
 else
 {
-	$error++;
-	dol_print_error($db,$obj->error);
+    $error++;
+    dol_print_error($db,$obj->error);
 }
 
 
@@ -95,13 +95,13 @@  discard block
 block discarded – undo
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
 }
 
 // Global variables
-$version='1.7';
-$error=0;
+$version = '1.7';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -68,16 +68,16 @@  discard block
 block discarded – undo
 $obj->nom   = 'ABCDEF';
 
 // Create user
-$idobject=$obj->create($user);
+$idobject = $obj->create($user);
 if ($idobject > 0)
 {
 	// Change status to validated
-	$result=$obj->setStatut(1);
+	$result = $obj->setStatut(1);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
 	else
 	{
 		$error++;
-		dol_print_error($db,$obj->error);
+		dol_print_error($db, $obj->error);
 	}
 }
 else if ($obj->error == 'ErrorLoginAlreadyExists')
@@ -87,13 +87,13 @@  discard block
 block discarded – undo
 else
 {
 	$error++;
-	dol_print_error($db,$obj->error);
+	dol_print_error($db, $obj->error);
 }
 
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

Please login to merge, or discard this patch.

Braces +6 added lines, -8 removed lines patch added patch discarded remove patch

@@ -73,18 +73,17 @@  discard block
 block discarded – undo
 {
 	// Change status to validated
 	$result=$obj->setStatut(1);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
+	if ($result > 0) {
+	    print "OK Object created with id ".$idobject."\n";
+	} else
 	{
 		$error++;
 		dol_print_error($db,$obj->error);
 	}
-}
-else if ($obj->error == 'ErrorLoginAlreadyExists')
+} else if ($obj->error == 'ErrorLoginAlreadyExists')
 {
      print "User with login ".$obj->login." already exists\n";
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$obj->error);
@@ -97,8 +96,7 @@  discard block
 block discarded – undo
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

Please login to merge, or discard this patch.

dolibarr/dev/examples/code/create_order.php 3 patches

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

@@ -81,19 +81,19 @@  discard block
 block discarded – undo
 $idobject=$com->create($user);
 if ($idobject > 0)
 {
-	// Change status to validated
-	$result=$com->valid($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
-	{
-		$error++;
-		dol_print_error($db,$com->error);
-	}
+    // Change status to validated
+    $result=$com->valid($user);
+    if ($result > 0) print "OK Object created with id ".$idobject."\n";
+    else
+    {
+        $error++;
+        dol_print_error($db,$com->error);
+    }
 }
 else
 {
-	$error++;
-	dol_print_error($db,$com->error);
+    $error++;
+    dol_print_error($db,$com->error);
 }
 
 
@@ -101,13 +101,13 @@  discard block
 block discarded – undo
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Please login to merge, or discard this patch.

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
 }
 
 // Global variables
-$version='1.11';
-$error=0;
+$version = '1.11';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -65,41 +65,41 @@  discard block
 block discarded – undo
 $com = new Commande($db);
 
 $com->ref            = 'ABCDE';
-$com->socid          = 4;	// Put id of third party (rowid in llx_societe table)
+$com->socid          = 4; // Put id of third party (rowid in llx_societe table)
 $com->date_commande  = mktime();
 $com->note           = 'A comment';
 $com->source         = 1;
 $com->remise_percent = 0;
 
-$orderline1=new OrderLine($db);
-$orderline1->tva_tx=10.0;
-$orderline1->remise_percent=0;
-$orderline1->qty=1;
-$com->lines[]=$orderline1;
+$orderline1 = new OrderLine($db);
+$orderline1->tva_tx = 10.0;
+$orderline1->remise_percent = 0;
+$orderline1->qty = 1;
+$com->lines[] = $orderline1;
 
 // Create order
-$idobject=$com->create($user);
+$idobject = $com->create($user);
 if ($idobject > 0)
 {
 	// Change status to validated
-	$result=$com->valid($user);
+	$result = $com->valid($user);
 	if ($result > 0) print "OK Object created with id ".$idobject."\n";
 	else
 	{
 		$error++;
-		dol_print_error($db,$com->error);
+		dol_print_error($db, $com->error);
 	}
 }
 else
 {
 	$error++;
-	dol_print_error($db,$com->error);
+	dol_print_error($db, $com->error);
 }
 
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

Please login to merge, or discard this patch.

Braces +5 added lines, -6 removed lines patch added patch discarded remove patch

@@ -83,14 +83,14 @@  discard block
 block discarded – undo
 {
 	// Change status to validated
 	$result=$com->valid($user);
-	if ($result > 0) print "OK Object created with id ".$idobject."\n";
-	else
+	if ($result > 0) {
+	    print "OK Object created with id ".$idobject."\n";
+	} else
 	{
 		$error++;
 		dol_print_error($db,$com->error);
 	}
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$com->error);
@@ -103,8 +103,7 @@  discard block
 block discarded – undo
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

Please login to merge, or discard this patch.

dolibarr/dev/examples/code/create_product.php 3 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -81,25 +81,25 @@
 block discarded – undo
 $idobject = $myproduct->create($user);
 if ($idobject > 0)
 {
-	print "OK Object created with id ".$idobject."\n";
+    print "OK Object created with id ".$idobject."\n";
 }
 else
 {
-	$error++;
-	dol_print_error($db,$myproduct->error);
+    $error++;
+    dol_print_error($db,$myproduct->error);
 }
 
 // -------------------- END OF YOUR CODE --------------------
 
 if (! $error)
 {
-	$db->commit();
-	print '--- end ok'."\n";
+    $db->commit();
+    print '--- end ok'."\n";
 }
 else
 {
-	print '--- end error code='.$error."\n";
-	$db->rollback();
+    print '--- end error code='.$error."\n";
+    $db->rollback();
 }
 
 $db->close();

Please login to merge, or discard this patch.

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
 }
 
 // Global variables
-$version='1.10';
-$error=0;
+$version = '1.10';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
@@ -44,12 +44,12 @@  discard block
 block discarded – undo
 // After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
 
 //$langs->setDefaultLang('en_US'); 	// To change default language of $langs
-$langs->load("main");				// To load language file for default language
+$langs->load("main"); // To load language file for default language
 @set_time_limit(0);
 
 // Load user and its permissions
-$result=$user->fetch('','admin');	// Load user for login 'admin'. Comment line to run as anonymous user.
-if (! $result > 0) { dol_print_error('',$user->error); exit; }
+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
+if (!$result > 0) { dol_print_error('', $user->error); exit; }
 $user->getrights();
 
 
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
 // Create instance of object
-$myproduct=new Product($db);
+$myproduct = new Product($db);
 
 // Definition of product instance properties
 $myproduct->ref                = '1234';
@@ -86,12 +86,12 @@  discard block
 block discarded – undo
 else
 {
 	$error++;
-	dol_print_error($db,$myproduct->error);
+	dol_print_error($db, $myproduct->error);
 }
 
 // -------------------- END OF YOUR CODE --------------------
 
-if (! $error)
+if (!$error)
 {
 	$db->commit();
 	print '--- end ok'."\n";

Please login to merge, or discard this patch.

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

@@ -82,8 +82,7 @@  discard block
 block discarded – undo
 if ($idobject > 0)
 {
 	print "OK Object created with id ".$idobject."\n";
-}
-else
+} else
 {
 	$error++;
 	dol_print_error($db,$myproduct->error);
@@ -95,8 +94,7 @@  discard block
 block discarded – undo
 {
 	$db->commit();
 	print '--- end ok'."\n";
-}
-else
+} else
 {
 	print '--- end error code='.$error."\n";
 	$db->rollback();

Please login to merge, or discard this patch.

dolibarr/dev/translation/autotranslator.php 2 patches

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -69,23 +69,23 @@
 block discarded – undo
 $file='';
 if (isset($argv[4]))
 {
-	$file=$argv[4];
-	print 'Argument 4='.$argv[4]."\n";
+    $file=$argv[4];
+    print 'Argument 4='.$argv[4]."\n";
 }
 print 'Files will be generated/updated in directory '.$dir."\n";
 
 if ($argv[2] != 'all')
 {
-	if (! is_dir($dir.'/'.$argv[2]))
-	{
-		print 'Create directory '.$dir.'/'.$argv[2]."\n";
-		$result=mkdir($dir.'/'.$argv[2]);
-		if (! $result)
-		{
-			$db->close();
-			return -1;
-		}
-	}
+    if (! is_dir($dir.'/'.$argv[2]))
+    {
+        print 'Create directory '.$dir.'/'.$argv[2]."\n";
+        $result=mkdir($dir.'/'.$argv[2]);
+        if (! $result)
+        {
+            $db->close();
+            return -1;
+        }
+    }
 }
 
 require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";

Please login to merge, or discard this patch.

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -28,7 +28,7 @@  discard block
 block discarded – undo
 
 $sapi_type = php_sapi_name();
 $script_file = basename(__FILE__);
-$path=dirname(__FILE__).'/';
+$path = dirname(__FILE__).'/';
 
 // Test if batch mode
 if (substr($sapi_type, 0, 3) == 'cgi') {
@@ -45,17 +45,17 @@  discard block
 block discarded – undo
 $langs->load("main");
 
 // Global variables
-$version='1.14';
-$error=0;
+$version = '1.14';
+$error = 0;
 
 
 // -------------------- START OF YOUR CODE HERE --------------------
 @set_time_limit(0);
 print "***** ".$script_file." (".$version.") *****\n";
-$dir=DOL_DOCUMENT_ROOT."/langs";
+$dir = DOL_DOCUMENT_ROOT."/langs";
 
 // Check parameters
-if (! isset($argv[3])) {
+if (!isset($argv[3])) {
     print "Usage:   ".$script_file."  lang_code_src lang_code_dest|all APIKEY [langfile.lang]\n";
     print "Example: ".$script_file."  en_US         pt_PT              123456\n";
     print "Rem:     lang_code to use can be found on http://www.google.com/language_tools\n";
@@ -66,21 +66,21 @@  discard block
 block discarded – undo
 print 'Argument 1='.$argv[1]."\n";
 print 'Argument 2='.$argv[2]."\n";
 print 'Argument 3='.$argv[3]."\n";
-$file='';
+$file = '';
 if (isset($argv[4]))
 {
-	$file=$argv[4];
+	$file = $argv[4];
 	print 'Argument 4='.$argv[4]."\n";
 }
 print 'Files will be generated/updated in directory '.$dir."\n";
 
 if ($argv[2] != 'all')
 {
-	if (! is_dir($dir.'/'.$argv[2]))
+	if (!is_dir($dir.'/'.$argv[2]))
 	{
 		print 'Create directory '.$dir.'/'.$argv[2]."\n";
-		$result=mkdir($dir.'/'.$argv[2]);
-		if (! $result)
+		$result = mkdir($dir.'/'.$argv[2]);
+		if (!$result)
 		{
 			$db->close();
 			return -1;
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
 
 require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";
 
-$langParser = new autoTranslator($argv[2],$argv[1],$dir,$file,$argv[3]);
+$langParser = new autoTranslator($argv[2], $argv[1], $dir, $file, $argv[3]);
 
 print "***** Finished *****\n";
 

Please login to merge, or discard this patch.

		@@ -1,16 +1,16 @@
		block discarded – undo
1	1	<?php
2		-$force_install_message='KeepDefaultValuesMamp';
3		-$force_install_main_data_root='/Applications/MAMP/dolibarr_documents';
4		-$force_install_type='mysqli';
5		-$force_install_dbserver='localhost';
6		-$force_install_port='8889';
7		-$force_install_database='dolibarr';
8		-$force_install_createdatabase='1';
9		-$force_install_databaselogin='dolibarrmysql';
10		-$force_install_databasepass='root';
11		-$force_install_createuser='1';
12		-$force_install_databaserootlogin='root';
13		-$force_install_databaserootpass='root';
14		-$force_install_dolibarrlogin='admin';
15		-$force_install_nophpinfo='1';
16		-$force_install_lockinstall='444';
	2	+$force_install_message = 'KeepDefaultValuesMamp';
	3	+$force_install_main_data_root = '/Applications/MAMP/dolibarr_documents';
	4	+$force_install_type = 'mysqli';
	5	+$force_install_dbserver = 'localhost';
	6	+$force_install_port = '8889';
	7	+$force_install_database = 'dolibarr';
	8	+$force_install_createdatabase = '1';
	9	+$force_install_databaselogin = 'dolibarrmysql';
	10	+$force_install_databasepass = 'root';
	11	+$force_install_createuser = '1';
	12	+$force_install_databaserootlogin = 'root';
	13	+$force_install_databaserootpass = 'root';
	14	+$force_install_dolibarrlogin = 'admin';
	15	+$force_install_nophpinfo = '1';
	16	+$force_install_lockinstall = '444';

		@@ -72,9 +72,9 @@ discard block
		block discarded – undo
72	72
73	73	if (empty($release))
74	74	{
75		- print "Error: Missing release paramater\n";
76		- print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
77		- exit -1;
	75	+ print "Error: Missing release paramater\n";
	76	+ print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
	77	+ exit -1;
78	78	}
79	79
80	80	$savrelease = $release;
		@@ -83,32 +83,32 @@ discard block
		block discarded – undo
83	83	$tmpver=explode('-', $release, 2);
84	84	if ($tmpver[0] == 'auto' \|\| $tmpver[0] == 'autostable')
85	85	{
86		- $release=DOL_VERSION;
87		- if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
	86	+ $release=DOL_VERSION;
	87	+ if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
88	88	}
89	89
90	90	if (empty($includecustom))
91	91	{
92		- $tmpverbis=explode('-', $release, 2);
93		- if (empty($tmpverbis[1]) \|\| $tmpver[0] == 'autostable')
94		- {
95		- if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
96		- {
97		- print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
98		- print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
99		- exit -1;
100		- }
101		- }
102		- else
103		- {
104		- $tmpverter=explode('-', DOL_VERSION, 2);
105		- if ($tmpverter[0] != $tmpverbis[0])
106		- {
107		- print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
108		- print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
109		- exit -1;
110		- }
111		- }
	92	+ $tmpverbis=explode('-', $release, 2);
	93	+ if (empty($tmpverbis[1]) \|\| $tmpver[0] == 'autostable')
	94	+ {
	95	+ if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
	96	+ {
	97	+ print 'Error: When parameter "includecustom" is not set and there is no suffix in release parameter, version declared into filefunc.in.php ('.DOL_VERSION.') must be exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
	98	+ print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
	99	+ exit -1;
	100	+ }
	101	+ }
	102	+ else
	103	+ {
	104	+ $tmpverter=explode('-', DOL_VERSION, 2);
	105	+ if ($tmpverter[0] != $tmpverbis[0])
	106	+ {
	107	+ print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
	108	+ print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
	109	+ exit -1;
	110	+ }
	111	+ }
112	112	}
113	113	else
114	114	{
		@@ -169,10 +169,10 @@ discard block
		block discarded – undo
169	169	$dir='';
170	170	$needtoclose=0;
171	171	foreach ($files as $filetmp) {
172		- $file = $filetmp['fullname'];
173		- //$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
174		- $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
175		- if ($newdir!=$dir) {
	172	+ $file = $filetmp['fullname'];
	173	+ //$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
	174	+ $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
	175	+ if ($newdir!=$dir) {
176	176	if ($needtoclose)
177	177	fputs($fp, ' </dir>'."\n");
178	178	fputs($fp, ' <dir name="'.$newdir.'" >'."\n");
		@@ -211,10 +211,10 @@ discard block
		block discarded – undo
211	211	$dir='';
212	212	$needtoclose=0;
213	213	foreach ($files as $filetmp) {
214		- $file = $filetmp['fullname'];
215		- //$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
216		- $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
217		- $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
	214	+ $file = $filetmp['fullname'];
	215	+ //$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
	216	+ $newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
	217	+ $newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
218	218	if ($newdir!=$dir) {
219	219	if ($needtoclose)
220	220	fputs($fp, ' </dir>'."\n");

		@@ -22,11 +22,11 @@ discard block
		block discarded – undo
22	22	* \brief This script create a xml checksum file
23	23	*/
24	24
25		-if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Do not create database handler $db
	25	+if (!defined('NOREQUIREDB')) define('NOREQUIREDB', '1'); // Do not create database handler $db
26	26
27	27	$sapi_type = php_sapi_name();
28	28	$script_file = basename(__FILE__);
29		-$path=dirname(__FILE__).'/';
	29	+$path = dirname(__FILE__).'/';
30	30
31	31	// Test if batch mode
32	32	if (substr($sapi_type, 0, 3) == 'cgi') {
		@@ -42,8 +42,8 @@ discard block
		block discarded – undo
42	42	* Main
43	43	*/
44	44
45		-$includecustom=0;
46		-$includeconstants=array();
	45	+$includecustom = 0;
	46	+$includeconstants = array();
47	47
48	48	if (empty($argv[1]))
49	49	{
		@@ -53,13 +53,13 @@ discard block
		block discarded – undo
53	53	}
54	54	parse_str($argv[1]);
55	55
56		-$i=0;
	56	+$i = 0;
57	57	while ($i < $argc)
58	58	{
59		- if (! empty($argv[$i])) parse_str($argv[$i]);
60		- if (preg_match('/includeconstant=/',$argv[$i]))
	59	+ if (!empty($argv[$i])) parse_str($argv[$i]);
	60	+ if (preg_match('/includeconstant=/', $argv[$i]))
61	61	{
62		- $tmp=explode(':', $includeconstant, 3);
	62	+ $tmp = explode(':', $includeconstant, 3);
63	63	if (count($tmp) != 3)
64	64	{
65	65	print "Error: Bad parameter includeconstant ".$includeconstant."\n";
		@@ -80,16 +80,16 @@ discard block
		block discarded – undo
80	80	$savrelease = $release;
81	81
82	82	// If release is auto, we take current version
83		-$tmpver=explode('-', $release, 2);
	83	+$tmpver = explode('-', $release, 2);
84	84	if ($tmpver[0] == 'auto' \|\| $tmpver[0] == 'autostable')
85	85	{
86		- $release=DOL_VERSION;
87		- if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
	86	+ $release = DOL_VERSION;
	87	+ if ($tmpver[1] && $tmpver[0] == 'auto') $release .= '-'.$tmpver[1];
88	88	}
89	89
90	90	if (empty($includecustom))
91	91	{
92		- $tmpverbis=explode('-', $release, 2);
	92	+ $tmpverbis = explode('-', $release, 2);
93	93	if (empty($tmpverbis[1]) \|\| $tmpver[0] == 'autostable')
94	94	{
95	95	if (DOL_VERSION != $tmpverbis[0] && $savrelease != 'auto')
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	}
102	102	else
103	103	{
104		- $tmpverter=explode('-', DOL_VERSION, 2);
	104	+ $tmpverter = explode('-', DOL_VERSION, 2);
105	105	if ($tmpverter[0] != $tmpverbis[0])
106	106	{
107	107	print 'Error: When parameter "includecustom" is not set, version declared into filefunc.in.php ('.DOL_VERSION.') must have value without prefix ('.$tmpverter[0].') that is exact same value than "release" parameter ('.$tmpverbis[0].')'."\n";
		@@ -112,7 +112,7 @@ discard block
		block discarded – undo
112	112	}
113	113	else
114	114	{
115		- if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
	115	+ if (!preg_match('/'.preg_quote(DOL_VERSION, '/').'-/', $release))
116	116	{
117	117	print 'Error: When parameter "includecustom" is set, version declared into filefunc.inc.php ('.DOL_VERSION.') must be used with a suffix into "release" parameter (ex: '.DOL_VERSION.'-mydistrib).'."\n";
118	118	print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
		@@ -125,7 +125,7 @@ discard block
		block discarded – undo
125	125	print "Include constants in signature : ";
126	126	foreach ($includeconstants as $countrycode => $tmp)
127	127	{
128		- foreach($tmp as $constname => $constvalue)
	128	+ foreach ($tmp as $constname => $constvalue)
129	129	{
130	130	print $constname.'='.$constvalue." ";
131	131	}
		@@ -133,24 +133,24 @@ discard block
		block discarded – undo
133	133	print "\n";
134	134
135	135	//$outputfile=dirname(__FILE__).'/../htdocs/install/filelist-'.$release.'.xml';
136		-$outputdir=dirname(dirname(__FILE__)).'/htdocs/install';
	136	+$outputdir = dirname(dirname(__FILE__)).'/htdocs/install';
137	137	print 'Delete current files '.$outputdir.'/filelist*.xml'."\n";
138		-dol_delete_file($outputdir.'/filelist*.xml',0,1,1);
	138	+dol_delete_file($outputdir.'/filelist*.xml', 0, 1, 1);
139	139
140		-$checksumconcat=array();
	140	+$checksumconcat = array();
141	141
142		-$outputfile=$outputdir.'/filelist-'.$release.'.xml';
143		-$fp = fopen($outputfile,'w');
	142	+$outputfile = $outputdir.'/filelist-'.$release.'.xml';
	143	+$fp = fopen($outputfile, 'w');
144	144	fputs($fp, '<?xml version="1.0" encoding="UTF-8" ?>'."\n");
145	145	fputs($fp, '<checksum_list version="'.$release.'" date="'.dol_print_date(dol_now(), 'dayhourrfc').'" generator="'.$script_file.'">'."\n");
146	146
147	147	foreach ($includeconstants as $countrycode => $tmp)
148	148	{
149	149	fputs($fp, '<dolibarr_constants country="'.$countrycode.'">'."\n");
150		- foreach($tmp as $constname => $constvalue)
	150	+ foreach ($tmp as $constname => $constvalue)
151	151	{
152		- $valueforchecksum=(empty($constvalue)?'0':$constvalue);
153		- $checksumconcat[]=$valueforchecksum;
	152	+ $valueforchecksum = (empty($constvalue) ? '0' : $constvalue);
	153	+ $checksumconcat[] = $valueforchecksum;
154	154	fputs($fp, ' <constant name="'.$constname.'">'.$valueforchecksum.'</constant>'."\n");
155	155	}
156	156	fputs($fp, '</dolibarr_constants>'."\n");
		@@ -163,25 +163,25 @@ discard block
		block discarded – undo
163	163	// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
164	164	$files = new RegexIterator($iterator1, '#^(?:[A-Z]:)?(?:/(?!(?:'.($includecustom?'':'custom\/\|').'documents\/\|conf\/\|install\/))[^/]+)+/[^/]+\.(?:php\|css\|html\|js\|json\|tpl\|jpg\|png\|gif\|sql\|lang)$#i');
165	165	*/
166		-$regextoinclude='\.(php\|css\|html\|js\|json\|tpl\|jpg\|png\|gif\|sql\|lang)$';
167		-$regextoexclude='('.($includecustom?'':'custom\|').'documents\|conf\|install\|public\/test\|Shared\/PCLZip\|nusoap\/lib\/Mail\|php\/example\|php\/test\|geoip\/sample.*\.php\|ckeditor\/samples\|ckeditor\/adapters)$'; // Exclude dirs
	166	+$regextoinclude = '\.(php\|css\|html\|js\|json\|tpl\|jpg\|png\|gif\|sql\|lang)$';
	167	+$regextoexclude = '('.($includecustom ? '' : 'custom\|').'documents\|conf\|install\|public\/test\|Shared\/PCLZip\|nusoap\/lib\/Mail\|php\/example\|php\/test\|geoip\/sample.*\.php\|ckeditor\/samples\|ckeditor\/adapters)$'; // Exclude dirs
168	168	$files = dol_dir_list(DOL_DOCUMENT_ROOT, 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
169		-$dir='';
170		-$needtoclose=0;
	169	+$dir = '';
	170	+$needtoclose = 0;
171	171	foreach ($files as $filetmp) {
172	172	$file = $filetmp['fullname'];
173	173	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
174	174	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
175		- if ($newdir!=$dir) {
	175	+ if ($newdir != $dir) {
176	176	if ($needtoclose)
177	177	fputs($fp, ' </dir>'."\n");
178	178	fputs($fp, ' <dir name="'.$newdir.'" >'."\n");
179	179	$dir = $newdir;
180		- $needtoclose=1;
	180	+ $needtoclose = 1;
181	181	}
182		- if (filetype($file)=="file") {
183		- $md5=md5_file($file);
184		- $checksumconcat[]=$md5;
	182	+ if (filetype($file) == "file") {
	183	+ $md5 = md5_file($file);
	184	+ $checksumconcat[] = $md5;
185	185	fputs($fp, ' <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
186	186	}
187	187	}
		@@ -191,11 +191,11 @@ discard block
		block discarded – undo
191	191	asort($checksumconcat); // Sort list of checksum
192	192	//var_dump($checksumconcat);
193	193	fputs($fp, '<dolibarr_htdocs_dir_checksum>'."\n");
194		-fputs($fp, md5(join(',',$checksumconcat))."\n");
	194	+fputs($fp, md5(join(',', $checksumconcat))."\n");
195	195	fputs($fp, '</dolibarr_htdocs_dir_checksum>'."\n");
196	196
197	197
198		-$checksumconcat=array();
	198	+$checksumconcat = array();
199	199
200	200	fputs($fp, '<dolibarr_script_dir version="'.$release.'">'."\n");
201	201
		@@ -205,26 +205,26 @@ discard block
		block discarded – undo
205	205	// Need to ignore document custom etc. Note: this also ignore natively symbolic links.
206	206	$files = new RegexIterator($iterator2, '#^(?:[A-Z]:)?(?:/(?!(?:custom\|documents\|conf\|install))[^/]+)+/[^/]+\.(?:php\|css\|html\|js\|json\|tpl\|jpg\|png\|gif\|sql\|lang)$#i');
207	207	*/
208		-$regextoinclude='\.(php\|css\|html\|js\|json\|tpl\|jpg\|png\|gif\|sql\|lang)$';
209		-$regextoexclude='(custom\|documents\|conf\|install)$'; // Exclude dirs
	208	+$regextoinclude = '\.(php\|css\|html\|js\|json\|tpl\|jpg\|png\|gif\|sql\|lang)$';
	209	+$regextoexclude = '(custom\|documents\|conf\|install)$'; // Exclude dirs
210	210	$files = dol_dir_list(dirname(__FILE__).'/../scripts/', 'files', 1, $regextoinclude, $regextoexclude, 'fullname');
211		-$dir='';
212		-$needtoclose=0;
	211	+$dir = '';
	212	+$needtoclose = 0;
213	213	foreach ($files as $filetmp) {
214	214	$file = $filetmp['fullname'];
215	215	//$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
216	216	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
217	217	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
218		- if ($newdir!=$dir) {
	218	+ if ($newdir != $dir) {
219	219	if ($needtoclose)
220	220	fputs($fp, ' </dir>'."\n");
221	221	fputs($fp, ' <dir name="'.$newdir.'" >'."\n");
222	222	$dir = $newdir;
223		- $needtoclose=1;
	223	+ $needtoclose = 1;
224	224	}
225		- if (filetype($file)=="file") {
226		- $md5=md5_file($file);
227		- $checksumconcat[]=$md5;
	225	+ if (filetype($file) == "file") {
	226	+ $md5 = md5_file($file);
	227	+ $checksumconcat[] = $md5;
228	228	fputs($fp, ' <md5file name="'.basename($file).'">'.$md5.'</md5file>'."\n");
229	229	}
230	230	}
		@@ -233,7 +233,7 @@ discard block
		block discarded – undo
233	233
234	234	asort($checksumconcat); // Sort list of checksum
235	235	fputs($fp, '<dolibarr_script_dir_checksum>'."\n");
236		-fputs($fp, md5(join(',',$checksumconcat))."\n");
	236	+fputs($fp, md5(join(',', $checksumconcat))."\n");
237	237	fputs($fp, '</dolibarr_script_dir_checksum>'."\n");
238	238
239	239	fputs($fp, '</checksum_list>'."\n");

		@@ -22,7 +22,10 @@ discard block
		block discarded – undo
22	22	* \brief This script create a xml checksum file
23	23	*/
24	24
25		-if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Do not create database handler $db
	25	+if (! defined('NOREQUIREDB')) {
	26	+ define('NOREQUIREDB','1');
	27	+}
	28	+// Do not create database handler $db
26	29
27	30	$sapi_type = php_sapi_name();
28	31	$script_file = basename(__FILE__);
		@@ -56,7 +59,9 @@ discard block
		block discarded – undo
56	59	$i=0;
57	60	while ($i < $argc)
58	61	{
59		- if (! empty($argv[$i])) parse_str($argv[$i]);
	62	+ if (! empty($argv[$i])) {
	63	+ parse_str($argv[$i]);
	64	+ }
60	65	if (preg_match('/includeconstant=/',$argv[$i]))
61	66	{
62	67	$tmp=explode(':', $includeconstant, 3);
		@@ -84,8 +89,10 @@ discard block
		block discarded – undo
84	89	if ($tmpver[0] == 'auto' \|\| $tmpver[0] == 'autostable')
85	90	{
86	91	$release=DOL_VERSION;
87		- if ($tmpver[1] && $tmpver[0] == 'auto') $release.='-'.$tmpver[1];
88		-}
	92	+ if ($tmpver[1] && $tmpver[0] == 'auto') {
	93	+ $release.='-'.$tmpver[1];
	94	+ }
	95	+ }
89	96
90	97	if (empty($includecustom))
91	98	{
		@@ -98,8 +105,7 @@ discard block
		block discarded – undo
98	105	print "Usage: ".$script_file." release=autostable\|auto[-mybuild]\|x.y.z[-mybuild] [includecustom=1] [includeconstant=CC:MY_CONF_NAME:value]\n";
99	106	exit -1;
100	107	}
101		- }
102		- else
	108	+ } else
103	109	{
104	110	$tmpverter=explode('-', DOL_VERSION, 2);
105	111	if ($tmpverter[0] != $tmpverbis[0])
		@@ -109,8 +115,7 @@ discard block
		block discarded – undo
109	115	exit -1;
110	116	}
111	117	}
112		-}
113		-else
	118	+} else
114	119	{
115	120	if (! preg_match('/'.preg_quote(DOL_VERSION,'/').'-/',$release))
116	121	{
		@@ -173,8 +178,9 @@ discard block
		block discarded – undo
173	178	//$newdir = str_replace(dirname(__FILE__).'/../htdocs', '', dirname($file));
174	179	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
175	180	if ($newdir!=$dir) {
176		- if ($needtoclose)
177		- fputs($fp, ' </dir>'."\n");
	181	+ if ($needtoclose) {
	182	+ fputs($fp, ' </dir>'."\n");
	183	+ }
178	184	fputs($fp, ' <dir name="'.$newdir.'" >'."\n");
179	185	$dir = $newdir;
180	186	$needtoclose=1;
		@@ -216,8 +222,9 @@ discard block
		block discarded – undo
216	222	$newdir = str_replace(DOL_DOCUMENT_ROOT, '', dirname($file));
217	223	$newdir = str_replace(dirname(__FILE__).'/../scripts', '', dirname($file));
218	224	if ($newdir!=$dir) {
219		- if ($needtoclose)
220		- fputs($fp, ' </dir>'."\n");
	225	+ if ($needtoclose) {
	226	+ fputs($fp, ' </dir>'."\n");
	227	+ }
221	228	fputs($fp, ' <dir name="'.$newdir.'" >'."\n");
222	229	$dir = $newdir;
223	230	$needtoclose=1;

		@@ -64,11 +64,11 @@
		block discarded – undo
64	64	- To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
65	65
66	66	*/
67		-$permissions=array('copy');
68		-$user_pass='aaa';
69		-$owner_pass=null;
70		-$mode=0;
71		-$pubkeys=null;
	67	+$permissions = array('copy');
	68	+$user_pass = 'aaa';
	69	+$owner_pass = null;
	70	+$mode = 0;
	71	+$pubkeys = null;
72	72	$pdf->SetProtection($permissions, $user_pass, $owner_pass, $mode, $pubkeys);
73	73
74	74	// Example with public-key

		@@ -83,19 +83,19 @@ discard block
		block discarded – undo
83	83	$idobject=$obj->create($user);
84	84	if ($idobject > 0)
85	85	{
86		- // Change status to validated
87		- $result=$obj->validate($user);
88		- if ($result > 0) print "OK Object created with id ".$idobject."\n";
89		- else
90		- {
91		- $error++;
92		- dol_print_error($db,$obj->error);
93		- }
	86	+ // Change status to validated
	87	+ $result=$obj->validate($user);
	88	+ if ($result > 0) print "OK Object created with id ".$idobject."\n";
	89	+ else
	90	+ {
	91	+ $error++;
	92	+ dol_print_error($db,$obj->error);
	93	+ }
94	94	}
95	95	else
96	96	{
97		- $error++;
98		- dol_print_error($db,$obj->error);
	97	+ $error++;
	98	+ dol_print_error($db,$obj->error);
99	99	}
100	100
101	101
		@@ -103,13 +103,13 @@ discard block
		block discarded – undo
103	103
104	104	if (! $error)
105	105	{
106		- $db->commit();
107		- print '--- end ok'."\n";
	106	+ $db->commit();
	107	+ print '--- end ok'."\n";
108	108	}
109	109	else
110	110	{
111		- print '--- end error code='.$error."\n";
112		- $db->rollback();
	111	+ print '--- end error code='.$error."\n";
	112	+ $db->rollback();
113	113	}
114	114
115	115	$db->close();

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25
26	26	$sapi_type = php_sapi_name();
27	27	$script_file = basename(__FILE__);
28		-$path=dirname(__FILE__).'/';
	28	+$path = dirname(__FILE__).'/';
29	29
30	30	// Test if batch mode
31	31	if (substr($sapi_type, 0, 3) == 'cgi') {
		@@ -34,8 +34,8 @@ discard block
		block discarded – undo
34	34	}
35	35
36	36	// Global variables
37		-$version='1.7';
38		-$error=0;
	37	+$version = '1.7';
	38	+$error = 0;
39	39
40	40
41	41	// -------------------- START OF YOUR CODE HERE --------------------
		@@ -44,12 +44,12 @@ discard block
		block discarded – undo
44	44	// After this $db, $mysoc, $langs and $conf->entity are defined. Opened handler to database will be closed at end of file.
45	45
46	46	//$langs->setDefaultLang('en_US'); // To change default language of $langs
47		-$langs->load("main"); // To load language file for default language
	47	+$langs->load("main"); // To load language file for default language
48	48	@set_time_limit(0);
49	49
50	50	// Load user and its permissions
51		-$result=$user->fetch('','admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
52		-if (! $result > 0) { dol_print_error('',$user->error); exit; }
	51	+$result = $user->fetch('', 'admin'); // Load user for login 'admin'. Comment line to run as anonymous user.
	52	+if (!$result > 0) { dol_print_error('', $user->error); exit; }
53	53	$user->getrights();
54	54
55	55
		@@ -65,43 +65,43 @@ discard block
		block discarded – undo
65	65	//$obj->initAsSpecimen();
66	66
67	67	$obj->ref = 'ABCDE';
68		-$obj->socid = 4; // Put id of third party (rowid in llx_societe table)
	68	+$obj->socid = 4; // Put id of third party (rowid in llx_societe table)
69	69	$obj->date = mktime();
70	70	$obj->note = 'A comment';
71	71	$obj->cond_reglement_id = 1;
72	72
73		-$line1=new FactureLigne($db);
74		-$line1->tva_tx=10.0;
75		-$line1->remise_percent=0;
76		-$line1->qty=1;
77		-$line1->total_ht=100;
78		-$line1->total_tva=10;
79		-$line1->total_ttc=110;
80		-$obj->lines[]=$line1;
	73	+$line1 = new FactureLigne($db);
	74	+$line1->tva_tx = 10.0;
	75	+$line1->remise_percent = 0;
	76	+$line1->qty = 1;
	77	+$line1->total_ht = 100;
	78	+$line1->total_tva = 10;
	79	+$line1->total_ttc = 110;
	80	+$obj->lines[] = $line1;
81	81
82	82	// Create invoice
83		-$idobject=$obj->create($user);
	83	+$idobject = $obj->create($user);
84	84	if ($idobject > 0)
85	85	{
86	86	// Change status to validated
87		- $result=$obj->validate($user);
	87	+ $result = $obj->validate($user);
88	88	if ($result > 0) print "OK Object created with id ".$idobject."\n";
89	89	else
90	90	{
91	91	$error++;
92		- dol_print_error($db,$obj->error);
	92	+ dol_print_error($db, $obj->error);
93	93	}
94	94	}
95	95	else
96	96	{
97	97	$error++;
98		- dol_print_error($db,$obj->error);
	98	+ dol_print_error($db, $obj->error);
99	99	}
100	100
101	101
102	102	// -------------------- END OF YOUR CODE --------------------
103	103
104		-if (! $error)
	104	+if (!$error)
105	105	{
106	106	$db->commit();
107	107	print '--- end ok'."\n";

		@@ -85,14 +85,14 @@ discard block
		block discarded – undo
85	85	{
86	86	// Change status to validated
87	87	$result=$obj->validate($user);
88		- if ($result > 0) print "OK Object created with id ".$idobject."\n";
89		- else
	88	+ if ($result > 0) {
	89	+ print "OK Object created with id ".$idobject."\n";
	90	+ } else
90	91	{
91	92	$error++;
92	93	dol_print_error($db,$obj->error);
93	94	}
94		-}
95		-else
	95	+} else
96	96	{
97	97	$error++;
98	98	dol_print_error($db,$obj->error);
		@@ -105,8 +105,7 @@ discard block
		block discarded – undo
105	105	{
106	106	$db->commit();
107	107	print '--- end ok'."\n";
108		-}
109		-else
	108	+} else
110	109	{
111	110	print '--- end error code='.$error."\n";
112	111	$db->rollback();

		@@ -71,23 +71,23 @@ discard block
		block discarded – undo
71	71	$idobject=$obj->create($user);
72	72	if ($idobject > 0)
73	73	{
74		- // Change status to validated
75		- $result=$obj->setStatut(1);
76		- if ($result > 0) print "OK Object created with id ".$idobject."\n";
77		- else
78		- {
79		- $error++;
80		- dol_print_error($db,$obj->error);
81		- }
	74	+ // Change status to validated
	75	+ $result=$obj->setStatut(1);
	76	+ if ($result > 0) print "OK Object created with id ".$idobject."\n";
	77	+ else
	78	+ {
	79	+ $error++;
	80	+ dol_print_error($db,$obj->error);
	81	+ }
82	82	}
83	83	else if ($obj->error == 'ErrorLoginAlreadyExists')
84	84	{
85		- print "User with login ".$obj->login." already exists\n";
	85	+ print "User with login ".$obj->login." already exists\n";
86	86	}
87	87	else
88	88	{
89		- $error++;
90		- dol_print_error($db,$obj->error);
	89	+ $error++;
	90	+ dol_print_error($db,$obj->error);
91	91	}
92	92
93	93
		@@ -95,13 +95,13 @@ discard block
		block discarded – undo
95	95
96	96	if (! $error)
97	97	{
98		- $db->commit();
99		- print '--- end ok'."\n";
	98	+ $db->commit();
	99	+ print '--- end ok'."\n";
100	100	}
101	101	else
102	102	{
103		- print '--- end error code='.$error."\n";
104		- $db->rollback();
	103	+ print '--- end error code='.$error."\n";
	104	+ $db->rollback();
105	105	}
106	106
107	107	$db->close();

		@@ -73,18 +73,17 @@ discard block
		block discarded – undo
73	73	{
74	74	// Change status to validated
75	75	$result=$obj->setStatut(1);
76		- if ($result > 0) print "OK Object created with id ".$idobject."\n";
77		- else
	76	+ if ($result > 0) {
	77	+ print "OK Object created with id ".$idobject."\n";
	78	+ } else
78	79	{
79	80	$error++;
80	81	dol_print_error($db,$obj->error);
81	82	}
82		-}
83		-else if ($obj->error == 'ErrorLoginAlreadyExists')
	83	+} else if ($obj->error == 'ErrorLoginAlreadyExists')
84	84	{
85	85	print "User with login ".$obj->login." already exists\n";
86		-}
87		-else
	86	+} else
88	87	{
89	88	$error++;
90	89	dol_print_error($db,$obj->error);
		@@ -97,8 +96,7 @@ discard block
		block discarded – undo
97	96	{
98	97	$db->commit();
99	98	print '--- end ok'."\n";
100		-}
101		-else
	99	+} else
102	100	{
103	101	print '--- end error code='.$error."\n";
104	102	$db->rollback();

		@@ -81,19 +81,19 @@ discard block
		block discarded – undo
81	81	$idobject=$com->create($user);
82	82	if ($idobject > 0)
83	83	{
84		- // Change status to validated
85		- $result=$com->valid($user);
86		- if ($result > 0) print "OK Object created with id ".$idobject."\n";
87		- else
88		- {
89		- $error++;
90		- dol_print_error($db,$com->error);
91		- }
	84	+ // Change status to validated
	85	+ $result=$com->valid($user);
	86	+ if ($result > 0) print "OK Object created with id ".$idobject."\n";
	87	+ else
	88	+ {
	89	+ $error++;
	90	+ dol_print_error($db,$com->error);
	91	+ }
92	92	}
93	93	else
94	94	{
95		- $error++;
96		- dol_print_error($db,$com->error);
	95	+ $error++;
	96	+ dol_print_error($db,$com->error);
97	97	}
98	98
99	99
		@@ -101,13 +101,13 @@ discard block
		block discarded – undo
101	101
102	102	if (! $error)
103	103	{
104		- $db->commit();
105		- print '--- end ok'."\n";
	104	+ $db->commit();
	105	+ print '--- end ok'."\n";
106	106	}
107	107	else
108	108	{
109		- print '--- end error code='.$error."\n";
110		- $db->rollback();
	109	+ print '--- end error code='.$error."\n";
	110	+ $db->rollback();
111	111	}
112	112
113	113	$db->close();

		@@ -83,14 +83,14 @@ discard block
		block discarded – undo
83	83	{
84	84	// Change status to validated
85	85	$result=$com->valid($user);
86		- if ($result > 0) print "OK Object created with id ".$idobject."\n";
87		- else
	86	+ if ($result > 0) {
	87	+ print "OK Object created with id ".$idobject."\n";
	88	+ } else
88	89	{
89	90	$error++;
90	91	dol_print_error($db,$com->error);
91	92	}
92		-}
93		-else
	93	+} else
94	94	{
95	95	$error++;
96	96	dol_print_error($db,$com->error);
		@@ -103,8 +103,7 @@ discard block
		block discarded – undo
103	103	{
104	104	$db->commit();
105	105	print '--- end ok'."\n";
106		-}
107		-else
	106	+} else
108	107	{
109	108	print '--- end error code='.$error."\n";
110	109	$db->rollback();

		@@ -81,25 +81,25 @@
		block discarded – undo
81	81	$idobject = $myproduct->create($user);
82	82	if ($idobject > 0)
83	83	{
84		- print "OK Object created with id ".$idobject."\n";
	84	+ print "OK Object created with id ".$idobject."\n";
85	85	}
86	86	else
87	87	{
88		- $error++;
89		- dol_print_error($db,$myproduct->error);
	88	+ $error++;
	89	+ dol_print_error($db,$myproduct->error);
90	90	}
91	91
92	92	// -------------------- END OF YOUR CODE --------------------
93	93
94	94	if (! $error)
95	95	{
96		- $db->commit();
97		- print '--- end ok'."\n";
	96	+ $db->commit();
	97	+ print '--- end ok'."\n";
98	98	}
99	99	else
100	100	{
101		- print '--- end error code='.$error."\n";
102		- $db->rollback();
	101	+ print '--- end error code='.$error."\n";
	102	+ $db->rollback();
103	103	}
104	104
105	105	$db->close();

		@@ -82,8 +82,7 @@ discard block
		block discarded – undo
82	82	if ($idobject > 0)
83	83	{
84	84	print "OK Object created with id ".$idobject."\n";
85		-}
86		-else
	85	+} else
87	86	{
88	87	$error++;
89	88	dol_print_error($db,$myproduct->error);
		@@ -95,8 +94,7 @@ discard block
		block discarded – undo
95	94	{
96	95	$db->commit();
97	96	print '--- end ok'."\n";
98		-}
99		-else
	97	+} else
100	98	{
101	99	print '--- end error code='.$error."\n";
102	100	$db->rollback();

		@@ -69,23 +69,23 @@
		block discarded – undo
69	69	$file='';
70	70	if (isset($argv[4]))
71	71	{
72		- $file=$argv[4];
73		- print 'Argument 4='.$argv[4]."\n";
	72	+ $file=$argv[4];
	73	+ print 'Argument 4='.$argv[4]."\n";
74	74	}
75	75	print 'Files will be generated/updated in directory '.$dir."\n";
76	76
77	77	if ($argv[2] != 'all')
78	78	{
79		- if (! is_dir($dir.'/'.$argv[2]))
80		- {
81		- print 'Create directory '.$dir.'/'.$argv[2]."\n";
82		- $result=mkdir($dir.'/'.$argv[2]);
83		- if (! $result)
84		- {
85		- $db->close();
86		- return -1;
87		- }
88		- }
	79	+ if (! is_dir($dir.'/'.$argv[2]))
	80	+ {
	81	+ print 'Create directory '.$dir.'/'.$argv[2]."\n";
	82	+ $result=mkdir($dir.'/'.$argv[2]);
	83	+ if (! $result)
	84	+ {
	85	+ $db->close();
	86	+ return -1;
	87	+ }
	88	+ }
89	89	}
90	90
91	91	require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";

		@@ -28,7 +28,7 @@ discard block
		block discarded – undo
28	28
29	29	$sapi_type = php_sapi_name();
30	30	$script_file = basename(__FILE__);
31		-$path=dirname(__FILE__).'/';
	31	+$path = dirname(__FILE__).'/';
32	32
33	33	// Test if batch mode
34	34	if (substr($sapi_type, 0, 3) == 'cgi') {
		@@ -45,17 +45,17 @@ discard block
		block discarded – undo
45	45	$langs->load("main");
46	46
47	47	// Global variables
48		-$version='1.14';
49		-$error=0;
	48	+$version = '1.14';
	49	+$error = 0;
50	50
51	51
52	52	// -------------------- START OF YOUR CODE HERE --------------------
53	53	@set_time_limit(0);
54	54	print "*** ".$script_file." (".$version.") ***\n";
55		-$dir=DOL_DOCUMENT_ROOT."/langs";
	55	+$dir = DOL_DOCUMENT_ROOT."/langs";
56	56
57	57	// Check parameters
58		-if (! isset($argv[3])) {
	58	+if (!isset($argv[3])) {
59	59	print "Usage: ".$script_file." lang_code_src lang_code_dest\|all APIKEY [langfile.lang]\n";
60	60	print "Example: ".$script_file." en_US pt_PT 123456\n";
61	61	print "Rem: lang_code to use can be found on http://www.google.com/language_tools\n";
		@@ -66,21 +66,21 @@ discard block
		block discarded – undo
66	66	print 'Argument 1='.$argv[1]."\n";
67	67	print 'Argument 2='.$argv[2]."\n";
68	68	print 'Argument 3='.$argv[3]."\n";
69		-$file='';
	69	+$file = '';
70	70	if (isset($argv[4]))
71	71	{
72		- $file=$argv[4];
	72	+ $file = $argv[4];
73	73	print 'Argument 4='.$argv[4]."\n";
74	74	}
75	75	print 'Files will be generated/updated in directory '.$dir."\n";
76	76
77	77	if ($argv[2] != 'all')
78	78	{
79		- if (! is_dir($dir.'/'.$argv[2]))
	79	+ if (!is_dir($dir.'/'.$argv[2]))
80	80	{
81	81	print 'Create directory '.$dir.'/'.$argv[2]."\n";
82		- $result=mkdir($dir.'/'.$argv[2]);
83		- if (! $result)
	82	+ $result = mkdir($dir.'/'.$argv[2]);
	83	+ if (!$result)
84	84	{
85	85	$db->close();
86	86	return -1;
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90
91	91	require_once DOL_DOCUMENT_ROOT."/../dev/translation/autotranslator.class.php";
92	92
93		-$langParser = new autoTranslator($argv[2],$argv[1],$dir,$file,$argv[3]);
	93	+$langParser = new autoTranslator($argv[2], $argv[1], $dir, $file, $argv[3]);
94	94
95	95	print "*** Finished ***\n";
96	96

alxarafe / alixar

Push — master ( bff6d4...ed0f4f )

Status

Category

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +33 added lines, -33 removed lines patch added patch discarded remove patch

Spacing +44 added lines, -44 removed lines patch added patch discarded remove patch

Braces +19 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +20 added lines, -20 removed lines patch added patch discarded remove patch

Braces +5 added lines, -6 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Braces +6 added lines, -8 removed lines patch added patch discarded remove patch

Indentation +14 added lines, -14 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Braces +5 added lines, -6 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +9 added lines, -9 removed lines patch added patch discarded remove patch

Braces +2 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch