alxarafe / alixar

dolibarr/htdocs/api/index.php

Spacing +35 added lines, -35 removed lines

@@ -24,25 +24,25 @@ 
  *  \file       htdocs/api/index.php
  */
 
-if (! defined('NOCSRFCHECK'))    define('NOCSRFCHECK','1');			// Do not check anti CSRF attack test
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');		// Do not check anti POST attack test
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');		// If there is no need to load and show top and left menu
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');		// If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');       // Do not load ajax.lib.php library
-if (! defined("NOLOGIN"))        define("NOLOGIN",'1');				// If this page is public (can be called outside logged session)
+if (!defined('NOCSRFCHECK'))    define('NOCSRFCHECK', '1'); // Do not check anti CSRF attack test
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not check anti POST attack test
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no need to load and show top and left menu
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1'); // Do not load ajax.lib.php library
+if (!defined("NOLOGIN"))        define("NOLOGIN", '1'); // If this page is public (can be called outside logged session)
 
 
 // Force entity if a value is provided into HTTP header. Otherwise, will use the entity of user of token used.
-if (! empty($_SERVER['HTTP_DOLAPIENTITY'])) define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
+if (!empty($_SERVER['HTTP_DOLAPIENTITY'])) define("DOLENTITY", (int) $_SERVER['HTTP_DOLAPIENTITY']);
 
 
-$res=0;
-if (! $res && file_exists("../main.inc.php")) $res=include '../main.inc.php';
-if (! $res) die("Include of main fails");
+$res = 0;
+if (!$res && file_exists("../main.inc.php")) $res = include '../main.inc.php';
+if (!$res) die("Include of main fails");
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/framework/Luracast/Restler/AutoLoader.php';
 
-call_user_func(function () {
+call_user_func(function() {
     $loader = Luracast\Restler\AutoLoader::instance();
     spl_autoload_register($loader);
     return $loader;
@@ -59,13 +59,13 @@ 
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr API interfaces with module REST disabled");
-    print $langs->trans("WarningModuleNotActive",'Api').'.<br><br>';
+    print $langs->trans("WarningModuleNotActive", 'Api').'.<br><br>';
     print $langs->trans("ToActivateModule");
     exit;
 }
 
 // Test if explorer is not disabled
-if (preg_match('/api\/index\.php\/explorer/', $_SERVER["PHP_SELF"]) && ! empty($conf->global->API_EXPLORER_DISABLED))
+if (preg_match('/api\/index\.php\/explorer/', $_SERVER["PHP_SELF"]) && !empty($conf->global->API_EXPLORER_DISABLED))
 {
     $langs->load("admin");
     dol_syslog("Call Dolibarr API interfaces with module REST disabled");
@@ -93,10 +93,10 @@ 
 
 
 // Set the flag to say to refresh (when we reload the explorer, production must be for API call only)
-$refreshcache=false;
-if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
+$refreshcache = false;
+if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
-    $refreshcache=true;
+    $refreshcache = true;
 }
 
 
@@ -107,8 +107,8 @@ 
 // See https://github.com/Luracast/Restler-API-Explorer for more info.
 $api->r->addAPIClass('Luracast\\Restler\\Explorer');
 
-$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat');	// 'YamlFormat'
-$api->r->addAuthenticationClass('DolibarrApiAccess','');
+$api->r->setSupportedFormats('JsonFormat', 'XmlFormat', 'UploadFormat'); // 'YamlFormat'
+$api->r->addAuthenticationClass('DolibarrApiAccess', '');
 
 // Define accepted mime types
 UploadFormat::$allowedMimeTypes = array('image/jpeg', 'image/png', 'text/plain', 'application/octet-stream');
@@ -116,7 +116,7 @@ 
 
 
 // Call Explorer file for all APIs definitions
-if (! empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
+if (!empty($reg[1]) && $reg[1] == 'explorer' && ($reg[2] == '/swagger.json' || $reg[2] == '/swagger.json/root' || $reg[2] == '/resources.json' || $reg[2] == '/resources.json/root'))
 {
     // Scan all API files to load them
 
@@ -128,25 +128,25 @@ 
         // Search available module
         dol_syslog("Scan directory ".$dir." for module descriptor files, then search for API files");
 
-        $handle=@opendir(dol_osencode($dir));
+        $handle = @opendir(dol_osencode($dir));
         if (is_resource($handle))
         {
-            while (($file = readdir($handle))!==false)
+            while (($file = readdir($handle)) !== false)
             {
-                if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i",$file,$regmod))
+                if (is_readable($dir.$file) && preg_match("/^mod(.*)\.class\.php$/i", $file, $regmod))
                 {
                     $module = strtolower($regmod[1]);
                     $moduledirforclass = getModuleDirForApiClass($module);
                     $modulenameforenabled = $module;
-                    if ($module == 'propale') { $modulenameforenabled='propal'; }
-                    if ($module == 'supplierproposal') { $modulenameforenabled='supplier_proposal'; }
-                    if ($module == 'ficheinter') { $modulenameforenabled='ficheinter'; }
+                    if ($module == 'propale') { $modulenameforenabled = 'propal'; }
+                    if ($module == 'supplierproposal') { $modulenameforenabled = 'supplier_proposal'; }
+                    if ($module == 'ficheinter') { $modulenameforenabled = 'ficheinter'; }
 
                     dol_syslog("Found module file ".$file." - module=".$module." - modulenameforenabled=".$modulenameforenabled." - moduledirforclass=".$moduledirforclass);
 
                     // Defined if module is enabled
-                    $enabled=true;
-                    if (empty($conf->$modulenameforenabled->enabled)) $enabled=false;
+                    $enabled = true;
+                    if (empty($conf->$modulenameforenabled->enabled)) $enabled = false;
 
                     if ($enabled)
                     {
@@ -155,14 +155,14 @@ 
                         // @todo : use getElementProperties() function ?
                         $dir_part = dol_buildpath('/'.$moduledirforclass.'/class/');
 
-                        $handle_part=@opendir(dol_osencode($dir_part));
+                        $handle_part = @opendir(dol_osencode($dir_part));
                         if (is_resource($handle_part))
                         {
-                            while (($file_searched = readdir($handle_part))!==false)
+                            while (($file_searched = readdir($handle_part)) !== false)
                             {
                                 if ($file_searched == 'api_access.class.php') continue;
 
-                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i",$file_searched,$regapi))
+                                if (is_readable($dir_part.$file_searched) && preg_match("/^api_(.*)\.class\.php$/i", $file_searched, $regapi))
                                 {
                                     $classname = ucwords($regapi[1]);
                                     $classname = str_replace('_', '', $classname);
@@ -201,7 +201,7 @@ 
 }
 
 // Call one APIs or one definition of an API
-if (! empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
+if (!empty($reg[1]) && ($reg[1] != 'explorer' || ($reg[2] != '/swagger.json' && $reg[2] != '/resources.json' && preg_match('/^\/(swagger|resources)\.json\/(.+)$/', $reg[2], $regbis) && $regbis[2] != 'root')))
 {
     $module = $reg[1];
     if ($module == 'explorer')  // If we call page to explore details of a service
@@ -209,7 +209,7 @@ 
         $module = $regbis[2];
     }
 
-    $module=strtolower($module);
+    $module = strtolower($module);
     $moduledirforclass = getModuleDirForApiClass($module);
 
     // Load a dedicated API file
@@ -230,16 +230,16 @@ 
 	if ($module == 'interventions')
 		$classfile = 'interventions';
 
-	$dir_part_file = dol_buildpath('/' . $moduledirforclass . '/class/api_' . $classfile . '.class.php', 0, 2);
+	$dir_part_file = dol_buildpath('/'.$moduledirforclass.'/class/api_'.$classfile.'.class.php', 0, 2);
 
 	$classname = ucwords($module);
 
-	dol_syslog('Search /' . $moduledirforclass . '/class/api_' . $classfile . '.class.php => dir_part_file=' . $dir_part_file . ' classname=' . $classname);
+	dol_syslog('Search /'.$moduledirforclass.'/class/api_'.$classfile.'.class.php => dir_part_file='.$dir_part_file.' classname='.$classname);
 
 	$res = false;
 	if ($dir_part_file)
 		$res = include_once $dir_part_file;
-	if (! $res) {
+	if (!$res) {
 		print 'API not found (failed to include API file)';
 		header('HTTP/1.1 501 API not found (failed to include API file)');
 		exit(0);

dolibarr/htdocs/paypal/lib/paypalfunctions.lib.php

Spacing +11 added lines, -11 removed lines

@@ -38,7 +38,7 @@ 
 // PayPal Express Checkout Module
 // ==================================
 
-$API_version="56";
+$API_version = "56";
 
 /*
  ' Define the PayPal Redirect URLs.
@@ -48,7 +48,7 @@ 
  ' For the sandbox, the URL is       https://www.sandbox.paypal.com/webscr&cmd=_express-checkout&token=
  ' For the live site, the URL is        https://www.paypal.com/webscr&cmd=_express-checkout&token=
  */
-if (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha'))		// We can force sand box with param 'forcesandbox'
+if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'))		// We can force sand box with param 'forcesandbox'
 {
     $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
     $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
@@ -60,19 +60,19 @@ 
 }
 
 // Clean parameters
-$PAYPAL_API_USER="";
-if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
-$PAYPAL_API_PASSWORD="";
-if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
-$PAYPAL_API_SIGNATURE="";
-if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
-$PAYPAL_API_SANDBOX="";
-if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+$PAYPAL_API_USER = "";
+if (!empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER = $conf->global->PAYPAL_API_USER;
+$PAYPAL_API_PASSWORD = "";
+if (!empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD = $conf->global->PAYPAL_API_PASSWORD;
+$PAYPAL_API_SIGNATURE = "";
+if (!empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE = $conf->global->PAYPAL_API_SIGNATURE;
+$PAYPAL_API_SANDBOX = "";
+if (!empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
 
 // Proxy
 $PROXY_HOST = $conf->global->MAIN_PROXY_HOST;
 $PROXY_PORT = $conf->global->MAIN_PROXY_PORT;
 $PROXY_USER = $conf->global->MAIN_PROXY_USER;
 $PROXY_PASS = $conf->global->MAIN_PROXY_PASS;
-$USE_PROXY = empty($conf->global->MAIN_PROXY_USE)?false:true;
+$USE_PROXY = empty($conf->global->MAIN_PROXY_USE) ?false:true;
 

dolibarr/htdocs/paypal/lib/paypal.lib.php

Spacing +175 added lines, -175 removed lines

@@ -40,15 +40,15 @@ 
 	$head[$h][2] = 'paypalaccount';
 	$h++;
 
-	$object=new stdClass();
+	$object = new stdClass();
 
     // Show more tabs from modules
     // Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'paypaladmin');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'paypaladmin');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'paypaladmin','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'paypaladmin', 'remove');
 
     return $head;
 }
@@ -62,18 +62,18 @@ 
  * @param	string	$ref		Ref of object
  * @return	string				Url string
  */
-function showPaypalPaymentUrl($type,$ref)
+function showPaypalPaymentUrl($type, $ref)
 {
 	global $conf, $langs;
 
 	$langs->load("paypal");
     $langs->load("paybox");
-    $servicename='PayPal';
-    $out='<br><br>';
-    $out.=img_picto('','object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment",$servicename).'<br>';
-    $url=getPaypalPaymentUrl(0,$type,$ref);
-    $out.='<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'">';
-    $out.=ajax_autoselect("paypalurl", 0);
+    $servicename = 'PayPal';
+    $out = '<br><br>';
+    $out .= img_picto('', 'object_globe.png').' '.$langs->trans("ToOfferALinkForOnlinePayment", $servicename).'<br>';
+    $url = getPaypalPaymentUrl(0, $type, $ref);
+    $out .= '<input type="text" id="paypalurl" class="quatrevingtpercent" value="'.$url.'">';
+    $out .= ajax_autoselect("paypalurl", 0);
     return $out;
 }
 
@@ -88,96 +88,96 @@ 
  * @param	string	$freetag	Free tag
  * @return	string				Url string
  */
-function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
+function getPaypalPaymentUrl($mode, $type, $ref = '', $amount = '9.99', $freetag = 'your_free_tag')
 {
 	global $conf;
 
-	$ref=str_replace(' ','',$ref);
+	$ref = str_replace(' ', '', $ref);
 
     if ($type == 'free')
     {
-	    $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?amount='.($mode?'<font color="#666666">':'').$amount.($mode?'</font>':'').'&tag='.($mode?'<font color="#666666">':'').$freetag.($mode?'</font>':'');
-	    if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+	    $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?amount='.($mode ? '<font color="#666666">' : '').$amount.($mode ? '</font>' : '').'&tag='.($mode ? '<font color="#666666">' : '').$freetag.($mode ? '</font>' : '');
+	    if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
 	    {
-	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
-	    	else $out.='&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
+	    	if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+	    	else $out .= '&securekey='.dol_hash($conf->global->PAYPAL_SECURITY_TOKEN, 2);
 	    }
     }
     if ($type == 'order')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=order&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='order_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=order&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'order_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
+        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
             else
             {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
+                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + order_ref)";
+                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+                $out .= ($mode ? '</font>' : '');
             }
         }
     }
     if ($type == 'invoice')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=invoice&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='invoice_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=invoice&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'invoice_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
+        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
             else
             {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
+                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + invoice_ref)";
+                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+                $out .= ($mode ? '</font>' : '');
             }
         }
     }
     if ($type == 'contractline')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=contractline&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='contractline_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=contractline&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'contractline_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
+        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
             else
             {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
+                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + contractline_ref)";
+                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+                $out .= ($mode ? '</font>' : '');
             }
         }
     }
     if ($type == 'membersubscription')
     {
-        $out=DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.($mode?'<font color="#666666">':'');
-        if ($mode == 1) $out.='member_ref';
-        if ($mode == 0) $out.=urlencode($ref);
-	    $out.=($mode?'</font>':'');
-        if (! empty($conf->global->PAYPAL_SECURITY_TOKEN))
+        $out = DOL_MAIN_URL_ROOT.'/public/paypal/newpayment.php?source=membersubscription&ref='.($mode ? '<font color="#666666">' : '');
+        if ($mode == 1) $out .= 'member_ref';
+        if ($mode == 0) $out .= urlencode($ref);
+	    $out .= ($mode ? '</font>' : '');
+        if (!empty($conf->global->PAYPAL_SECURITY_TOKEN))
         {
-    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out.='&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
+    	    if (empty($conf->global->PAYPAL_SECURITY_TOKEN_UNIQUE)) $out .= '&securekey='.$conf->global->PAYPAL_SECURITY_TOKEN;
             else
             {
-                $out.='&securekey='.($mode?'<font color="#666666">':'');
-                if ($mode == 1) $out.="hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
-                if ($mode == 0) $out.= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN . $type . $ref, 2);
-                $out.=($mode?'</font>':'');
+                $out .= '&securekey='.($mode ? '<font color="#666666">' : '');
+                if ($mode == 1) $out .= "hash('".$conf->global->PAYPAL_SECURITY_TOKEN."' + '".$type."' + member_ref)";
+                if ($mode == 0) $out .= dol_hash($conf->global->PAYPAL_SECURITY_TOKEN.$type.$ref, 2);
+                $out .= ($mode ? '</font>' : '');
             }
         }
     }
 
     // For multicompany
-    $out.="&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
+    $out .= "&entity=".$conf->entity; // Check the entity because He may be the same reference in several entities
 
     return $out;
 }
@@ -194,7 +194,7 @@ 
  * @param   string	$tag				Full tag
  * @return	string						No return (a redirect is done) if OK, or Error message if KO
  */
-function print_paypal_redirect($paymentAmount,$currencyCodeType,$paymentType,$returnURL,$cancelURL,$tag)
+function print_paypal_redirect($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag)
 {
     //declaring of global variables
     global $conf, $langs;
@@ -209,27 +209,27 @@ 
     //'
     //'-------------------------------------------------
 
-    if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY='integral';
+    if (empty($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY)) $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY = 'integral';
 
-    $solutionType='Sole';
-    $landingPage='Billing';
+    $solutionType = 'Sole';
+    $landingPage = 'Billing';
     // For payment with Paypal only
     if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'paypalonly')
     {
-        $solutionType='Mark';
-        $landingPage='Login';
+        $solutionType = 'Mark';
+        $landingPage = 'Login';
     }
     // For payment with Credit card or Paypal
     if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'integral')
     {
-        $solutionType='Sole';
-        $landingPage='Billing';
+        $solutionType = 'Sole';
+        $landingPage = 'Billing';
     }
     // For payment with Credit card
     if ($conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY == 'cconly')
     {
-        $solutionType='Sole';
-        $landingPage='Billing';
+        $solutionType = 'Sole';
+        $landingPage = 'Billing';
     }
 
     dol_syslog("expresscheckout redirect with callSetExpressCheckout $paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum");
@@ -255,12 +255,12 @@ 
     );
 
     $ack = strtoupper($resArray["ACK"]);
-    if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
+    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
     {
-        $token=$resArray["TOKEN"];
+        $token = $resArray["TOKEN"];
 
         // Redirect to paypal.com here
-        $payPalURL = $API_Url . $token;
+        $payPalURL = $API_Url.$token;
         header("Location: ".$payPalURL);
         exit;
     }
@@ -274,15 +274,15 @@ 
 
         if ($ErrorCode == 10729)
         {
-        	$mesg.= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
+        	$mesg .= "PayPal can't accept payments for this thirdparty. An address is defined but is not complete (missing State).<br>Ask system administrator to fix address or to setup Paypal module to accept payments even on not complete addresses (remove option PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS).<br>\n";
         }
         else
         {
-        	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed') . "<br>\n";
-        	$mesg.= $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
-        	$mesg.= $langs->trans('ShortErrorMessage') . ": " . $ErrorShortMsg."<br>\n";
-        	$mesg.= $langs->trans('ErrorCode') . ": " . $ErrorCode."<br>\n";
-        	$mesg.= $langs->trans('ErrorSeverityCode') . ": " . $ErrorSeverityCode."<br>\n";
+        	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed')."<br>\n";
+        	$mesg .= $langs->trans('DetailedErrorMessage').": ".$ErrorLongMsg."<br>\n";
+        	$mesg .= $langs->trans('ShortErrorMessage').": ".$ErrorShortMsg."<br>\n";
+        	$mesg .= $langs->trans('ErrorCode').": ".$ErrorCode."<br>\n";
+        	$mesg .= $langs->trans('ErrorSeverityCode').": ".$ErrorSeverityCode."<br>\n";
         }
 
         return $mesg;
@@ -330,7 +330,7 @@ 
  * @param	string			$desc				Description
  * @return	array								Array
  */
-function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email='', $desc='')
+function callSetExpressCheckout($paymentAmount, $currencyCodeType, $paymentType, $returnURL, $cancelURL, $tag, $solutionType, $landingPage, $shipToName, $shipToStreet, $shipToCity, $shipToState, $shipToCountryCode, $shipToZip, $shipToStreet2, $phoneNum, $email = '', $desc = '')
 {
     //------------------------------------------------------------------------------------------------------------------------------------
     // Construct the parameter string that describes the SetExpressCheckout API call in the shortcut implementation
@@ -342,92 +342,92 @@ 
 
     $nvpstr = '';
     //$nvpstr = $nvpstr . "&VERSION=".$API_version;				// Already added by hash_call
-    $nvpstr = $nvpstr . "&RETURNURL=" . urlencode($returnURL);
-    $nvpstr = $nvpstr . "&CANCELURL=" . urlencode($cancelURL);
-    if (! empty($conf->global->PAYPAL_ALLOW_NOTES))
+    $nvpstr = $nvpstr."&RETURNURL=".urlencode($returnURL);
+    $nvpstr = $nvpstr."&CANCELURL=".urlencode($cancelURL);
+    if (!empty($conf->global->PAYPAL_ALLOW_NOTES))
     {
-    	$nvpstr = $nvpstr . "&ALLOWNOTE=0";
+    	$nvpstr = $nvpstr."&ALLOWNOTE=0";
     }
     if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
     {
-    	$nvpstr = $nvpstr . "&NOSHIPPING=1";	// An empty or not complete shipping address will be accepted
+    	$nvpstr = $nvpstr."&NOSHIPPING=1"; // An empty or not complete shipping address will be accepted
     }
     else
     {
-    	$nvpstr = $nvpstr . "&NOSHIPPING=0";	// A valid shipping address is required (full required fields mandatory)
+    	$nvpstr = $nvpstr."&NOSHIPPING=0"; // A valid shipping address is required (full required fields mandatory)
     }
-    $nvpstr = $nvpstr . "&SOLUTIONTYPE=" . urlencode($solutionType);
-    $nvpstr = $nvpstr . "&LANDINGPAGE=" . urlencode($landingPage);
-    if (! empty($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER))
+    $nvpstr = $nvpstr."&SOLUTIONTYPE=".urlencode($solutionType);
+    $nvpstr = $nvpstr."&LANDINGPAGE=".urlencode($landingPage);
+    if (!empty($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER))
     {
-    	$nvpstr = $nvpstr . "&CUSTOMERSERVICENUMBER=" . urlencode($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER);    // Hotline phone number
+    	$nvpstr = $nvpstr."&CUSTOMERSERVICENUMBER=".urlencode($conf->global->PAYPAL_CUSTOMER_SERVICE_NUMBER); // Hotline phone number
     }
 
     $paypalprefix = 'PAYMENTREQUEST_0_';
     //$paypalprefix = '';
-	if (! empty($paypalprefix) && $paymentType == 'Sole') $paymentType='Sale';
-
-	$nvpstr = $nvpstr . "&AMT=". urlencode($paymentAmount);									// Total for all elements
-
-    $nvpstr = $nvpstr . "&".$paypalprefix."INVNUM=" . urlencode($tag);
-    $nvpstr = $nvpstr . "&".$paypalprefix."AMT=". urlencode($paymentAmount);                 // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-    $nvpstr = $nvpstr . "&".$paypalprefix."ITEMAMT=". urlencode($paymentAmount);             // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
-    $nvpstr = $nvpstr . "&".$paypalprefix."PAYMENTACTION=" . urlencode($paymentType);        // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
-    $nvpstr = $nvpstr . "&".$paypalprefix."CURRENCYCODE=" . urlencode($currencyCodeType);    // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
-
-    $nvpstr = $nvpstr . "&".$paypalprefix."L_PAYMENTREQUEST_0_QTY0=1";
-    $nvpstr = $nvpstr . "&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode($paymentAmount);
-    $nvpstr = $nvpstr . "&".$paypalprefix."L_PAYMENTREQUEST_0_NAME0=".urlencode($desc);
-    $nvpstr = $nvpstr . "&".$paypalprefix."L_PAYMENTREQUEST_0_NUMBER0=0";
-
-    $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTONAME=" . urlencode($shipToName);            // SHIPTONAME deprecated by paypal -> PAYMENTREQUEST_n_SHIPTONAME
-    $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOSTREET=" . urlencode($shipToStreet);        //
-    $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOSTREET2=" . urlencode($shipToStreet2);
-    $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOCITY=" . urlencode($shipToCity);
-    $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOSTATE=" . urlencode($shipToState);
-    $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOCOUNTRYCODE=" . urlencode($shipToCountryCode);
-    $nvpstr = $nvpstr . "&".$paypalprefix."SHIPTOZIP=" . urlencode($shipToZip);
-    $nvpstr = $nvpstr . "&".$paypalprefix."PHONENUM=" . urlencode($phoneNum);
-    if (! empty($email)) $nvpstr = $nvpstr . "&".$paypalprefix."EMAIL=" . urlencode($email);      // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
-    if (! empty($desc))  $nvpstr = $nvpstr . "&".$paypalprefix."DESC=" . urlencode($desc);        // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
-
-    if (! empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
+	if (!empty($paypalprefix) && $paymentType == 'Sole') $paymentType = 'Sale';
+
+	$nvpstr = $nvpstr."&AMT=".urlencode($paymentAmount); // Total for all elements
+
+    $nvpstr = $nvpstr."&".$paypalprefix."INVNUM=".urlencode($tag);
+    $nvpstr = $nvpstr."&".$paypalprefix."AMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+    $nvpstr = $nvpstr."&".$paypalprefix."ITEMAMT=".urlencode($paymentAmount); // AMT deprecated by paypal -> PAYMENTREQUEST_n_AMT
+    $nvpstr = $nvpstr."&".$paypalprefix."PAYMENTACTION=".urlencode($paymentType); // PAYMENTACTION deprecated by paypal -> PAYMENTREQUEST_n_PAYMENTACTION
+    $nvpstr = $nvpstr."&".$paypalprefix."CURRENCYCODE=".urlencode($currencyCodeType); // CURRENCYCODE deprecated by paypal -> PAYMENTREQUEST_n_CURRENCYCODE
+
+    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_QTY0=1";
+    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_AMT0=".urlencode($paymentAmount);
+    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NAME0=".urlencode($desc);
+    $nvpstr = $nvpstr."&".$paypalprefix."L_PAYMENTREQUEST_0_NUMBER0=0";
+
+    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTONAME=".urlencode($shipToName); // SHIPTONAME deprecated by paypal -> PAYMENTREQUEST_n_SHIPTONAME
+    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET=".urlencode($shipToStreet); //
+    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTREET2=".urlencode($shipToStreet2);
+    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCITY=".urlencode($shipToCity);
+    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOSTATE=".urlencode($shipToState);
+    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOCOUNTRYCODE=".urlencode($shipToCountryCode);
+    $nvpstr = $nvpstr."&".$paypalprefix."SHIPTOZIP=".urlencode($shipToZip);
+    $nvpstr = $nvpstr."&".$paypalprefix."PHONENUM=".urlencode($phoneNum);
+    if (!empty($email)) $nvpstr = $nvpstr."&".$paypalprefix."EMAIL=".urlencode($email); // EMAIL deprecated by paypal -> PAYMENTREQUEST_n_EMAIL
+    if (!empty($desc))  $nvpstr = $nvpstr."&".$paypalprefix."DESC=".urlencode($desc); // DESC deprecated by paypal -> PAYMENTREQUEST_n_DESC
+
+    if (!empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
     {
     	global $dolibarr_main_url_root;
 
 	    // Define $urlwithroot
-	    $urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));
-	    $urlwithroot=$urlwithouturlroot.DOL_URL_ROOT;		// This is to use external domain name found into config file
+	    $urlwithouturlroot = preg_replace('/'.preg_quote(DOL_URL_ROOT, '/').'$/i', '', trim($dolibarr_main_url_root));
+	    $urlwithroot = $urlwithouturlroot.DOL_URL_ROOT; // This is to use external domain name found into config file
 	    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
 
-	    $urllogo=$urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
-	    $nvpstr = $nvpstr . "&LOGOIMG=" . urlencode($urllogo);
+	    $urllogo = $urlwithroot."/viewimage.php?modulepart=mycompany&file=".urlencode('logos/'.$mysoc->logo);
+	    $nvpstr = $nvpstr."&LOGOIMG=".urlencode($urllogo);
     }
-    if (! empty($conf->global->PAYPAL_BRANDNAME))
+    if (!empty($conf->global->PAYPAL_BRANDNAME))
     {
-    	$nvpstr = $nvpstr . "&BRANDNAME=" . urlencode($conf->global->PAYPAL_BRANDNAME);    // BRANDNAME
+    	$nvpstr = $nvpstr."&BRANDNAME=".urlencode($conf->global->PAYPAL_BRANDNAME); // BRANDNAME
     }
-    if (! empty($conf->global->PAYPAL_NOTETOBUYER))
+    if (!empty($conf->global->PAYPAL_NOTETOBUYER))
     {
-    	$nvpstr = $nvpstr . "&NOTETOBUYER=" . urlencode($conf->global->PAYPAL_NOTETOBUYER);  // PAYPAL_NOTETOBUYER
+    	$nvpstr = $nvpstr."&NOTETOBUYER=".urlencode($conf->global->PAYPAL_NOTETOBUYER); // PAYPAL_NOTETOBUYER
     }
 
 	$_SESSION["FinalPaymentAmt"] = $paymentAmount;
     $_SESSION["currencyCodeType"] = $currencyCodeType;
-    $_SESSION["PaymentType"] = $paymentType;			// 'Mark', 'Sole'
-    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];   // Payer ip
+    $_SESSION["PaymentType"] = $paymentType; // 'Mark', 'Sole'
+    $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR']; // Payer ip
 
     //'---------------------------------------------------------------------------------------------------------------
     //' Make the API call to PayPal
     //' If the API call succeded, then redirect the buyer to PayPal to begin to authorize payment.
     //' If an error occured, show the resulting errors
     //'---------------------------------------------------------------------------------------------------------------
-    $resArray=hash_call("SetExpressCheckout", $nvpstr);
+    $resArray = hash_call("SetExpressCheckout", $nvpstr);
     $ack = strtoupper($resArray["ACK"]);
-    if($ack=="SUCCESS" || $ack=="SUCCESSWITHWARNING")
+    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
     {
         $token = urldecode($resArray["TOKEN"]);
-        $_SESSION['TOKEN']=$token;
+        $_SESSION['TOKEN'] = $token;
     }
 
     return $resArray;
@@ -459,7 +459,7 @@ 
     //' Build a second API request to PayPal, using the token as the
     //'  ID to get the details on the payment authorization
     //'---------------------------------------------------------------------------
-    $nvpstr="&TOKEN=" . $token;
+    $nvpstr = "&TOKEN=".$token;
 
     //'---------------------------------------------------------------------------
     //' Make the API call and store the results in an array.
@@ -467,9 +467,9 @@ 
     //'     an action to complete the payment.
     //' If failed, show the error
     //'---------------------------------------------------------------------------
-    $resArray=hash_call("GetExpressCheckoutDetails",$nvpstr);
+    $resArray = hash_call("GetExpressCheckoutDetails", $nvpstr);
     $ack = strtoupper($resArray["ACK"]);
-    if($ack == "SUCCESS" || $ack=="SUCCESSWITHWARNING")
+    if ($ack == "SUCCESS" || $ack == "SUCCESSWITHWARNING")
     {
         $_SESSION['payer_id'] = $resArray['PAYERID'];
     }
@@ -502,18 +502,18 @@ 
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
     $nvpstr = '';
-    $nvpstr .= '&TOKEN=' . urlencode($token);
-    $nvpstr .= '&PAYERID=' . urlencode($payerID);
-    $nvpstr .= '&PAYMENTACTION=' . urlencode($paymentType);
-    $nvpstr .= '&AMT=' . urlencode($FinalPaymentAmt);
-    $nvpstr .= '&CURRENCYCODE=' . urlencode($currencyCodeType);
-    $nvpstr .= '&IPADDRESS=' . urlencode($ipaddress);
-    $nvpstr .= '&INVNUM=' . urlencode($tag);
+    $nvpstr .= '&TOKEN='.urlencode($token);
+    $nvpstr .= '&PAYERID='.urlencode($payerID);
+    $nvpstr .= '&PAYMENTACTION='.urlencode($paymentType);
+    $nvpstr .= '&AMT='.urlencode($FinalPaymentAmt);
+    $nvpstr .= '&CURRENCYCODE='.urlencode($currencyCodeType);
+    $nvpstr .= '&IPADDRESS='.urlencode($ipaddress);
+    $nvpstr .= '&INVNUM='.urlencode($tag);
 
     /* Make the call to PayPal to finalize payment
      If an error occured, show the resulting errors
      */
-    $resArray=hash_call("DoExpressCheckoutPayment",$nvpstr);
+    $resArray = hash_call("DoExpressCheckoutPayment", $nvpstr);
 
     /* Display the API response back to the browser.
      If the response from PayPal was a success, display the response parameters'
@@ -583,7 +583,7 @@ 
  * @param	string	$nvpStr 		is nvp string.
  * @return	array					returns an associtive array containing the response from the server.
  */
-function hash_call($methodName,$nvpStr)
+function hash_call($methodName, $nvpStr)
 {
     //declaring of global variables
     global $conf, $langs;
@@ -591,8 +591,8 @@ 
     global $PAYPAL_API_USER, $PAYPAL_API_PASSWORD, $PAYPAL_API_SIGNATURE;
 
     // TODO problem with triggers
-    $API_version="98.0";
-	if (! empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox','alpha'))		// We can force sand box with param 'forcesandbox'
+    $API_version = "98.0";
+	if (!empty($conf->global->PAYPAL_API_SANDBOX) || GETPOST('forcesandbox', 'alpha'))		// We can force sand box with param 'forcesandbox'
 	{
 	    $API_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
 	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
@@ -604,14 +604,14 @@ 
 	}
 
 	// Clean parameters
-	$PAYPAL_API_USER="";
-	if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->PAYPAL_API_USER;
-	$PAYPAL_API_PASSWORD="";
-	if (! empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD=$conf->global->PAYPAL_API_PASSWORD;
-	$PAYPAL_API_SIGNATURE="";
-	if (! empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE=$conf->global->PAYPAL_API_SIGNATURE;
-	$PAYPAL_API_SANDBOX="";
-	if (! empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+	$PAYPAL_API_USER = "";
+	if (!empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER = $conf->global->PAYPAL_API_USER;
+	$PAYPAL_API_PASSWORD = "";
+	if (!empty($conf->global->PAYPAL_API_PASSWORD)) $PAYPAL_API_PASSWORD = $conf->global->PAYPAL_API_PASSWORD;
+	$PAYPAL_API_SIGNATURE = "";
+	if (!empty($conf->global->PAYPAL_API_SIGNATURE)) $PAYPAL_API_SIGNATURE = $conf->global->PAYPAL_API_SIGNATURE;
+	$PAYPAL_API_SANDBOX = "";
+	if (!empty($conf->global->PAYPAL_API_SANDBOX)) $PAYPAL_API_SANDBOX = $conf->global->PAYPAL_API_SANDBOX;
 	// TODO END problem with triggers
 
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
@@ -626,30 +626,30 @@ 
     curl_setopt($ch, CURLOPT_URL, $API_Endpoint);
     curl_setopt($ch, CURLOPT_VERBOSE, 1);
     // TLSv1 by default or change to TLSv1.2 in module configuration
-    curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION)?1:$conf->global->PAYPAL_SSLVERSION));
+    curl_setopt($ch, CURLOPT_SSLVERSION, (empty($conf->global->PAYPAL_SSLVERSION) ? 1 : $conf->global->PAYPAL_SSLVERSION));
 
     //turning off the server and peer verification(TrustManager Concept).
     curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
     curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
 
-    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT)?5:$conf->global->MAIN_USE_CONNECT_TIMEOUT);
-    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT)?30:$conf->global->MAIN_USE_RESPONSE_TIMEOUT);
+    curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, empty($conf->global->MAIN_USE_CONNECT_TIMEOUT) ? 5 : $conf->global->MAIN_USE_CONNECT_TIMEOUT);
+    curl_setopt($ch, CURLOPT_TIMEOUT, empty($conf->global->MAIN_USE_RESPONSE_TIMEOUT) ? 30 : $conf->global->MAIN_USE_RESPONSE_TIMEOUT);
 
-    curl_setopt($ch, CURLOPT_RETURNTRANSFER,1);
+    curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
     curl_setopt($ch, CURLOPT_POST, 1);
 
     //if USE_PROXY constant set to true in Constants.php, then only proxy will be enabled.
     if ($USE_PROXY)
     {
-        dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST. ":" . $PROXY_PORT." - ".$PROXY_USER. ":" . $PROXY_PASS);
+        dol_syslog("Paypal API hash_call set proxy to ".$PROXY_HOST.":".$PROXY_PORT." - ".$PROXY_USER.":".$PROXY_PASS);
         //curl_setopt ($ch, CURLOPT_PROXYTYPE, CURLPROXY_HTTP); // Curl 7.10
-        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST. ":" . $PROXY_PORT);
-        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        curl_setopt($ch, CURLOPT_PROXY, $PROXY_HOST.":".$PROXY_PORT);
+        if ($PROXY_USER) curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER.":".$PROXY_PASS);
     }
 
     //NVPRequest for submitting to server
-    $nvpreq ="METHOD=" . urlencode($methodName) . "&VERSION=" . urlencode($API_version) . "&PWD=" . urlencode($PAYPAL_API_PASSWORD) . "&USER=" . urlencode($PAYPAL_API_USER) . "&SIGNATURE=" . urlencode($PAYPAL_API_SIGNATURE) . $nvpStr;
-    $nvpreq.="&LOCALECODE=".strtoupper($langs->getDefaultLang(1));
+    $nvpreq = "METHOD=".urlencode($methodName)."&VERSION=".urlencode($API_version)."&PWD=".urlencode($PAYPAL_API_PASSWORD)."&USER=".urlencode($PAYPAL_API_USER)."&SIGNATURE=".urlencode($PAYPAL_API_SIGNATURE).$nvpStr;
+    $nvpreq .= "&LOCALECODE=".strtoupper($langs->getDefaultLang(1));
     //$nvpreq.="&BRANDNAME=".urlencode();       // Override merchant name
     //$nvpreq.="&NOTIFYURL=".urlencode();       // For Instant Payment Notification url
 
@@ -662,18 +662,18 @@ 
     //getting response from server
     $response = curl_exec($ch);
 
-    $nvpReqArray=deformatNVP($nvpreq);
-    $_SESSION['nvpReqArray']=$nvpReqArray;
+    $nvpReqArray = deformatNVP($nvpreq);
+    $_SESSION['nvpReqArray'] = $nvpReqArray;
 
     //convrting NVPResponse to an Associative Array
     dol_syslog("Paypal API hash_call Response nvpresp=".$response);
-    $nvpResArray=deformatNVP($response);
+    $nvpResArray = deformatNVP($response);
 
     if (curl_errno($ch))
     {
         // moving to display page to display curl errors
-        $_SESSION['curl_error_no']=curl_errno($ch);
-        $_SESSION['curl_error_msg']=curl_error($ch);
+        $_SESSION['curl_error_no'] = curl_errno($ch);
+        $_SESSION['curl_error_msg'] = curl_error($ch);
 
         //Execute the Error handling module to display errors.
     }
@@ -696,22 +696,22 @@ 
  */
 function deformatNVP($nvpstr)
 {
-    $intial=0;
+    $intial = 0;
     $nvpArray = array();
 
-    while(strlen($nvpstr))
+    while (strlen($nvpstr))
     {
         //postion of Key
-        $keypos= strpos($nvpstr,'=');
+        $keypos = strpos($nvpstr, '=');
         //position of value
-        $valuepos = strpos($nvpstr,'&') ? strpos($nvpstr,'&'): strlen($nvpstr);
+        $valuepos = strpos($nvpstr, '&') ? strpos($nvpstr, '&') : strlen($nvpstr);
 
         /*getting the Key and Value values and storing in a Associative Array*/
-        $keyval=substr($nvpstr,$intial,$keypos);
-        $valval=substr($nvpstr,$keypos+1,$valuepos-$keypos-1);
+        $keyval = substr($nvpstr, $intial, $keypos);
+        $valval = substr($nvpstr, $keypos + 1, $valuepos - $keypos - 1);
         //decoding the respose
-        $nvpArray[urldecode($keyval)] =urldecode($valval);
-        $nvpstr=substr($nvpstr,$valuepos+1,strlen($nvpstr));
+        $nvpArray[urldecode($keyval)] = urldecode($valval);
+        $nvpstr = substr($nvpstr, $valuepos + 1, strlen($nvpstr));
     }
     return $nvpArray;
 }
@@ -723,16 +723,16 @@ 
  */
 function getApiError()
 {
-	$errors=array();
+	$errors = array();
 
-	$resArray=$_SESSION['reshash'];
+	$resArray = $_SESSION['reshash'];
 
-	if(isset($_SESSION['curl_error_no']))
+	if (isset($_SESSION['curl_error_no']))
 	{
 		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
 	}
 
-	foreach($resArray as $key => $value)
+	foreach ($resArray as $key => $value)
 	{
 		$errors[] = $key.'-'.$value;
 	}

dolibarr/htdocs/dav/dav.class.php

Spacing +84 added lines, -84 removed lines

@@ -56,7 +56,7 @@ 
 	 * @param	int|boolean	$ouri			Ouri
 	 * @return string
 	 */
-	public function getSqlCalEvents($calid, $oid=false, $ouri=false)
+	public function getSqlCalEvents($calid, $oid = false, $ouri = false)
 	{
 		// TODO : replace GROUP_CONCAT by
 		$sql = 'SELECT
@@ -82,33 +82,33 @@ 
 						LEFT OUTER JOIN '.MAIN_DB_PREFIX.'user AS u ON (u.rowid=fk_element)
 						WHERE ar.element_type=\'user\' AND fk_actioncomm=a.id) AS other_users
 				FROM '.MAIN_DB_PREFIX.'actioncomm AS a';
-		if (! $this->user->rights->societe->client->voir )//FIXME si 'voir' on voit plus de chose ?
+		if (!$this->user->rights->societe->client->voir)//FIXME si 'voir' on voit plus de chose ?
 		{
-			$sql.=' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
+			$sql .= ' LEFT OUTER JOIN '.MAIN_DB_PREFIX.'societe_commerciaux AS sc ON (a.fk_soc = sc.fk_soc AND sc.fk_user='.$this->user->id.')
 					LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = sc.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.fk_soc = sc.fk_soc AND sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
 		else
 		{
-			$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
+			$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'societe AS s ON (s.rowid = a.fk_soc)
 					LEFT JOIN '.MAIN_DB_PREFIX.'socpeople AS sp ON (sp.rowid = a.fk_contact)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
 
-		$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
+		$sql .= ' LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_country as cos ON cos.rowid = s.fk_pays
 				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type=\'user\' AND ar.fk_element='.intval($calid).')
 						AND a.code IN (SELECT cac.code FROM '.MAIN_DB_PREFIX.'c_actioncomm cac WHERE cac.type<>\'systemauto\')
 						AND a.entity IN ('.getEntity('societe', 1).')';
-		if($oid!==false) {
-			if($ouri===false)
+		if ($oid !== false) {
+			if ($ouri === false)
 			{
-				$sql.=' AND a.id = '.intval($oid);
+				$sql .= ' AND a.id = '.intval($oid);
 			}
 			else
 			{
-				$sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
+				$sql .= ' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
 		}
 
@@ -131,116 +131,116 @@ 
 			$categ[] = $this->langs->transnoentitiesnoconv('Customer');
 		}*/
 
-		$location=$obj->location;
+		$location = $obj->location;
 
 		// contact address
-		if(empty($location) && !empty($obj->address))
+		if (empty($location) && !empty($obj->address))
 		{
-			$location = trim(str_replace(array("\r","\t","\n"),' ', $obj->address));
+			$location = trim(str_replace(array("\r", "\t", "\n"), ' ', $obj->address));
 			$location = trim($location.', '.$obj->zip);
 			$location = trim($location.' '.$obj->town);
 			$location = trim($location.', '.$obj->country_label);
 		}
 
 		// contact address
-		if(empty($location) && !empty($obj->soc_address))
+		if (empty($location) && !empty($obj->soc_address))
 		{
-			$location = trim(str_replace(array("\r","\t","\n"),' ', $obj->soc_address));
+			$location = trim(str_replace(array("\r", "\t", "\n"), ' ', $obj->soc_address));
 			$location = trim($location.', '.$obj->soc_zip);
 			$location = trim($location.' '.$obj->soc_town);
 			$location = trim($location.', '.$obj->soc_country_label);
 		}
 
-		$address=explode("\n",$obj->address,2);
-		foreach($address as $kAddr => $vAddr)
+		$address = explode("\n", $obj->address, 2);
+		foreach ($address as $kAddr => $vAddr)
 		{
-			$address[$kAddr] = trim(str_replace(array("\r","\t"),' ', str_replace("\n",' | ', trim($vAddr))));
+			$address[$kAddr] = trim(str_replace(array("\r", "\t"), ' ', str_replace("\n", ' | ', trim($vAddr))));
 		}
-		$address[]='';
-		$address[]='';
+		$address[] = '';
+		$address[] = '';
 
-		if($obj->percent==-1 && trim($obj->datep)!='')
-			$type='VEVENT';
+		if ($obj->percent == -1 && trim($obj->datep) != '')
+			$type = 'VEVENT';
 		else
-			$type='VTODO';
+			$type = 'VTODO';
 
 		$timezone = date_default_timezone_get();
 
-		$caldata ="BEGIN:VCALENDAR\n";
-		$caldata.="VERSION:2.0\n";
-		$caldata.="METHOD:PUBLISH\n";
-		$caldata.="PRODID:-//Dolibarr CDav//FR\n";
-		$caldata.="BEGIN:".$type."\n";
-		$caldata.="CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
-		$caldata.="LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		$caldata.="DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
-		if($obj->sourceuid=='')
-			$caldata.="UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
+		$caldata = "BEGIN:VCALENDAR\n";
+		$caldata .= "VERSION:2.0\n";
+		$caldata .= "METHOD:PUBLISH\n";
+		$caldata .= "PRODID:-//Dolibarr CDav//FR\n";
+		$caldata .= "BEGIN:".$type."\n";
+		$caldata .= "CREATED:".gmdate('Ymd\THis', strtotime($obj->datec))."Z\n";
+		$caldata .= "LAST-MODIFIED:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
+		$caldata .= "DTSTAMP:".gmdate('Ymd\THis', strtotime($obj->lastupd))."Z\n";
+		if ($obj->sourceuid == '')
+			$caldata .= "UID:".$obj->id.'-ev-'.$calid.'-cal-'.CDAV_URI_KEY."\n";
 		else
-			$caldata.="UID:".$obj->sourceuid."\n";
-		$caldata.="SUMMARY:".$obj->label."\n";
-		$caldata.="LOCATION:".$location."\n";
-		$caldata.="PRIORITY:".$obj->priority."\n";
-		if($obj->fulldayevent)
+			$caldata .= "UID:".$obj->sourceuid."\n";
+		$caldata .= "SUMMARY:".$obj->label."\n";
+		$caldata .= "LOCATION:".$location."\n";
+		$caldata .= "PRIORITY:".$obj->priority."\n";
+		if ($obj->fulldayevent)
 		{
-			$caldata.="DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
-			if($type=='VEVENT')
+			$caldata .= "DTSTART;VALUE=DATE:".date('Ymd', strtotime($obj->datep))."\n";
+			if ($type == 'VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+				if (trim($obj->datep2) != '')
+					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
 				else
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\n";
+					$caldata .= "DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep) + (25 * 3600))."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2)+1)."\n";
+			elseif (trim($obj->datep2) != '')
+				$caldata .= "DUE;VALUE=DATE:".date('Ymd', strtotime($obj->datep2) + 1)."\n";
 		}
 		else
 		{
-			$caldata.="DTSTART;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
-			if($type=='VEVENT')
+			$caldata .= "DTSTART;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
+			if ($type == 'VEVENT')
 			{
-				if(trim($obj->datep2)!='')
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+				if (trim($obj->datep2) != '')
+					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 				else
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+					$caldata .= "DTEND;TZID=".$timezone.":".strtr($obj->datep, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 			}
-			elseif(trim($obj->datep2)!='')
-				$caldata.="DUE;TZID=".$timezone.":".strtr($obj->datep2,array(" "=>"T", ":"=>"", "-"=>""))."\n";
+			elseif (trim($obj->datep2) != '')
+				$caldata .= "DUE;TZID=".$timezone.":".strtr($obj->datep2, array(" "=>"T", ":"=>"", "-"=>""))."\n";
 		}
-		$caldata.="CLASS:PUBLIC\n";
-		if($obj->transparency==1)
-			$caldata.="TRANSP:TRANSPARENT\n";
+		$caldata .= "CLASS:PUBLIC\n";
+		if ($obj->transparency == 1)
+			$caldata .= "TRANSP:TRANSPARENT\n";
 		else
-			$caldata.="TRANSP:OPAQUE\n";
+			$caldata .= "TRANSP:OPAQUE\n";
 
-		if($type=='VEVENT')
-			$caldata.="STATUS:CONFIRMED\n";
-		elseif($obj->percent==0)
-			$caldata.="STATUS:NEEDS-ACTION\n";
-		elseif($obj->percent==100)
-			$caldata.="STATUS:COMPLETED\n";
+		if ($type == 'VEVENT')
+			$caldata .= "STATUS:CONFIRMED\n";
+		elseif ($obj->percent == 0)
+			$caldata .= "STATUS:NEEDS-ACTION\n";
+		elseif ($obj->percent == 100)
+			$caldata .= "STATUS:COMPLETED\n";
 		else
 		{
-			$caldata.="STATUS:IN-PROCESS\n";
-			$caldata.="PERCENT-COMPLETE:".$obj->percent."\n";
+			$caldata .= "STATUS:IN-PROCESS\n";
+			$caldata .= "PERCENT-COMPLETE:".$obj->percent."\n";
 		}
 
-		$caldata.="DESCRIPTION:";
-		$caldata.=strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
-		if(!empty($obj->soc_nom))
-			$caldata.="\\n*DOLIBARR-SOC: ".$obj->soc_nom;
-		if(!empty($obj->soc_phone))
-			$caldata.="\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
-		if(!empty($obj->firstname) || !empty($obj->lastname))
-			$caldata.="\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
-		if(!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
-			$caldata.="\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
-		if(strpos($obj->other_users,',')) // several
-			$caldata.="\\n*DOLIBARR-USR: ".$obj->other_users;
-		$caldata.="\n";
+		$caldata .= "DESCRIPTION:";
+		$caldata .= strtr($obj->note, array("\n"=>"\\n", "\r"=>""));
+		if (!empty($obj->soc_nom))
+			$caldata .= "\\n*DOLIBARR-SOC: ".$obj->soc_nom;
+		if (!empty($obj->soc_phone))
+			$caldata .= "\\n*DOLIBARR-SOC-TEL: ".$obj->soc_phone;
+		if (!empty($obj->firstname) || !empty($obj->lastname))
+			$caldata .= "\\n*DOLIBARR-CTC: ".trim($obj->firstname.' '.$obj->lastname);
+		if (!empty($obj->phone) || !empty($obj->phone_perso) || !empty($obj->phone_mobile))
+			$caldata .= "\\n*DOLIBARR-CTC-TEL: ".trim($obj->phone.' '.$obj->phone_perso.' '.$obj->phone_mobile);
+		if (strpos($obj->other_users, ',')) // several
+			$caldata .= "\\n*DOLIBARR-USR: ".$obj->other_users;
+		$caldata .= "\n";
 
-		$caldata.="END:".$type."\n";
-		$caldata.="END:VCALENDAR\n";
+		$caldata .= "END:".$type."\n";
+		$caldata .= "END:VCALENDAR\n";
 
 		return $caldata;
 	}
@@ -254,13 +254,13 @@ 
 	 */
 	public function getFullCalendarObjects($calendarId, $bCalendarData)
 	{
-		$calid = ($calendarId*1);
+		$calid = ($calendarId * 1);
 		$calevents = array();
 
-		if(! $this->user->rights->agenda->myactions->read)
+		if (!$this->user->rights->agenda->myactions->read)
 			return $calevents;
 
-		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
+		if ($calid != $this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
 			return $calevents;
 
 		$sql = $this->getSqlCalEvents($calid);
@@ -273,7 +273,7 @@ 
 			{
 				$calendardata = $this->toVCalendar($calid, $obj);
 
-				if($bCalendarData)
+				if ($bCalendarData)
 				{
 					$calevents[] = array(
 						'calendardata' => $calendardata,
@@ -282,7 +282,7 @@ 
 						'etag' => '"'.md5($calendardata).'"',
 						'calendarid'   => $calendarId,
 						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
 				}
 				else
@@ -294,7 +294,7 @@ 
 						'etag' => '"'.md5($calendardata).'"',
 						'calendarid'   => $calendarId,
 						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+						'component' => strpos($calendardata, 'BEGIN:VEVENT') > 0 ? 'vevent' : 'vtodo',
 					);
 				}
 			}

dolibarr/htdocs/dav/dav.lib.php

Spacing +7 added lines, -7 removed lines

@@ -22,21 +22,21 @@ 
  */
 
 // define CDAV_CONTACT_TAG if not
-if(!defined('CDAV_CONTACT_TAG'))
+if (!defined('CDAV_CONTACT_TAG'))
 {
-	if(isset($conf->global->CDAV_CONTACT_TAG))
+	if (isset($conf->global->CDAV_CONTACT_TAG))
 		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
 		else
 			define('CDAV_CONTACT_TAG', '');
 }
 
 // define CDAV_URI_KEY if not
-if(!defined('CDAV_URI_KEY'))
+if (!defined('CDAV_URI_KEY'))
 {
-	if(isset($conf->global->CDAV_URI_KEY))
+	if (isset($conf->global->CDAV_URI_KEY))
 		define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
 		else
-			define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']),0,8));
+			define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
 }
 
 
@@ -63,9 +63,9 @@ 
 	// Entries must be declared in modules descriptor with line
 	// $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
 	// $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav');
 
-	complete_head_from_modules($conf,$langs,$object,$head,$h,'admindav','remove');
+	complete_head_from_modules($conf, $langs, $object, $head, $h, 'admindav', 'remove');
 
 	return $head;
 }

dolibarr/htdocs/dav/fileserver.php

Spacing +22 added lines, -22 removed lines

@@ -21,12 +21,12 @@ 
  *      \brief      Server DAV
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1');
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1'); // If there is no menu to show
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1'); // If we don't need to load the html.form.class.php
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOLOGIN'))  		 define("NOLOGIN",1);		// This means this output page does not require to be logged.
-if (! defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');
+if (!defined('NOREQUIREMENU'))  define('NOREQUIREMENU', '1'); // If there is no menu to show
+if (!defined('NOREQUIREHTML'))  define('NOREQUIREHTML', '1'); // If we don't need to load the html.form.class.php
+if (!defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX', '1');
+if (!defined('NOLOGIN'))  		 define("NOLOGIN", 1); // This means this output page does not require to be logged.
+if (!defined('NOCSRFCHECK'))  	 define("NOCSRFCHECK", 1); // We accept to go on this page from external web site.
 
 require "../main.inc.php";
 require_once DOL_DOCUMENT_ROOT.'/core/lib/security2.lib.php';
@@ -37,17 +37,17 @@ 
 
 
 $user = new User($db);
-if(isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER']!='')
+if (isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER'] != '')
 {
-	$user->fetch('',$_SERVER['PHP_AUTH_USER']);
+	$user->fetch('', $_SERVER['PHP_AUTH_USER']);
 	$user->getrights();
 }
 
 // Load translation files required by the page
-$langs->loadLangs(array("main","other"));
+$langs->loadLangs(array("main", "other"));
 
 
-if(empty($conf->dav->enabled))
+if (empty($conf->dav->enabled))
 	accessforbidden();
 
 
@@ -58,7 +58,7 @@ 
 //var_dump($tmpDir);exit;
 
 // Authentication callback function
-$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
+$authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function($username, $password) {
 	global $user;
 	global $conf;
 	global $dolibarr_main_authentication;
@@ -72,11 +72,11 @@ 
 
 	// Authentication mode
 	if (empty($dolibarr_main_authentication))
-		$dolibarr_main_authentication='http,dolibarr';
-	$authmode = explode(',',$dolibarr_main_authentication);
-	$entity = (GETPOST('entity','int') ? GETPOST('entity','int') : (!empty($conf->entity) ? $conf->entity : 1));
+		$dolibarr_main_authentication = 'http,dolibarr';
+	$authmode = explode(',', $dolibarr_main_authentication);
+	$entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : (!empty($conf->entity) ? $conf->entity : 1));
 
-	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
+	if (checkLoginPassEntity($username, $password, $entity, $authmode) != $username)
 		return false;
 
 	return true;
@@ -100,14 +100,14 @@ 
 // Public dir
 if (!empty($conf->global->DAV_ALLOW_PUBLIC_DIR))
 {
-	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/public');
+	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root.'/dav/public');
 }
 // Private dir
-$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/dav/private');
+$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root.'/dav/private');
 // ECM dir
-if (! empty($conf->ecm->enabled) && ! empty($conf->global->DAV_ALLOW_ECM_DIR))
+if (!empty($conf->ecm->enabled) && !empty($conf->global->DAV_ALLOW_ECM_DIR))
 {
-	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root. '/ecm');
+	$nodes[] = new \Sabre\DAV\FS\Directory($dolibarr_main_data_root.'/ecm');
 }
 
 
@@ -135,15 +135,15 @@ 
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
-	|| ! preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public','/').'/', $_SERVER["PHP_SELF"]))
-	&& ! preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
+	|| !preg_match('/'.preg_quote(DOL_URL_ROOT.'/dav/fileserver.php/public', '/').'/', $_SERVER["PHP_SELF"]))
+	&& !preg_match('/^sabreAction=asset&assetName=[a-zA-Z0-9%\-\/]+\.(png|css|woff|ico|ttf)$/', $_SERVER["QUERY_STRING"])	// URL for Sabre browser resources
 	)
 {
 	//var_dump($_SERVER["QUERY_STRING"]);exit;
 	$server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend));
 }
 // Support for LOCK and UNLOCK
-$lockBackend = new \Sabre\DAV\Locks\Backend\File($tmpDir . '/.locksdb');
+$lockBackend = new \Sabre\DAV\Locks\Backend\File($tmpDir.'/.locksdb');
 $lockPlugin = new \Sabre\DAV\Locks\Plugin($lockBackend);
 $server->addPlugin($lockPlugin);
 

dolibarr/htdocs/exports/class/export.class.php

Spacing +207 added lines, -207 removed lines

@@ -35,20 +35,20 @@ 
      */
     public $db;
 
-	var $array_export_code=array();             // Tableau de "idmodule_numlot"
-	var $array_export_module=array();           // Tableau de "nom de modules"
-	var $array_export_label=array();            // Tableau de "libelle de lots"
-	var $array_export_sql_start=array();        // Tableau des "requetes sql"
-	var $array_export_sql_end=array();          // Tableau des "requetes sql"
-	var $array_export_sql_order=array();        // Tableau des "requetes sql"
-
-	var $array_export_fields=array();           // Tableau des listes de champ+libelle a exporter
-	var $array_export_TypeFields=array();		// Tableau des listes de champ+Type de filtre
-	var $array_export_FilterValue=array();		// Tableau des listes de champ+Valeur a filtrer
-	var $array_export_entities=array();         // Tableau des listes de champ+alias a exporter
-	var $array_export_dependencies=array();     // array of list of entities that must take care of the DISTINCT if a field is added into export
-	var $array_export_special=array();          // Tableau des operations speciales sur champ
-    var $array_export_examplevalues=array();    // array with examples
+	var $array_export_code = array(); // Tableau de "idmodule_numlot"
+	var $array_export_module = array(); // Tableau de "nom de modules"
+	var $array_export_label = array(); // Tableau de "libelle de lots"
+	var $array_export_sql_start = array(); // Tableau des "requetes sql"
+	var $array_export_sql_end = array(); // Tableau des "requetes sql"
+	var $array_export_sql_order = array(); // Tableau des "requetes sql"
+
+	var $array_export_fields = array(); // Tableau des listes de champ+libelle a exporter
+	var $array_export_TypeFields = array(); // Tableau des listes de champ+Type de filtre
+	var $array_export_FilterValue = array(); // Tableau des listes de champ+Valeur a filtrer
+	var $array_export_entities = array(); // Tableau des listes de champ+alias a exporter
+	var $array_export_dependencies = array(); // array of list of entities that must take care of the DISTINCT if a field is added into export
+	var $array_export_special = array(); // Tableau des operations speciales sur champ
+    var $array_export_examplevalues = array(); // array with examples
 
 	// To store export modules
 	var $hexa;
@@ -66,7 +66,7 @@ 
 	 */
 	function __construct($db)
 	{
-		$this->db=$db;
+		$this->db = $db;
 	}
 
 
@@ -78,38 +78,38 @@ 
 	 *    @param  	string		$filter    	Load a particular dataset only
 	 *    @return	int						<0 if KO, >0 if OK
 	 */
-	function load_arrays($user,$filter='')
+	function load_arrays($user, $filter = '')
 	{
         // phpcs:enable
-		global $langs,$conf,$mysoc;
+		global $langs, $conf, $mysoc;
 
 		dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
-        $i=0;
+        $i = 0;
 
         // Define list of modules directories into modulesdir
         require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
 
         $modulesdir = dolGetModulesDirs();
 
-		foreach($modulesdir as $dir)
+		foreach ($modulesdir as $dir)
 		{
 			// Search available exports
-			$handle=@opendir(dol_osencode($dir));
+			$handle = @opendir(dol_osencode($dir));
 			if (is_resource($handle))
 			{
                 // Search module files
-			    while (($file = readdir($handle))!==false)
+			    while (($file = readdir($handle)) !== false)
 				{
-					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
+					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i", $file, $reg))
 					{
-						$modulename=$reg[1];
+						$modulename = $reg[1];
 
 						// Defined if module is enabled
-						$enabled=true;
-						$part=strtolower(preg_replace('/^mod/i','',$modulename));
-						if ($part == 'propale') $part='propal';
-						if (empty($conf->$part->enabled)) $enabled=false;
+						$enabled = true;
+						$part = strtolower(preg_replace('/^mod/i', '', $modulename));
+						if ($part == 'propale') $part = 'propal';
+						if (empty($conf->$part->enabled)) $enabled = false;
 
 						if ($enabled)
 						{
@@ -121,32 +121,32 @@ 
 
 							if (isset($module->export_code) && is_array($module->export_code))
 							{
-							    foreach($module->export_code as $r => $value)
+							    foreach ($module->export_code as $r => $value)
 								{
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
 								    if ($filter && ($filter != $module->export_code[$r])) continue;
 
                                     // Test if condition to show are ok
-                                    if (! empty($module->export_enabled[$r]) && ! verifCond($module->export_enabled[$r])) continue;
+                                    if (!empty($module->export_enabled[$r]) && !verifCond($module->export_enabled[$r])) continue;
 
                                     // Test if permissions are ok
-									$bool=true;
+									$bool = true;
 									if (isset($module->export_permission))
 									{
-										foreach($module->export_permission[$r] as $val)
+										foreach ($module->export_permission[$r] as $val)
 										{
-	    									$perm=$val;
+	    									$perm = $val;
 	    									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-	    									if (! empty($perm[2]))
+	    									if (!empty($perm[2]))
 	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
+	    										$bool = $user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
 	    									}
 	    									else
 	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
+	    										$bool = $user->rights->{$perm[0]}->{$perm[1]};
 	    									}
-	    									if ($perm[0]=='user' && $user->admin) $bool=true;
-	    									if (! $bool) break;
+	    									if ($perm[0] == 'user' && $user->admin) $bool = true;
+	    									if (!$bool) break;
 										}
 									}
 									//print $bool." $perm[0]"."<br>";
@@ -155,45 +155,45 @@ 
 									//	          if ($bool)
 									//	          {
 									// Charge fichier lang en rapport
-									$langtoload=$module->getLangFilesArray();
+									$langtoload = $module->getLangFilesArray();
 									if (is_array($langtoload))
 									{
-										foreach($langtoload as $key)
+										foreach ($langtoload as $key)
 										{
 											$langs->load($key);
 										}
 									}
 
 									// Module
-									$this->array_export_module[$i]=$module;
+									$this->array_export_module[$i] = $module;
 									// Permission
-									$this->array_export_perms[$i]=$bool;
+									$this->array_export_perms[$i] = $bool;
 									// Icon
-									$this->array_export_icon[$i]=(isset($module->export_icon[$r])?$module->export_icon[$r]:$module->picto);
+									$this->array_export_icon[$i] = (isset($module->export_icon[$r]) ? $module->export_icon[$r] : $module->picto);
 									// Code du dataset export
-									$this->array_export_code[$i]=$module->export_code[$r];
+									$this->array_export_code[$i] = $module->export_code[$r];
 									// Libelle du dataset export
-									$this->array_export_label[$i]=$module->getExportDatasetLabel($r);
+									$this->array_export_label[$i] = $module->getExportDatasetLabel($r);
 									// Tableau des champ a exporter (cle=champ, valeur=libelle)
-									$this->array_export_fields[$i]=$module->export_fields_array[$r];
+									$this->array_export_fields[$i] = $module->export_fields_array[$r];
 									// Tableau des champs a filtrer (cle=champ, valeur1=type de donnees) on verifie que le module a des filtres
-									$this->array_export_TypeFields[$i]=(isset($module->export_TypeFields_array[$r])?$module->export_TypeFields_array[$r]:'');
+									$this->array_export_TypeFields[$i] = (isset($module->export_TypeFields_array[$r]) ? $module->export_TypeFields_array[$r] : '');
 									// Tableau des entites a exporter (cle=champ, valeur=entite)
-									$this->array_export_entities[$i]=$module->export_entities_array[$r];
+									$this->array_export_entities[$i] = $module->export_entities_array[$r];
 									// Tableau des entites qui requiert abandon du DISTINCT (cle=entite, valeur=champ id child records)
-									$this->array_export_dependencies[$i]=(! empty($module->export_dependencies_array[$r])?$module->export_dependencies_array[$r]:'');
+									$this->array_export_dependencies[$i] = (!empty($module->export_dependencies_array[$r]) ? $module->export_dependencies_array[$r] : '');
 									// Tableau des operations speciales sur champ
-									$this->array_export_special[$i]=(! empty($module->export_special_array[$r])?$module->export_special_array[$r]:'');
+									$this->array_export_special[$i] = (!empty($module->export_special_array[$r]) ? $module->export_special_array[$r] : '');
             						// Array of examples
-            						$this->array_export_examplevalues[$i]=$module->export_examplevalues_array[$r];
+            						$this->array_export_examplevalues[$i] = $module->export_examplevalues_array[$r];
 
 									// Requete sql du dataset
-									$this->array_export_sql_start[$i]=$module->export_sql_start[$r];
-									$this->array_export_sql_end[$i]=$module->export_sql_end[$r];
-									$this->array_export_sql_order[$i]=$module->export_sql_order[$r];
+									$this->array_export_sql_start[$i] = $module->export_sql_start[$r];
+									$this->array_export_sql_end[$i] = $module->export_sql_end[$r];
+									$this->array_export_sql_order[$i] = $module->export_sql_order[$r];
 									//$this->array_export_sql[$i]=$module->export_sql[$r];
 
-									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(! empty($module->export_fields_code[$r])?count($module->export_fields_code[$r]):''));
+									dol_syslog(get_class($this)."::load_arrays loaded for module ".$modulename." with index ".$i.", dataset=".$module->export_code[$r].", nb of fields=".(!empty($module->export_fields_code[$r]) ?count($module->export_fields_code[$r]) : ''));
 									$i++;
 									//	          }
 								}
@@ -223,42 +223,42 @@ 
 	{
         // phpcs:enable
 		// Build the sql request
-		$sql=$this->array_export_sql_start[$indice];
-		$i=0;
+		$sql = $this->array_export_sql_start[$indice];
+		$i = 0;
 
 		//print_r($array_selected);
 		foreach ($this->array_export_fields[$indice] as $key => $value)
 		{
-			if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-            if (preg_match('/^none\./', $key)) continue;                    // A field that must not appears into SQL
-			if ($i > 0) $sql.=', ';
+			if (!array_key_exists($key, $array_selected)) continue; // Field not selected
+            if (preg_match('/^none\./', $key)) continue; // A field that must not appears into SQL
+			if ($i > 0) $sql .= ', ';
 			else $i++;
 
-			if (strpos($key, ' as ')===false) {
-				$newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
+			if (strpos($key, ' as ') === false) {
+				$newfield = $key.' as '.str_replace(array('.', '-', '(', ')'), '_', $key);
 			} else {
-				$newfield=$key;
+				$newfield = $key;
 			}
 
-			$sql.=$newfield;
+			$sql .= $newfield;
 		}
-		$sql.=$this->array_export_sql_end[$indice];
+		$sql .= $this->array_export_sql_end[$indice];
 
 		// Add the WHERE part. Filtering into sql if a filtering array is provided
 		if (is_array($array_filterValue) && !empty($array_filterValue))
 		{
-			$sqlWhere='';
+			$sqlWhere = '';
 			// Loop on each condition to add
 			foreach ($array_filterValue as $key => $value)
 			{
 			    if (preg_match('/GROUP_CONCAT/i', $key)) continue;
-				if ($value != '') $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				if ($value != '') $sqlWhere .= " and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 			}
-			$sql.=$sqlWhere;
+			$sql .= $sqlWhere;
 		}
 
 		// Add the order
-		$sql.=$this->array_export_sql_order[$indice];
+		$sql .= $this->array_export_sql_order[$indice];
 
 		// Add the HAVING part.
 		if (is_array($array_filterValue) && !empty($array_filterValue))
@@ -266,7 +266,7 @@ 
 		    // Loop on each condition to add
 		    foreach ($array_filterValue as $key => $value)
 		    {
-		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql.=" HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+		        if (preg_match('/GROUP_CONCAT/i', $key) and $value != '') $sql .= " HAVING ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
 		    }
 		}
 
@@ -290,25 +290,25 @@ 
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+				if (!(strpos($ValueField, '%') === false))
+					$szFilterQuery .= " ".$NameField." LIKE '".$ValueField."'";
 				else
-					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+					$szFilterQuery .= " ".$NameField." = '".$ValueField."'";
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$this->conditionDate($NameField,trim($ValueArray[0]),">=");
-					$szFilterQuery.=" AND ".$this->conditionDate($NameField,trim($ValueArray[1]),"<=").")";
+					$szFilterQuery = "(".$this->conditionDate($NameField, trim($ValueArray[0]), ">=");
+					$szFilterQuery .= " AND ".$this->conditionDate($NameField, trim($ValueArray[1]), "<=").")";
 				}
 				else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=$this->conditionDate($NameField,trim($ValueField),"=");
+					if (is_numeric(substr($ValueField, 0, 1)))
+						$szFilterQuery = $this->conditionDate($NameField, trim($ValueField), "=");
 					else
-						$szFilterQuery=$this->conditionDate($NameField,trim(substr($ValueField,1)),substr($ValueField,0,1));
+						$szFilterQuery = $this->conditionDate($NameField, trim(substr($ValueField, 1)), substr($ValueField, 0, 1));
 				}
 				break;
 			case 'Duree':
@@ -319,29 +319,29 @@ 
 				{
 					// mode plage
 					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
-					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
+					$szFilterQuery = "(".$NameField.">=".$ValueArray[0];
+					$szFilterQuery .= " AND ".$NameField."<=".$ValueArray[1].")";
 				}
 				else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
+					if (is_numeric(substr($ValueField, 0, 1)))
+						$szFilterQuery = " ".$NameField."=".$ValueField;
 					else
-						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+						$szFilterQuery = " ".$NameField.substr($ValueField, 0, 1).substr($ValueField, 1);
 				}
 				break;
 			case 'Boolean':
-				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+				$szFilterQuery = " ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField == 'yes' ? 1 : 0));
 				break;
 			case 'Status':
 			case 'List':
 				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
+					$szFilterQuery = " ".$NameField."=".$ValueField;
 				else {
-                    if (! (strpos($ValueField, '%') === false))
-                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    if (!(strpos($ValueField, '%') === false))
+                        $szFilterQuery = " ".$NameField." LIKE '".$ValueField."'";
                     else
-                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+                        $szFilterQuery = " ".$NameField." = '".$ValueField."'";
 				}
 				break;
 			default:
@@ -362,9 +362,9 @@ 
 	function conditionDate($Field, $Value, $Sens)
 	{
 		// TODO date_format is forbidden, not performant and not portable. Use instead BETWEEN
-		if (strlen($Value)==4) $Condition=" date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
-		elseif (strlen($Value)==6) $Condition=" date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
-		else  $Condition=" date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
+		if (strlen($Value) == 4) $Condition = " date_format(".$Field.",'%Y') ".$Sens." '".$Value."'";
+		elseif (strlen($Value) == 6) $Condition = " date_format(".$Field.",'%Y%m') ".$Sens." '".$Value."'";
+		else  $Condition = " date_format(".$Field.",'%Y%m%d') ".$Sens." ".$Value;
 		return $Condition;
 	}
 
@@ -380,9 +380,9 @@ 
 	function build_filterField($TypeField, $NameField, $ValueField)
 	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$szFilterField='';
+		$szFilterField = '';
 		$InfoFieldList = explode(":", $TypeField);
 
 		// build the input field on depend of the type of file
@@ -390,52 +390,52 @@ 
 		{
 			case 'Text':
 			case 'Date':
-				$szFilterField='<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
+				$szFilterField = '<input type="text" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Duree':
 			case 'Numeric':
 			case 'Number':
 				// Must be a string text to allow to use comparison strings like "<= 999"
-			    $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+			    $szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Status':
-				if (! empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField='<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
-				else $szFilterField='<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				if (!empty($conf->global->MAIN_ACTIVATE_HTML5)) $szFilterField = '<input type="number" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
+				else $szFilterField = '<input type="text" size="6" name="'.$NameField.'" value="'.$ValueField.'">';
 				break;
 			case 'Boolean':
-				$szFilterField='<select name="'.$NameField.'" class="flat">';
-				$szFilterField.='<option ';
-				if ($ValueField=='') $szFilterField.=' selected ';
-				$szFilterField.=' value="">&nbsp;</option>';
-
-				$szFilterField.='<option ';
-				if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
-				$szFilterField.=' value="1">'.yn(1).'</option>';
-
-				$szFilterField.='<option ';
-				if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
-				$szFilterField.=' value="0">'.yn(0).'</option>';
-				$szFilterField.="</select>";
+				$szFilterField = '<select name="'.$NameField.'" class="flat">';
+				$szFilterField .= '<option ';
+				if ($ValueField == '') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="">&nbsp;</option>';
+
+				$szFilterField .= '<option ';
+				if ($ValueField == 'yes' || $ValueField == '1') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="1">'.yn(1).'</option>';
+
+				$szFilterField .= '<option ';
+				if ($ValueField == 'no' || $ValueField == '0') $szFilterField .= ' selected ';
+				$szFilterField .= ' value="0">'.yn(0).'</option>';
+				$szFilterField .= "</select>";
 				break;
 			case 'List':
 				// 0 : Type du champ
 				// 1 : Nom de la table
 				// 2 : Nom du champ contenant le libelle
 				// 3 : Name of field with key (if it is not "rowid"). Used this field as key for combo list.
-				if (count($InfoFieldList)==4)
-					$keyList=$InfoFieldList[3];
+				if (count($InfoFieldList) == 4)
+					$keyList = $InfoFieldList[3];
 				else
-					$keyList='rowid';
-				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
-				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3])?'':', '.$InfoFieldList[3].' as code');
+					$keyList = 'rowid';
+				$sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
+				if ($InfoFieldList[1] == 'c_stcomm') $sql = 'SELECT id as id, '.$keyList.' as rowid, '.$InfoFieldList[2].' as label'.(empty($InfoFieldList[3]) ? '' : ', '.$InfoFieldList[3].' as code');
 				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
-				$sql.= ' FROM '.MAIN_DB_PREFIX .$InfoFieldList[1];
+				$sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[1];
 
 				$resql = $this->db->query($sql);
 				if ($resql)
 				{
-					$szFilterField='<select class="flat" name="'.$NameField.'">';
-					$szFilterField.='<option value="0">&nbsp;</option>';
+					$szFilterField = '<select class="flat" name="'.$NameField.'">';
+					$szFilterField .= '<option value="0">&nbsp;</option>';
 					$num = $this->db->num_rows($resql);
 
 					$i = 0;
@@ -451,30 +451,30 @@ 
 								continue;
 							}
 							//var_dump($InfoFieldList[1]);
-							$labeltoshow=dol_trunc($obj->label,18);
+							$labeltoshow = dol_trunc($obj->label, 18);
 							if ($InfoFieldList[1] == 'c_stcomm')
 							{
 								$langs->load("companies");
-								$labeltoshow=(($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id)?$langs->trans("StatusProspect".$obj->id):$obj->label);
+								$labeltoshow = (($langs->trans("StatusProspect".$obj->id) != "StatusProspect".$obj->id) ? $langs->trans("StatusProspect".$obj->id) : $obj->label);
 							}
 							if ($InfoFieldList[1] == 'c_country')
 							{
 								//var_dump($sql);
 								$langs->load("dict");
-								$labeltoshow=(($langs->trans("Country".$obj->code) != "Country".$obj->code)?$langs->trans("Country".$obj->code):$obj->label);
+								$labeltoshow = (($langs->trans("Country".$obj->code) != "Country".$obj->code) ? $langs->trans("Country".$obj->code) : $obj->label);
 							}
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
-								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+								$szFilterField .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
 							}
 							else
 							{
-								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
+								$szFilterField .= '<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
 							$i++;
 						}
 					}
-					$szFilterField.="</select>";
+					$szFilterField .= "</select>";
 
 					$this->db->free($resql);
 				}
@@ -495,12 +495,12 @@ 
 	{
         global $langs;
 
-		$szMsg='';
+		$szMsg = '';
 		$InfoFieldList = explode(":", $TypeField);
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				$szMsg= $langs->trans('ExportStringFilter');
+				$szMsg = $langs->trans('ExportStringFilter');
 				break;
 			case 'Date':
 				$szMsg = $langs->trans('ExportDateFilter');
@@ -535,37 +535,37 @@ 
 	function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
  	{
         // phpcs:enable
-		global $conf,$langs;
+		global $conf, $langs;
 
-		$indice=0;
+		$indice = 0;
 		asort($array_selected);
 
 		dol_syslog(get_class($this)."::".__FUNCTION__." ".$model.", ".$datatoexport.", ".implode(",", $array_selected));
 
 		// Check parameters or context properties
-		if (empty($this->array_export_fields) || ! is_array($this->array_export_fields))
+		if (empty($this->array_export_fields) || !is_array($this->array_export_fields))
 		{
-			$this->error="ErrorBadParameter";
+			$this->error = "ErrorBadParameter";
 			return -1;
 		}
 
 		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
+		$dir = DOL_DOCUMENT_ROOT."/core/modules/export/";
 		$file = "export_".$model.".modules.php";
 		$classname = "Export".$model;
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db);
 
-		if (! empty($sqlquery)) $sql = $sqlquery;
+		if (!empty($sqlquery)) $sql = $sqlquery;
         else
 		{
 			// Define value for indice from $datatoexport
-			$foundindice=0;
-			foreach($this->array_export_code as $key => $dataset)
+			$foundindice = 0;
+			foreach ($this->array_export_code as $key => $dataset)
 			{
 				if ($datatoexport == $dataset)
 				{
-					$indice=$key;
+					$indice = $key;
 					$foundindice++;
 					//print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
 					break;
@@ -573,31 +573,31 @@ 
 			}
 			if (empty($foundindice))
 			{
-				$this->error="ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
+				$this->error = "ErrorBadParameter can't find dataset ".$datatoexport." into preload arrays this->array_export_code";
 				return -1;
 			}
-        	$sql=$this->build_sql($indice, $array_selected, $array_filterValue);
+        	$sql = $this->build_sql($indice, $array_selected, $array_filterValue);
 		}
 
 		// Run the sql
-		$this->sqlusedforexport=$sql;
+		$this->sqlusedforexport = $sql;
 		dol_syslog(get_class($this)."::".__FUNCTION__."", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
 			if ($conf->global->EXPORT_PREFIX_SPEC)
-				$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
+				$filename = $conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
 			else
-				$filename="export_".$datatoexport;
-			$filename.='.'.$objmodel->getDriverExtension();
-			$dirname=$conf->export->dir_temp.'/'.$user->id;
+				$filename = "export_".$datatoexport;
+			$filename .= '.'.$objmodel->getDriverExtension();
+			$dirname = $conf->export->dir_temp.'/'.$user->id;
 
 			$outputlangs = clone $langs; // We clone to have an object we can modify (for example to change output charset by csv handler) without changing original value
 
 			// Open file
 			dol_mkdir($dirname);
-			$result=$objmodel->open_file($dirname."/".$filename, $outputlangs);
+			$result = $objmodel->open_file($dirname."/".$filename, $outputlangs);
 
 			if ($result >= 0)
 			{
@@ -605,64 +605,64 @@ 
 				$objmodel->write_header($outputlangs);
 
 				// Genere ligne de titre
-				$objmodel->write_title($this->array_export_fields[$indice],$array_selected,$outputlangs,$this->array_export_TypeFields[$indice]);
+				$objmodel->write_title($this->array_export_fields[$indice], $array_selected, $outputlangs, $this->array_export_TypeFields[$indice]);
 
 				while ($obj = $this->db->fetch_object($resql))
 				{
 					// Process special operations
-					if (! empty($this->array_export_special[$indice]))
+					if (!empty($this->array_export_special[$indice]))
 					{
 						foreach ($this->array_export_special[$indice] as $key => $value)
 						{
-							if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+							if (!array_key_exists($key, $array_selected)) continue; // Field not selected
 							// Operation NULLIFNEG
-							if ($this->array_export_special[$indice][$key]=='NULLIFNEG')
+							if ($this->array_export_special[$indice][$key] == 'NULLIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								if ($obj->$alias < 0) $obj->$alias = '';
 							}
 							// Operation ZEROIFNEG
-							elseif ($this->array_export_special[$indice][$key]=='ZEROIFNEG')
+							elseif ($this->array_export_special[$indice][$key] == 'ZEROIFNEG')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='0';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								if ($obj->$alias < 0) $obj->$alias = '0';
 							}
 							// Operation INVOICEREMAINTOPAY
-							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
+							elseif ($this->array_export_special[$indice][$key] == 'getRemainToPay')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								$remaintopay='';
+								$alias = str_replace(array('.', '-', '(', ')'), '_', $key);
+								$remaintopay = '';
 								if ($obj->f_rowid > 0)
 								{
 								    global $tmpobjforcomputecall;
-								    if (! is_object($tmpobjforcomputecall))
+								    if (!is_object($tmpobjforcomputecall))
 								    {
 								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-								        $tmpobjforcomputecall=new Facture($this->db);
+								        $tmpobjforcomputecall = new Facture($this->db);
 								    }
 								    $tmpobjforcomputecall->id = $obj->f_rowid;
 								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
-								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
+								    $remaintopay = $tmpobjforcomputecall->getRemainToPay();
 								}
-								$obj->$alias=$remaintopay;
+								$obj->$alias = $remaintopay;
 							}
 							else
 							{
 							    // TODO FIXME Export of compute field does not work. $obj containt $obj->alias_field and formulat will contains $obj->field
-							    $computestring=$this->array_export_special[$indice][$key];
-							    $tmp=dol_eval($computestring, 1, 0);
-							    $obj->$alias=$tmp;
+							    $computestring = $this->array_export_special[$indice][$key];
+							    $tmp = dol_eval($computestring, 1, 0);
+							    $obj->$alias = $tmp;
 
-							    $this->error="ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
+							    $this->error = "ERROPNOTSUPPORTED. Operation ".$this->array_export_special[$indice][$key]." not supported. Export of 'computed' extrafields is not yet supported, please remove field.";
 							    return -1;
 							}
 						}
 					}
 					// end of special operation processing
-					$objmodel->write_record($array_selected,$obj,$outputlangs,$this->array_export_TypeFields[$indice]);
+					$objmodel->write_record($array_selected, $obj, $outputlangs, $this->array_export_TypeFields[$indice]);
 				}
 
 				// Genere en-tete
@@ -675,14 +675,14 @@ 
 			}
 			else
 			{
-				$this->error=$objmodel->error;
+				$this->error = $objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
 		}
 		else
 		{
-			$this->error=$this->db->error()." - sql=".$sql;
+			$this->error = $this->db->error()." - sql=".$sql;
 			return -1;
 		}
 	}
@@ -701,24 +701,24 @@ 
 
 		$this->db->begin();
 
-		$filter='';
+		$filter = '';
 
 		$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'export_model (';
-		$sql.= 'label,';
-		$sql.= 'type,';
-		$sql.= 'field,';
-		$sql.= 'fk_user,';
-		$sql.= 'filter';
-		$sql.= ') VALUES (';
-		$sql.= "'".$this->db->escape($this->model_name)."',";
-		$sql.= "'".$this->db->escape($this->datatoexport)."',";
-		$sql.= "'".$this->db->escape($this->hexa)."',";
-		$sql.= "'".$user->id."',";
-		$sql.= "'".$this->db->escape($this->hexafiltervalue)."'";
-		$sql.= ")";
+		$sql .= 'label,';
+		$sql .= 'type,';
+		$sql .= 'field,';
+		$sql .= 'fk_user,';
+		$sql .= 'filter';
+		$sql .= ') VALUES (';
+		$sql .= "'".$this->db->escape($this->model_name)."',";
+		$sql .= "'".$this->db->escape($this->datatoexport)."',";
+		$sql .= "'".$this->db->escape($this->hexa)."',";
+		$sql .= "'".$user->id."',";
+		$sql .= "'".$this->db->escape($this->hexafiltervalue)."'";
+		$sql .= ")";
 
 		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
 			$this->db->commit();
@@ -726,8 +726,8 @@ 
 		}
 		else
 		{
-			$this->error=$this->db->lasterror();
-			$this->errno=$this->db->lasterrno();
+			$this->error = $this->db->lasterror();
+			$this->errno = $this->db->lasterrno();
 			$this->db->rollback();
 			return -1;
 		}
@@ -742,8 +742,8 @@ 
 	function fetch($id)
 	{
 		$sql = 'SELECT em.rowid, em.label, em.type, em.field, em.filter';
-		$sql.= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
-		$sql.= ' WHERE em.rowid = '.$id;
+		$sql .= ' FROM '.MAIN_DB_PREFIX.'export_model as em';
+		$sql .= ' WHERE em.rowid = '.$id;
 
 		dol_syslog("Export::fetch", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -752,18 +752,18 @@ 
 			$obj = $this->db->fetch_object($result);
 			if ($obj)
 			{
-				$this->id				= $obj->rowid;
-				$this->model_name		= $obj->label;
-				$this->datatoexport		= $obj->type;
+				$this->id = $obj->rowid;
+				$this->model_name = $obj->label;
+				$this->datatoexport = $obj->type;
 
-				$this->hexa				= $obj->field;
-				$this->hexafiltervalue	= $obj->filter;
+				$this->hexa = $obj->field;
+				$this->hexafiltervalue = $obj->filter;
 
 				return 1;
 			}
 			else
 			{
-				$this->error="ModelNotFound";
+				$this->error = "ModelNotFound";
 				return -2;
 			}
 		}
@@ -782,23 +782,23 @@ 
 	 *  @param      int			$notrigger	    0=launch triggers after, 1=disable triggers
 	 *	@return		int							<0 if KO, >0 if OK
 	 */
-	function delete($user, $notrigger=0)
+	function delete($user, $notrigger = 0)
 	{
 		global $conf, $langs;
-		$error=0;
+		$error = 0;
 
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."export_model";
-		$sql.= " WHERE rowid=".$this->id;
+		$sql .= " WHERE rowid=".$this->id;
 
 		$this->db->begin();
 
 		dol_syslog(get_class($this)."::delete", LOG_DEBUG);
 		$resql = $this->db->query($sql);
-		if (! $resql) { $error++; $this->errors[]="Error ".$this->db->lasterror(); }
+		if (!$resql) { $error++; $this->errors[] = "Error ".$this->db->lasterror(); }
 
-		if (! $error)
+		if (!$error)
 		{
-			if (! $notrigger)
+			if (!$notrigger)
 			{
 				// Uncomment this and change MYOBJECT to your own tag if you
 				// want this action call a trigger.
@@ -815,13 +815,13 @@ 
 		// Commit or rollback
 		if ($error)
 		{
-			foreach($this->errors as $errmsg)
+			foreach ($this->errors as $errmsg)
 			{
 				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
+				$this->error .= ($this->error ? ', '.$errmsg : $errmsg);
 			}
 			$this->db->rollback();
-			return -1*$error;
+			return -1 * $error;
 		}
 		else
 		{
@@ -843,8 +843,8 @@ 
 		global $conf, $langs;
 
 		$sql = "SELECT em.rowid, em.field, em.label, em.type, em.filter";
-		$sql.= " FROM ".MAIN_DB_PREFIX."export_model as em";
-		$sql.= " ORDER BY rowid";
+		$sql .= " FROM ".MAIN_DB_PREFIX."export_model as em";
+		$sql .= " ORDER BY rowid";
 
 		$result = $this->db->query($sql);
 		if ($result)
@@ -858,19 +858,19 @@ 
 				print "<tr>";
 				print '<td><a href=export.php?step=2&action=select_model&exportmodelid='.$obj->rowid.'&datatoexport='.$obj->type.'>'.$obj->label.'</a></td>';
 				print '<td>';
-				print img_object($this->array_export_module[$keyModel]->getName(),$this->array_export_icon[$keyModel]).' ';
+				print img_object($this->array_export_module[$keyModel]->getName(), $this->array_export_icon[$keyModel]).' ';
 				print $this->array_export_module[$keyModel]->getName().' - ';
 				// recuperation du nom de l'export
 
-				$string=$langs->trans($this->array_export_label[$keyModel]);
-				print ($string!=$this->array_export_label[$keyModel]?$string:$this->array_export_label[$keyModel]);
+				$string = $langs->trans($this->array_export_label[$keyModel]);
+				print ($string != $this->array_export_label[$keyModel] ? $string : $this->array_export_label[$keyModel]);
 				print '</td>';
 				//print '<td>'.$obj->type.$keyModel.'</td>';
-				print '<td>'.str_replace(',',' , ',$obj->field).'</td>';
-				if (! empty($obj->filter)) {
+				print '<td>'.str_replace(',', ' , ', $obj->field).'</td>';
+				if (!empty($obj->filter)) {
 					$filter = json_decode($obj->filter, true);
-					print '<td>'.str_replace(',',' , ',$filter['field']).'</td>';
-					print '<td>'.str_replace(',',' , ',$filter['value']).'</td>';
+					print '<td>'.str_replace(',', ' , ', $filter['field']).'</td>';
+					print '<td>'.str_replace(',', ' , ', $filter['value']).'</td>';
 				}
 				// suppression de l'export
 				print '<td align="right">';

dolibarr/htdocs/margin/lib/margins.lib.php

Spacing +4 added lines, -4 removed lines

@@ -44,9 +44,9 @@ 
 	// Entries must be declared in modules descriptor with line
     // $this->tabs = array('entity:+tabname:Title:@mymodule:/mymodule/mypage.php?id=__ID__');   to add new tab
     // $this->tabs = array('entity:-tabname);   												to remove a tab
-	complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin');
+	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin');
 
-	complete_head_from_modules($conf,$langs,'',$head,$h,'margesadmin','remove');
+	complete_head_from_modules($conf, $langs, '', $head, $h, 'margesadmin', 'remove');
 
 	return $head;
 }
@@ -115,8 +115,8 @@ 
 {
 	global $db, $conf;
 
-	$marge_tx_ret='';
-	$marque_tx_ret='';
+	$marge_tx_ret = '';
+	$marque_tx_ret = '';
 
 	if ($fk_pa > 0 && empty($paht)) {
 		require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';

dolibarr/htdocs/margin/admin/margin.php

Spacing +20 added lines, -20 removed lines

@@ -31,17 +31,17 @@ 
 
 $langs->loadLangs(array("admin", "bills", "margins", "stocks"));
 
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
-$action=GETPOST('action','alpha');
+$action = GETPOST('action', 'alpha');
 
 
 /*
  * Action
  */
-if (preg_match('/set_([a-z0-9_\-]+)/i',$action,$reg))
+if (preg_match('/set_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
+    $code = $reg[1];
     if (dolibarr_set_const($db, $code, 1, 'yesno', 0, '', $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
@@ -53,9 +53,9 @@ 
     }
 }
 
-if (preg_match('/del_([a-z0-9_\-]+)/i',$action,$reg))
+if (preg_match('/del_([a-z0-9_\-]+)/i', $action, $reg))
 {
-    $code=$reg[1];
+    $code = $reg[1];
     if (dolibarr_del_const($db, $code, $conf->entity) > 0)
     {
         header("Location: ".$_SERVER["PHP_SELF"]);
@@ -107,18 +107,18 @@ 
  * View
  */
 
-llxHeader('',$langs->trans("margesSetup"));
+llxHeader('', $langs->trans("margesSetup"));
 
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("margesSetup"),$linkback,'title_setup');
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("margesSetup"), $linkback, 'title_setup');
 
 
 $head = marges_admin_prepare_head();
 
 dol_fiche_head($head, 'parameters', $langs->trans("Margins"), -1, 'margin');
 
-print load_fiche_titre($langs->trans("MemberMainOptions"),'','');
+print load_fiche_titre($langs->trans("MemberMainOptions"), '', '');
 print '<table class="noborder" width="100%">';
 print '<tr class="liste_titre">';
 print '<td width=300>'.$langs->trans("Description").'</td>';
@@ -163,7 +163,7 @@ 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DisplayMarginRates").'</td>';
 print '<td colspan="2" align="center">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARGIN_RATES');
 }
@@ -171,11 +171,11 @@ 
 {
 	if (empty($conf->global->DISPLAY_MARGIN_RATES))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 	else
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARGIN_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -186,7 +186,7 @@ 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("DisplayMarkRates").'</td>';
 print '<td colspan="2" align="center">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('DISPLAY_MARK_RATES');
 }
@@ -194,11 +194,11 @@ 
 {
 	if (empty($conf->global->DISPLAY_MARK_RATES))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 	else
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_DISPLAY_MARK_RATES">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -209,7 +209,7 @@ 
 print '<tr class="oddeven">';
 print '<td>'.$langs->trans("ForceBuyingPriceIfNull").'</td>';
 print '<td colspan="2" align="center">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print ajax_constantonoff('ForceBuyingPriceIfNull');
 }
@@ -217,11 +217,11 @@ 
 {
 	if (empty($conf->global->ForceBuyingPriceIfNull))
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"),'off').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=set_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Disabled"), 'off').'</a>';
 	}
 	else
 	{
-		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"),'on').'</a>';
+		print '<a href="'.$_SERVER['PHP_SELF'].'?action=del_ForceBuyingPriceIfNull">'.img_picto($langs->trans("Enabled"), 'on').'</a>';
 	}
 }
 print '</td>';
@@ -260,7 +260,7 @@ 
 print '<td align="left">';
 $formcompany = new FormCompany($db);
 $facture = new Facture($db);
-print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE","internal","code",1);
+print $formcompany->selectTypeContact($facture, $conf->global->AGENT_CONTACT_TYPE, "AGENT_CONTACT_TYPE", "internal", "code", 1);
 print '</td>';
 print '<td>';
 print '<input type="submit" class="button" value="'.$langs->trans("Modify").'">';