alxarafe / alixar

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;
 

Braces +19 added lines, -8 removed lines

@@ -25,11 +25,13 @@ 
 if (session_id() == "")
 {
     session_start();
-    if (ini_get('register_globals'))    // To solve bug in using $_SESSION
+    if (ini_get('register_globals')) {
+        // To solve bug in using $_SESSION
     {
         foreach ($_SESSION as $key=>$value)
         {
             if (isset($GLOBALS[$key])) unset($GLOBALS[$key]);
+    }
         }
     }
 }
@@ -48,12 +50,13 @@ 
  ' 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=";
 }
-else
+    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
+} else
 {
     $API_Endpoint = "https://api-3t.paypal.com/nvp";
     $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
@@ -61,13 +64,21 @@ 
 
 // Clean parameters
 $PAYPAL_API_USER="";
-if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->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;
+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;
+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;
+if (! empty($conf->global->PAYPAL_API_SANDBOX)) {
+    $PAYPAL_API_SANDBOX=$conf->global->PAYPAL_API_SANDBOX;
+}
 
 // Proxy
 $PROXY_HOST = $conf->global->MAIN_PROXY_HOST;

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

Indentation +82 added lines, -82 removed lines

@@ -30,25 +30,25 @@ 
  */
 function paypaladmin_prepare_head()
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT."/paypal/admin/paypal.php";
-	$head[$h][1] = $langs->trans("PayPal");
-	$head[$h][2] = 'paypalaccount';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT."/paypal/admin/paypal.php";
+    $head[$h][1] = $langs->trans("PayPal");
+    $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;
 }
@@ -64,9 +64,9 @@ 
  */
 function showPaypalPaymentUrl($type,$ref)
 {
-	global $conf, $langs;
+    global $conf, $langs;
 
-	$langs->load("paypal");
+    $langs->load("paypal");
     $langs->load("paybox");
     $servicename='PayPal';
     $out='<br><br>';
@@ -90,28 +90,28 @@ 
  */
 function getPaypalPaymentUrl($mode,$type,$ref='',$amount='9.99',$freetag='your_free_tag')
 {
-	global $conf;
+    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))
-	    {
-	    	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);
-	    }
+        $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 ($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>':'');
+        $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">':'');
@@ -126,10 +126,10 @@ 
         $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>':'');
+        $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">':'');
@@ -144,10 +144,10 @@ 
         $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>':'');
+        $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">':'');
@@ -162,10 +162,10 @@ 
         $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>':'');
+        $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">':'');
@@ -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;
@@ -346,28 +346,28 @@ 
     $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 . "&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';
+    if (! empty($paypalprefix) && $paymentType == 'Sole') $paymentType='Sale';
 
-	$nvpstr = $nvpstr . "&AMT=". urlencode($paymentAmount);									// Total for all elements
+    $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
@@ -393,26 +393,26 @@ 
 
     if (! empty($conf->global->PAYPAL_LOGOIMG) && $mysoc->logo)
     {
-    	global $dolibarr_main_url_root;
+        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
-	    //$urlwithroot=DOL_MAIN_URL_ROOT;					// This is to use same domain name than current
+        // 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
+        //$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))
     {
-    	$nvpstr = $nvpstr . "&BRANDNAME=" . urlencode($conf->global->PAYPAL_BRANDNAME);    // BRANDNAME
+        $nvpstr = $nvpstr . "&BRANDNAME=" . urlencode($conf->global->PAYPAL_BRANDNAME);    // BRANDNAME
     }
     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["FinalPaymentAmt"] = $paymentAmount;
     $_SESSION["currencyCodeType"] = $currencyCodeType;
     $_SESSION["PaymentType"] = $paymentType;			// 'Mark', 'Sole'
     $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];   // Payer ip
@@ -592,27 +592,27 @@ 
 
     // 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_Endpoint = "https://api-3t.sandbox.paypal.com/nvp";
-	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
-	}
-	else
-	{
-	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
-	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
-	}
-
-	// 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;
-	// TODO END problem with triggers
+    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=";
+    }
+    else
+    {
+        $API_Endpoint = "https://api-3t.paypal.com/nvp";
+        $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
+    }
+
+    // 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;
+    // TODO END problem with triggers
 
     dol_syslog("Paypal API endpoint ".$API_Endpoint);
 
@@ -723,20 +723,20 @@ 
  */
 function getApiError()
 {
-	$errors=array();
+    $errors=array();
 
-	$resArray=$_SESSION['reshash'];
+    $resArray=$_SESSION['reshash'];
 
-	if(isset($_SESSION['curl_error_no']))
-	{
-		$errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
-	}
+    if(isset($_SESSION['curl_error_no']))
+    {
+        $errors[] = $_SESSION['curl_error_no'].'-'.$_SESSION['curl_error_msg'];
+    }
 
-	foreach($resArray as $key => $value)
-	{
-		$errors[] = $key.'-'.$value;
-	}
+    foreach($resArray as $key => $value)
+    {
+        $errors[] = $key.'-'.$value;
+    }
 
-	return $errors;
+    return $errors;
 }
 

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;
 	}

Braces +102 added lines, -46 removed lines

@@ -99,24 +99,36 @@ 
 	    $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);
+        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;
-            else
+    	    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);
+                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>':'');
             }
         }
@@ -124,17 +136,26 @@ 
     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);
+        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;
-            else
+    	    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);
+                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>':'');
             }
         }
@@ -142,17 +163,26 @@ 
     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);
+        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;
-            else
+    	    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);
+                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>':'');
             }
         }
@@ -160,17 +190,26 @@ 
     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);
+        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;
-            else
+    	    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);
+                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>':'');
             }
         }
@@ -209,7 +248,9 @@ 
     //'
     //'-------------------------------------------------
 
-    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';
@@ -263,8 +304,7 @@ 
         $payPalURL = $API_Url . $token;
         header("Location: ".$payPalURL);
         exit;
-    }
-    else
+    } else
     {
         //Display a user friendly Error on the page using any of the following error information returned by PayPal
         $ErrorCode = urldecode($resArray["L_ERRORCODE0"]);
@@ -275,8 +315,7 @@ 
         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";
-        }
-        else
+        } else
         {
         	$mesg = $langs->trans('SetExpressCheckoutAPICallFailed') . "<br>\n";
         	$mesg.= $langs->trans('DetailedErrorMessage') . ": " . $ErrorLongMsg."<br>\n";
@@ -351,8 +390,7 @@ 
     if (empty($conf->global->PAYPAL_REQUIRE_VALID_SHIPPING_ADDRESS))
     {
     	$nvpstr = $nvpstr . "&NOSHIPPING=1";	// An empty or not complete shipping address will be accepted
-    }
-    else
+    } else
     {
     	$nvpstr = $nvpstr . "&NOSHIPPING=0";	// A valid shipping address is required (full required fields mandatory)
     }
@@ -365,7 +403,9 @@ 
 
     $paypalprefix = 'PAYMENTREQUEST_0_';
     //$paypalprefix = '';
-	if (! empty($paypalprefix) && $paymentType == 'Sole') $paymentType='Sale';
+	if (! empty($paypalprefix) && $paymentType == 'Sole') {
+	    $paymentType='Sale';
+	}
 
 	$nvpstr = $nvpstr . "&AMT=". urlencode($paymentAmount);									// Total for all elements
 
@@ -388,8 +428,14 @@ 
     $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($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)
     {
@@ -592,12 +638,13 @@ 
 
     // 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'
+	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=";
 	}
-	else
+	    $API_Url = "https://www.sandbox.paypal.com/webscr?cmd=_express-checkout&token=";
+	} else
 	{
 	    $API_Endpoint = "https://api-3t.paypal.com/nvp";
 	    $API_Url = "https://www.paypal.com/cgi-bin/webscr?cmd=_express-checkout&token=";
@@ -605,13 +652,21 @@ 
 
 	// Clean parameters
 	$PAYPAL_API_USER="";
-	if (! empty($conf->global->PAYPAL_API_USER)) $PAYPAL_API_USER=$conf->global->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;
+	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;
+	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;
+	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);
@@ -644,7 +699,9 @@ 
         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);
+        if ($PROXY_USER) {
+            curl_setopt($ch, CURLOPT_PROXYUSERPWD, $PROXY_USER. ":" . $PROXY_PASS);
+        }
     }
 
     //NVPRequest for submitting to server
@@ -676,8 +733,7 @@ 
         $_SESSION['curl_error_msg']=curl_error($ch);
 
         //Execute the Error handling module to display errors.
-    }
-    else
+    } else
     {
         //closing the curl
         curl_close($ch);

dolibarr/htdocs/paypal/admin/paypal.php

Indentation +35 added lines, -35 removed lines

@@ -41,7 +41,7 @@ 
 
 if ($action == 'setvalue' && $user->admin)
 {
-	$db->begin();
+    $db->begin();
 
     $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
@@ -66,24 +66,24 @@ 
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK",GETPOST('ONLINE_PAYMENT_MESSAGE_OK'),'chaine',0,'',$conf->entity);
     if (! $result > 0) $error++;
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO",GETPOST('ONLINE_PAYMENT_MESSAGE_KO'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL",GETPOST('ONLINE_PAYMENT_SENDEMAIL'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
-	// Payment token for URL
-	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN",GETPOST('PAYMENT_SECURITY_TOKEN','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE",GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
-
-	if (! $error)
-  	{
-  		$db->commit();
-  		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else
-  	{
-  		$db->rollback();
-		dol_print_error($db);
+    if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL",GETPOST('ONLINE_PAYMENT_SENDEMAIL'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+    // Payment token for URL
+    $result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN",GETPOST('PAYMENT_SECURITY_TOKEN','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+    $result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE",GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE','alpha'),'chaine',0,'',$conf->entity);
+    if (! $result > 0) $error++;
+
+    if (! $error)
+        {
+            $db->commit();
+            setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
+        }
+        else
+        {
+            $db->rollback();
+        dol_print_error($db);
     }
 }
 
@@ -129,8 +129,8 @@ 
 // Test if php curl exist
 if (! function_exists('curl_version'))
 {
-	$langs->load("errors");
-	setEventMessages($langs->trans("ErrorPhpCurlNotInstalled"), null, 'errors');
+    $langs->load("errors");
+    setEventMessages($langs->trans("ErrorPhpCurlNotInstalled"), null, 'errors');
 }
 
 
@@ -212,10 +212,10 @@ 
 
 if (! empty($conf->banque->enabled))
 {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("BankAccount").'</td><td>';
-	print $form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("BankAccount").'</td><td>';
+    print $form->select_comptes($conf->global->PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS, 'PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 0, '', 1);
+    print '</td></tr>';
 }
 
 print '<tr class="oddeven"><td>';
@@ -268,13 +268,13 @@ 
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
 if (! empty($conf->use_javascript_ajax))
-	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
-	print '</td></tr>';
+    print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+    print '</td></tr>';
 
-	print '<tr class="oddeven"><td>';
-	print $langs->trans("SecurityTokenIsUnique").'</td><td>';
-	print $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYMENT_SECURITY_TOKEN)?0:$conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE),1);
-	print '</td></tr>';
+    print '<tr class="oddeven"><td>';
+    print $langs->trans("SecurityTokenIsUnique").'</td><td>';
+    print $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYMENT_SECURITY_TOKEN)?0:$conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE),1);
+    print '</td></tr>';
 
 print '</table>';
 
@@ -289,7 +289,7 @@ 
 // Help doc
 print '<u>'.$langs->trans("InformationToFindParameters","Paypal").'</u>:<br>';
 if (! empty($conf->use_javascript_ajax))
-	print '<a href="#" class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
+    print '<a href="#" class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
 
 $realpaypalurl='www.paypal.com';
 $sandboxpaypalurl='developer.paypal.com';
@@ -309,15 +309,15 @@ 
 
 if (! empty($conf->use_javascript_ajax))
 {
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
+    print "\n".'<script type="text/javascript">';
+    print '$(document).ready(function () {
             $("#apidoc").hide();
             $("#apidoca").click(function() {
                 $("#apidoc").show();
             	$("#apidoca").hide();
             })
 			});';
-	print '</script>';
+    print '</script>';
 }
 
 print '<br><br>';

Braces +58 added lines, -25 removed lines

@@ -35,7 +35,9 @@ 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox'));
 
-if (! $user->admin) accessforbidden();
+if (! $user->admin) {
+    accessforbidden();
+}
 
 $action = GETPOST('action','alpha');
 
@@ -44,43 +46,72 @@ 
 	$db->begin();
 
     $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_API_PASSWORD",GETPOST('PAYPAL_API_PASSWORD','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_API_SIGNATURE",GETPOST('PAYPAL_API_SIGNATURE','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_SSLVERSION",GETPOST('PAYPAL_SSLVERSION','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR",GETPOST('ONLINE_PAYMENT_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS",GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS','int'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY",GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL",GETPOST('ONLINE_PAYMENT_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL",GETPOST('PAYPAL_ADD_PAYMENT_URL','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK",GETPOST('ONLINE_PAYMENT_MESSAGE_OK'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
+    if (! $result > 0) {
+        $error++;
+    }
     $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO",GETPOST('ONLINE_PAYMENT_MESSAGE_KO'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL",GETPOST('ONLINE_PAYMENT_SENDEMAIL'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 	// Payment token for URL
 	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN",GETPOST('PAYMENT_SECURITY_TOKEN','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE",GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	if (! $result > 0) {
+	    $error++;
+	}
 
 	if (! $error)
   	{
   		$db->commit();
   		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-  	}
-  	else
+  	} else
   	{
   		$db->rollback();
 		dol_print_error($db);
@@ -91,12 +122,13 @@ 
 {
     $liveenable = GETPOST('value','int')?0:1;
     $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable,'yesno',0,'',$conf->entity);
-    if (! $res > 0) $error++;
+    if (! $res > 0) {
+        $error++;
+    }
     if (! $error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+    } else
     {
         setEventMessages($langs->trans("Error"), null, 'errors');
     }
@@ -151,8 +183,7 @@ 
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
     print img_picto($langs->trans("Activated"),'switch_on');
-}
-else
+} else
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
     print img_picto($langs->trans("Disabled"),'switch_off');
@@ -267,8 +298,9 @@ 
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
-if (! empty($conf->use_javascript_ajax))
+if (! empty($conf->use_javascript_ajax)) {
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+}
 	print '</td></tr>';
 
 	print '<tr class="oddeven"><td>';
@@ -288,8 +320,9 @@ 
 
 // Help doc
 print '<u>'.$langs->trans("InformationToFindParameters","Paypal").'</u>:<br>';
-if (! empty($conf->use_javascript_ajax))
+if (! empty($conf->use_javascript_ajax)) {
 	print '<a href="#" class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
+}
 
 $realpaypalurl='www.paypal.com';
 $sandboxpaypalurl='developer.paypal.com';

Spacing +63 added lines, -63 removed lines

@@ -27,58 +27,58 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
+require DOL_BASE_PATH.'/main.inc.php';
 require_once DOL_DOCUMENT_ROOT.'/paypal/lib/paypal.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
 
-$servicename='PayPal';
+$servicename = 'PayPal';
 
 // Load translation files required by the page
 $langs->loadLangs(array('admin', 'other', 'paypal', 'paybox'));
 
-if (! $user->admin) accessforbidden();
+if (!$user->admin) accessforbidden();
 
-$action = GETPOST('action','alpha');
+$action = GETPOST('action', 'alpha');
 
 if ($action == 'setvalue' && $user->admin)
 {
 	$db->begin();
 
-    $result=dolibarr_set_const($db, "PAYPAL_API_USER",GETPOST('PAYPAL_API_USER','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "PAYPAL_API_PASSWORD",GETPOST('PAYPAL_API_PASSWORD','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "PAYPAL_API_SIGNATURE",GETPOST('PAYPAL_API_SIGNATURE','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "PAYPAL_SSLVERSION",GETPOST('PAYPAL_SSLVERSION','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR",GETPOST('ONLINE_PAYMENT_CREDITOR','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS",GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS','int'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY",GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL",GETPOST('ONLINE_PAYMENT_CSS_URL','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL",GETPOST('PAYPAL_ADD_PAYMENT_URL','alpha'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM",GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK",GETPOST('ONLINE_PAYMENT_MESSAGE_OK'),'chaine',0,'',$conf->entity);
-    if (! $result > 0) $error++;
-    $result=dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO",GETPOST('ONLINE_PAYMENT_MESSAGE_KO'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL",GETPOST('ONLINE_PAYMENT_SENDEMAIL'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+    $result = dolibarr_set_const($db, "PAYPAL_API_USER", GETPOST('PAYPAL_API_USER', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "PAYPAL_API_PASSWORD", GETPOST('PAYPAL_API_PASSWORD', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "PAYPAL_API_SIGNATURE", GETPOST('PAYPAL_API_SIGNATURE', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "PAYPAL_SSLVERSION", GETPOST('PAYPAL_SSLVERSION', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_CREDITOR", GETPOST('ONLINE_PAYMENT_CREDITOR', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS", GETPOST('PAYPAL_BANK_ACCOUNT_FOR_PAYMENTS', 'int'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "PAYPAL_API_INTEGRAL_OR_PAYPALONLY", GETPOST('PAYPAL_API_INTEGRAL_OR_PAYPALONLY', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_CSS_URL", GETPOST('ONLINE_PAYMENT_CSS_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "PAYPAL_ADD_PAYMENT_URL", GETPOST('PAYPAL_ADD_PAYMENT_URL', 'alpha'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_FORM", GETPOST('ONLINE_PAYMENT_MESSAGE_FORM'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_OK", GETPOST('ONLINE_PAYMENT_MESSAGE_OK'), 'chaine', 0, '', $conf->entity);
+    if (!$result > 0) $error++;
+    $result = dolibarr_set_const($db, "ONLINE_PAYMENT_MESSAGE_KO", GETPOST('ONLINE_PAYMENT_MESSAGE_KO'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "ONLINE_PAYMENT_SENDEMAIL", GETPOST('ONLINE_PAYMENT_SENDEMAIL'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
 	// Payment token for URL
-	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN",GETPOST('PAYMENT_SECURITY_TOKEN','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
-	$result=dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE",GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE','alpha'),'chaine',0,'',$conf->entity);
-	if (! $result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN", GETPOST('PAYMENT_SECURITY_TOKEN', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
+	$result = dolibarr_set_const($db, "PAYMENT_SECURITY_TOKEN_UNIQUE", GETPOST('PAYMENT_SECURITY_TOKEN_UNIQUE', 'alpha'), 'chaine', 0, '', $conf->entity);
+	if (!$result > 0) $error++;
 
-	if (! $error)
+	if (!$error)
   	{
   		$db->commit();
   		setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
@@ -90,12 +90,12 @@ 
     }
 }
 
-if ($action=="setlive")
+if ($action == "setlive")
 {
-    $liveenable = GETPOST('value','int')?0:1;
-    $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable,'yesno',0,'',$conf->entity);
-    if (! $res > 0) $error++;
-    if (! $error)
+    $liveenable = GETPOST('value', 'int') ? 0 : 1;
+    $res = dolibarr_set_const($db, "PAYPAL_API_SANDBOX", $liveenable, 'yesno', 0, '', $conf->entity);
+    if (!$res > 0) $error++;
+    if (!$error)
     {
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
     }
@@ -110,15 +110,15 @@ 
  *	View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
-llxHeader('',$langs->trans("PaypalSetup"));
+llxHeader('', $langs->trans("PaypalSetup"));
 
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
-print load_fiche_titre($langs->trans("ModuleSetup").' PayPal',$linkback);
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+print load_fiche_titre($langs->trans("ModuleSetup").' PayPal', $linkback);
 
-$head=paypaladmin_prepare_head();
+$head = paypaladmin_prepare_head();
 
 print '<form method="post" action="'.$_SERVER["PHP_SELF"].'">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
@@ -130,7 +130,7 @@ 
 print $langs->trans("PaypalDesc")."<br>\n";
 
 // Test if php curl exist
-if (! function_exists('curl_version'))
+if (!function_exists('curl_version'))
 {
 	$langs->load("errors");
 	setEventMessages($langs->trans("ErrorPhpCurlNotInstalled"), null, 'errors');
@@ -153,12 +153,12 @@ 
 if (empty($conf->global->PAYPAL_API_SANDBOX))
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=0">';
-    print img_picto($langs->trans("Activated"),'switch_on');
+    print img_picto($langs->trans("Activated"), 'switch_on');
 }
 else
 {
     print '<a href="'.$_SERVER['PHP_SELF'].'?action=setlive&value=1">';
-    print img_picto($langs->trans("Disabled"),'switch_off');
+    print img_picto($langs->trans("Disabled"), 'switch_off');
 }
 print '</td></tr>';
 
@@ -184,7 +184,7 @@ 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_SSLVERSION").'</td><td>';
-print $form->selectarray("PAYPAL_SSLVERSION",array('1'=> $langs->trans('TLSv1'),'6'=> $langs->trans('TLSv1.2')),$conf->global->PAYPAL_SSLVERSION);
+print $form->selectarray("PAYPAL_SSLVERSION", array('1'=> $langs->trans('TLSv1'), '6'=> $langs->trans('TLSv1.2')), $conf->global->PAYPAL_SSLVERSION);
 print '</td></tr>';
 
 // Usage Parameters
@@ -196,7 +196,7 @@ 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_API_INTEGRAL_OR_PAYPALONLY").'</td><td>';
-print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY",array('integral'=> $langs->trans('PaypalModeIntegral'),'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')),$conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
+print $form->selectarray("PAYPAL_API_INTEGRAL_OR_PAYPALONLY", array('integral'=> $langs->trans('PaypalModeIntegral'), 'paypalonly'=> $langs->trans('PaypalModeOnlyPaypal')), $conf->global->PAYPAL_API_INTEGRAL_OR_PAYPALONLY);
 print '</td></tr>';
 
 /*
@@ -213,7 +213,7 @@ 
 print ' &nbsp; '.$langs->trans("Example").': '.$mysoc->name;
 print '</td></tr>';
 
-if (! empty($conf->banque->enabled))
+if (!empty($conf->banque->enabled))
 {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("BankAccount").'</td><td>';
@@ -230,27 +230,27 @@ 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("PAYPAL_ADD_PAYMENT_URL").'</td><td>';
-print $form->selectyesno("PAYPAL_ADD_PAYMENT_URL",$conf->global->PAYPAL_ADD_PAYMENT_URL,1);
+print $form->selectyesno("PAYPAL_ADD_PAYMENT_URL", $conf->global->PAYPAL_ADD_PAYMENT_URL, 1);
 print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MessageForm").'</td><td>';
-$doleditor=new DolEditor('ONLINE_PAYMENT_MESSAGE_FORM',$conf->global->ONLINE_PAYMENT_MESSAGE_FORM,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_FORM', $conf->global->ONLINE_PAYMENT_MESSAGE_FORM, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
 $doleditor->Create();
 print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MessageOK").'</td><td>';
-$doleditor=new DolEditor('ONLINE_PAYMENT_MESSAGE_OK',$conf->global->ONLINE_PAYMENT_MESSAGE_OK,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_OK', $conf->global->ONLINE_PAYMENT_MESSAGE_OK, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
 $doleditor->Create();
 print '</td></tr>';
 
 
 print '<tr class="oddeven"><td>';
 print $langs->trans("MessageKO").'</td><td>';
-$doleditor=new DolEditor('ONLINE_PAYMENT_MESSAGE_KO',$conf->global->ONLINE_PAYMENT_MESSAGE_KO,'',100,'dolibarr_details','In',false,true,true,ROWS_4,'90%');
+$doleditor = new DolEditor('ONLINE_PAYMENT_MESSAGE_KO', $conf->global->ONLINE_PAYMENT_MESSAGE_KO, '', 100, 'dolibarr_details', 'In', false, true, true, ROWS_4, '90%');
 $doleditor->Create();
 print '</td></tr>';
 
@@ -270,13 +270,13 @@ 
 print '<tr class="oddeven"><td>';
 print $langs->trans("SecurityToken").'</td><td>';
 print '<input size="48" type="text" id="PAYMENT_SECURITY_TOKEN" name="PAYMENT_SECURITY_TOKEN" value="'.$conf->global->PAYMENT_SECURITY_TOKEN.'">';
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
 	print '</td></tr>';
 
 	print '<tr class="oddeven"><td>';
 	print $langs->trans("SecurityTokenIsUnique").'</td><td>';
-	print $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE",(empty($conf->global->PAYMENT_SECURITY_TOKEN)?0:$conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE),1);
+	print $form->selectyesno("PAYMENT_SECURITY_TOKEN_UNIQUE", (empty($conf->global->PAYMENT_SECURITY_TOKEN) ? 0 : $conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE), 1);
 	print '</td></tr>';
 
 print '</table>';
@@ -290,12 +290,12 @@ 
 print '<br><br>';
 
 // Help doc
-print '<u>'.$langs->trans("InformationToFindParameters","Paypal").'</u>:<br>';
-if (! empty($conf->use_javascript_ajax))
+print '<u>'.$langs->trans("InformationToFindParameters", "Paypal").'</u>:<br>';
+if (!empty($conf->use_javascript_ajax))
 	print '<a href="#" class="reposition" id="apidoca">'.$langs->trans("ClickHere").'...</a>';
 
-$realpaypalurl='www.paypal.com';
-$sandboxpaypalurl='developer.paypal.com';
+$realpaypalurl = 'www.paypal.com';
+$sandboxpaypalurl = 'developer.paypal.com';
 
 print '<div id="apidoc">';
 print 'Your API authentication information can be found with following steps. We recommend that you open a separate Web browser session when carrying out this procedure.<br>
@@ -310,7 +310,7 @@ 
 ';
 print '</div>';
 
-if (! empty($conf->use_javascript_ajax))
+if (!empty($conf->use_javascript_ajax))
 {
 	print "\n".'<script type="text/javascript">';
 	print '$(document).ready(function () {
@@ -325,7 +325,7 @@ 
 
 print '<br><br>';
 
-$token='';
+$token = '';
 
 include DOL_DOCUMENT_ROOT.'/core/tpl/onlinepaymentlinks.tpl.php';
 

dolibarr/htdocs/ftp/admin/ftpclient.php

Indentation +152 added lines, -152 removed lines

@@ -49,7 +49,7 @@ 
 {
     $obj = $db->fetch_object($result);
     preg_match('/([0-9]+)$/i',$obj->name,$reg);
-	if ($reg[1]) $lastftpentry = $reg[1];
+    if ($reg[1]) $lastftpentry = $reg[1];
 }
 else
 {
@@ -59,37 +59,37 @@ 
 if ($action == 'add' || GETPOST('modify','alpha'))
 {
     $ftp_name = "FTP_NAME_" . $entry;// $_POST["numero_entry"];
-	$ftp_server = "FTP_SERVER_" . $entry; //$_POST["numero_entry"];
+    $ftp_server = "FTP_SERVER_" . $entry; //$_POST["numero_entry"];
 
-	$error=0;
+    $error=0;
 
-	if (! GETPOST("$ftp_name",'alpha'))
-	{
-		$error=1;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-	}
+    if (! GETPOST("$ftp_name",'alpha'))
+    {
+        $error=1;
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+    }
 
-	if (! GETPOST("$ftp_server",'alpha'))
-	{
-		$error=1;
-		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Server")), null, 'errors');
-	}
+    if (! GETPOST("$ftp_server",'alpha'))
+    {
+        $error=1;
+        setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Server")), null, 'errors');
+    }
 
     if (! $error)
     {
-    	$ftp_port = "FTP_PORT_" . $entry;
+        $ftp_port = "FTP_PORT_" . $entry;
         $ftp_user = "FTP_USER_" . $entry;
         $ftp_password = "FTP_PASSWORD_" . $entry;
         $ftp_passive = "FTP_PASSIVE_" . $entry;
 
         $db->begin();
 
-		$result1=dolibarr_set_const($db, "FTP_PORT_" . $entry,GETPOST($ftp_port,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result1) $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result2) $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result3) $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result4) $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
+        $result1=dolibarr_set_const($db, "FTP_PORT_" . $entry,GETPOST($ftp_port,'alpha'),'chaine',0,'',$conf->entity);
+        if ($result1) $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server,'alpha'),'chaine',0,'',$conf->entity);
+        if ($result2) $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
+        if ($result3) $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
+        if ($result4) $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
+        if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
 
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
@@ -111,12 +111,12 @@ 
     {
         $db->begin();
 
-		$result1=dolibarr_del_const($db,"FTP_PORT_" . $entry,$conf->entity);
-		if ($result1) $result2=dolibarr_del_const($db,"FTP_SERVER_" . $entry,$conf->entity);
-		if ($result2) $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
-		if ($result3) $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
-		if ($result4) $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
-		if ($result4) $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
+        $result1=dolibarr_del_const($db,"FTP_PORT_" . $entry,$conf->entity);
+        if ($result1) $result2=dolibarr_del_const($db,"FTP_SERVER_" . $entry,$conf->entity);
+        if ($result2) $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
+        if ($result3) $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
+        if ($result4) $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
+        if ($result4) $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
 		
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
@@ -147,165 +147,165 @@ 
 
 if (! function_exists('ftp_connect'))
 {
-	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
+    print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
 else
 {
 
-	// Formulaire ajout
-	print '<form name="ftpconfig" action="ftpclient.php" method="post">';
-	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-	print '<table class="noborder" width="100%">';
-	print '<tr class="liste_titre">';
-	print '<td colspan="2">'.$langs->trans("NewFTPClient").'</td>';
-	print '<td>'.$langs->trans("Example").'</td>';
-	print '</tr>';
-
-	print '<tr class="pair">';
-	print '<td>'.$langs->trans("Label").'</td>';
-	print '<td><input type="text" name="FTP_NAME_'.($lastftpentry+1).'" value="'.GETPOST("FTP_NAME_" . ($lastftpentry+1)).'" size="64"></td>';
-	print '<td>My FTP access</td>';
-	print '</tr>';
-
-	print '<tr class="impair">';
-	print '<td>'.$langs->trans("Server").'</td>';
-	print '<td><input type="text" name="FTP_SERVER_'.($lastftpentry+1).'" value="'.GETPOST("FTP_SERVER_" . ($lastftpentry+1)).'" size="64"></td>';
-	print '<td>localhost</td>';
-	print '</tr>';
-
-	print '<tr class="pair">';
-	print '<td width="100">'.$langs->trans("Port").'</td>';
-	print '<td><input type="text" name="FTP_PORT_'.($lastftpentry+1).'" value="'.GETPOST("FTP_PORT_" . ($lastftpentry+1)).'" size="64"></td>';
-	print '<td>21 for pure non crypted FTP or if option FTP_CONNECT_WITH_SSL (See Home-Setup-Other) is on (FTPS)<br>22 if option FTP_CONNECT_WITH_SFTP (See Home-Setup-Other) is on (SFTP)</td>';
-	print '</tr>';
-
-	print '<tr class="impair">';
-	print '<td>'.$langs->trans("User").'</td>';
-	print '<td><input type="text" name="FTP_USER_'.($lastftpentry+1).'" value="'.GETPOST("FTP_USER_" . ($lastftpentry+1)).'" size="24"></td>';
-	print '<td>myftplogin</td>';
-	print '</tr>';
-
-	print '<tr class="pair">';
-	print '<td>'.$langs->trans("Password").'</td>';
-	print '<td><input type="password" name="FTP_PASSWORD_'.($lastftpentry+1).'" value="'.GETPOST("FTP_PASSWORD_" . ($lastftpentry+1)).'" size="24"></td>';
-	print '<td>myftppassword</td>';
-	print '</tr>';
-
-	print '<tr class="impair">';
-	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
-	$defaultpassive=GETPOST("FTP_PASSIVE_" . ($lastftpentry+1));
-	if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
-	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).'</td>';
-	print '<td>'.$langs->trans("No").'</td>';
-	print '</tr>';
+    // Formulaire ajout
+    print '<form name="ftpconfig" action="ftpclient.php" method="post">';
+    print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+    print '<table class="noborder" width="100%">';
+    print '<tr class="liste_titre">';
+    print '<td colspan="2">'.$langs->trans("NewFTPClient").'</td>';
+    print '<td>'.$langs->trans("Example").'</td>';
+    print '</tr>';
+
+    print '<tr class="pair">';
+    print '<td>'.$langs->trans("Label").'</td>';
+    print '<td><input type="text" name="FTP_NAME_'.($lastftpentry+1).'" value="'.GETPOST("FTP_NAME_" . ($lastftpentry+1)).'" size="64"></td>';
+    print '<td>My FTP access</td>';
+    print '</tr>';
+
+    print '<tr class="impair">';
+    print '<td>'.$langs->trans("Server").'</td>';
+    print '<td><input type="text" name="FTP_SERVER_'.($lastftpentry+1).'" value="'.GETPOST("FTP_SERVER_" . ($lastftpentry+1)).'" size="64"></td>';
+    print '<td>localhost</td>';
+    print '</tr>';
+
+    print '<tr class="pair">';
+    print '<td width="100">'.$langs->trans("Port").'</td>';
+    print '<td><input type="text" name="FTP_PORT_'.($lastftpentry+1).'" value="'.GETPOST("FTP_PORT_" . ($lastftpentry+1)).'" size="64"></td>';
+    print '<td>21 for pure non crypted FTP or if option FTP_CONNECT_WITH_SSL (See Home-Setup-Other) is on (FTPS)<br>22 if option FTP_CONNECT_WITH_SFTP (See Home-Setup-Other) is on (SFTP)</td>';
+    print '</tr>';
+
+    print '<tr class="impair">';
+    print '<td>'.$langs->trans("User").'</td>';
+    print '<td><input type="text" name="FTP_USER_'.($lastftpentry+1).'" value="'.GETPOST("FTP_USER_" . ($lastftpentry+1)).'" size="24"></td>';
+    print '<td>myftplogin</td>';
+    print '</tr>';
+
+    print '<tr class="pair">';
+    print '<td>'.$langs->trans("Password").'</td>';
+    print '<td><input type="password" name="FTP_PASSWORD_'.($lastftpentry+1).'" value="'.GETPOST("FTP_PASSWORD_" . ($lastftpentry+1)).'" size="24"></td>';
+    print '<td>myftppassword</td>';
+    print '</tr>';
+
+    print '<tr class="impair">';
+    print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
+    $defaultpassive=GETPOST("FTP_PASSIVE_" . ($lastftpentry+1));
+    if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
+    print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).'</td>';
+    print '<td>'.$langs->trans("No").'</td>';
+    print '</tr>';
 	
-	print '</table>';
+    print '</table>';
 	
-	?>
+    ?>
 	<br><div class="center"><input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>"></div>
 	<input type="hidden" name="action" value="add">
 	<input type="hidden" name="numero_entry" value="<?php echo ($lastftpentry+1) ?>">
 	<?php
-	print '</form>';
-	?>
+    print '</form>';
+    ?>
 
 	<br>
 
 	<?php
 
-	$sql ="select name, value, note from ".MAIN_DB_PREFIX."const";
-	$sql.=" WHERE name like 'FTP_SERVER_%'";
-	$sql.=" ORDER BY name";
+    $sql ="select name, value, note from ".MAIN_DB_PREFIX."const";
+    $sql.=" WHERE name like 'FTP_SERVER_%'";
+    $sql.=" ORDER BY name";
 
-	dol_syslog("ftpclient select ftp setup", LOG_DEBUG);
-	$resql=$db->query($sql);
-	if ($resql)
-	{
-		$num =$db->num_rows($resql);
-		$i=0;
+    dol_syslog("ftpclient select ftp setup", LOG_DEBUG);
+    $resql=$db->query($sql);
+    if ($resql)
+    {
+        $num =$db->num_rows($resql);
+        $i=0;
 
-		while ($i < $num)
-		{
-			$obj = $db->fetch_object($resql);
+        while ($i < $num)
+        {
+            $obj = $db->fetch_object($resql);
 
-		    preg_match('/([0-9]+)$/i',$obj->name,$reg);
-			$idrss = $reg[0];
-			//print "x".join(',',$reg)."=".$obj->name."=".$idrss;
+            preg_match('/([0-9]+)$/i',$obj->name,$reg);
+            $idrss = $reg[0];
+            //print "x".join(',',$reg)."=".$obj->name."=".$idrss;
 
-			print "<form name=\"externalrssconfig\" action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">";
-			print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-			print '<input type="hidden" name="numero_entry" value="'.$idrss.'">';
+            print "<form name=\"externalrssconfig\" action=\"".$_SERVER["PHP_SELF"]."\" method=\"post\">";
+            print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+            print '<input type="hidden" name="numero_entry" value="'.$idrss.'">';
 			
-			print '<table class="noborder" width="100%">'."\n";
-
-			print '<tr class="liste_titre">';
-			print '<td class="fieldtitle">'.$langs->trans("FTP")." ".($idrss)."</td>";
-			print '<td></td>';
-			print "</tr>";
-
-			$keyforname="FTP_NAME_" . $idrss;
-			$keyforserver="FTP_SERVER_" . $idrss;
-			$keyforport="FTP_PORT_" . $idrss;
-			$keyforuser="FTP_USER_" . $idrss;
-			$keyforpassword="FTP_PASSWORD_" . $idrss;
-			$keyforpassive="FTP_PASSIVE_" . $idrss;
+            print '<table class="noborder" width="100%">'."\n";
+
+            print '<tr class="liste_titre">';
+            print '<td class="fieldtitle">'.$langs->trans("FTP")." ".($idrss)."</td>";
+            print '<td></td>';
+            print "</tr>";
+
+            $keyforname="FTP_NAME_" . $idrss;
+            $keyforserver="FTP_SERVER_" . $idrss;
+            $keyforport="FTP_PORT_" . $idrss;
+            $keyforuser="FTP_USER_" . $idrss;
+            $keyforpassword="FTP_PASSWORD_" . $idrss;
+            $keyforpassive="FTP_PASSIVE_" . $idrss;
 				
-			print '<tr class="oddeven">';
-			print "<td>".$langs->trans("Name")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . $conf->global->$keyforname . "\" size=\"64\"></td>";
-			print "</tr>";
+            print '<tr class="oddeven">';
+            print "<td>".$langs->trans("Name")."</td>";
+            print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . $conf->global->$keyforname . "\" size=\"64\"></td>";
+            print "</tr>";
 
 			
-			print '<tr class="oddeven">';
-			print "<td>".$langs->trans("Server")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . $conf->global->$keyforserver . "\" size=\"64\"></td>";
-			print "</tr>";
+            print '<tr class="oddeven">';
+            print "<td>".$langs->trans("Server")."</td>";
+            print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . $conf->global->$keyforserver . "\" size=\"64\"></td>";
+            print "</tr>";
 
 			
-			print '<tr class="oddeven">';
-			print "<td width=\"100\">".$langs->trans("Port")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . $conf->global->$keyforport . "\" size=\"64\"></td>";
-			print "</tr>";
+            print '<tr class="oddeven">';
+            print "<td width=\"100\">".$langs->trans("Port")."</td>";
+            print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . $conf->global->$keyforport . "\" size=\"64\"></td>";
+            print "</tr>";
 
 			
-			print '<tr class="oddeven">';
-			print "<td width=\"100\">".$langs->trans("User")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . $conf->global->$keyforuser . "\" size=\"24\"></td>";
-			print "</tr>";
+            print '<tr class="oddeven">';
+            print "<td width=\"100\">".$langs->trans("User")."</td>";
+            print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . $conf->global->$keyforuser . "\" size=\"24\"></td>";
+            print "</tr>";
 
 			
-			print '<tr class="oddeven">';
-			print "<td width=\"100\">".$langs->trans("Password")."</td>";
-			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . $conf->global->$keyforpassword . "\" size=\"24\"></td>";
-			print "</tr>";
+            print '<tr class="oddeven">';
+            print "<td width=\"100\">".$langs->trans("Password")."</td>";
+            print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . $conf->global->$keyforpassword . "\" size=\"24\"></td>";
+            print "</tr>";
 
 			
-			print '<tr class="oddeven">';
-			print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
-			print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, $conf->global->$keyforpassive, 1).'</td>';
-			print "</tr>";
-
-			print "<tr>";
-			print "<td colspan=\"2\" align=\"center\">";
-			print "<input type=\"submit\" class=\"button\" name=\"modify\" value=\"".$langs->trans("Modify")."\">";
-			print " &nbsp; ";
-			print "<input type=\"submit\" class=\"button\" name=\"delete\" value=\"".$langs->trans("Delete")."\">";
-			print "</td>";
-			print "</tr>";
-
-			print '</table>';
+            print '<tr class="oddeven">';
+            print "<td width=\"100\">".$langs->trans("FTPPassiveMode")."</td>";
+            print '<td>'.$form->selectyesno('FTP_PASSIVE_'.$idrss, $conf->global->$keyforpassive, 1).'</td>';
+            print "</tr>";
+
+            print "<tr>";
+            print "<td colspan=\"2\" align=\"center\">";
+            print "<input type=\"submit\" class=\"button\" name=\"modify\" value=\"".$langs->trans("Modify")."\">";
+            print " &nbsp; ";
+            print "<input type=\"submit\" class=\"button\" name=\"delete\" value=\"".$langs->trans("Delete")."\">";
+            print "</td>";
+            print "</tr>";
+
+            print '</table>';
 			
-			print "</form>";
-			print '<br>';
+            print "</form>";
+            print '<br>';
 			
-			$i++;
-		}
-	}
-	else
-	{
-		dol_print_error($db);
-	}
+            $i++;
+        }
+    }
+    else
+    {
+        dol_print_error($db);
+    }
 }
 
 // End of page

Braces +44 added lines, -23 removed lines

@@ -28,7 +28,9 @@ 
 $langs->loadLangs(array("admin", "ftp"));
 
 // Security check
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 $def = array();
 $lastftpentry=0;
@@ -49,9 +51,10 @@ 
 {
     $obj = $db->fetch_object($result);
     preg_match('/([0-9]+)$/i',$obj->name,$reg);
-	if ($reg[1]) $lastftpentry = $reg[1];
-}
-else
+	if ($reg[1]) {
+	    $lastftpentry = $reg[1];
+	}
+	} else
 {
     dol_print_error($db);
 }
@@ -85,19 +88,28 @@ 
         $db->begin();
 
 		$result1=dolibarr_set_const($db, "FTP_PORT_" . $entry,GETPOST($ftp_port,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result1) $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result2) $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result3) $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result4) $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
+		if ($result1) {
+		    $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result2) {
+		    $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result3) {
+		    $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result4) {
+		    $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
+		}
+		if ($result5) {
+		    $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
+		}
 
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
+        } else
         {
             $db->rollback();
             dol_print_error($db);
@@ -112,19 +124,28 @@ 
         $db->begin();
 
 		$result1=dolibarr_del_const($db,"FTP_PORT_" . $entry,$conf->entity);
-		if ($result1) $result2=dolibarr_del_const($db,"FTP_SERVER_" . $entry,$conf->entity);
-		if ($result2) $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
-		if ($result3) $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
-		if ($result4) $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
-		if ($result4) $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
+		if ($result1) {
+		    $result2=dolibarr_del_const($db,"FTP_SERVER_" . $entry,$conf->entity);
+		}
+		if ($result2) {
+		    $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
+		}
+		if ($result3) {
+		    $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
+		}
+		if ($result4) {
+		    $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
+		}
+		if ($result4) {
+		    $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
+		}
 		
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
             $db->commit();
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
-        }
-        else
+        } else
         {
             $db->rollback();
             dol_print_error($db);
@@ -148,8 +169,7 @@ 
 if (! function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
+} else
 {
 
 	// Formulaire ajout
@@ -195,7 +215,9 @@ 
 	print '<tr class="impair">';
 	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
 	$defaultpassive=GETPOST("FTP_PASSIVE_" . ($lastftpentry+1));
-	if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
+	if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) {
+	    $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
+	}
 	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).'</td>';
 	print '<td>'.$langs->trans("No").'</td>';
 	print '</tr>';
@@ -301,8 +323,7 @@ 
 			
 			$i++;
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}

Spacing +66 added lines, -66 removed lines

@@ -24,8 +24,8 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
 
 $langs->loadLangs(array("admin", "ftp"));
 
@@ -33,10 +33,10 @@ 
 if (!$user->admin) accessforbidden();
 
 $def = array();
-$lastftpentry=0;
+$lastftpentry = 0;
 
-$action = GETPOST('action','alpha');
-$entry = GETPOST('numero_entry','alpha');
+$action = GETPOST('action', 'alpha');
+$entry = GETPOST('numero_entry', 'alpha');
 
 
 /*
@@ -44,13 +44,13 @@ 
  */
 
 // Get value for $lastftpentry
-$sql ="select MAX(name) as name from ".MAIN_DB_PREFIX."const";
-$sql.=" WHERE name like 'FTP_SERVER_%'";
-$result=$db->query($sql);
+$sql = "select MAX(name) as name from ".MAIN_DB_PREFIX."const";
+$sql .= " WHERE name like 'FTP_SERVER_%'";
+$result = $db->query($sql);
 if ($result)
 {
     $obj = $db->fetch_object($result);
-    preg_match('/([0-9]+)$/i',$obj->name,$reg);
+    preg_match('/([0-9]+)$/i', $obj->name, $reg);
 	if ($reg[1]) $lastftpentry = $reg[1];
 }
 else
@@ -58,40 +58,40 @@ 
     dol_print_error($db);
 }
 
-if ($action == 'add' || GETPOST('modify','alpha'))
+if ($action == 'add' || GETPOST('modify', 'alpha'))
 {
-    $ftp_name = "FTP_NAME_" . $entry;// $_POST["numero_entry"];
-	$ftp_server = "FTP_SERVER_" . $entry; //$_POST["numero_entry"];
+    $ftp_name = "FTP_NAME_".$entry; // $_POST["numero_entry"];
+	$ftp_server = "FTP_SERVER_".$entry; //$_POST["numero_entry"];
 
-	$error=0;
+	$error = 0;
 
-	if (! GETPOST("$ftp_name",'alpha'))
+	if (!GETPOST("$ftp_name", 'alpha'))
 	{
-		$error=1;
+		$error = 1;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
 	}
 
-	if (! GETPOST("$ftp_server",'alpha'))
+	if (!GETPOST("$ftp_server", 'alpha'))
 	{
-		$error=1;
+		$error = 1;
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Server")), null, 'errors');
 	}
 
-    if (! $error)
+    if (!$error)
     {
-    	$ftp_port = "FTP_PORT_" . $entry;
-        $ftp_user = "FTP_USER_" . $entry;
-        $ftp_password = "FTP_PASSWORD_" . $entry;
-        $ftp_passive = "FTP_PASSIVE_" . $entry;
+    	$ftp_port = "FTP_PORT_".$entry;
+        $ftp_user = "FTP_USER_".$entry;
+        $ftp_password = "FTP_PASSWORD_".$entry;
+        $ftp_passive = "FTP_PASSIVE_".$entry;
 
         $db->begin();
 
-		$result1=dolibarr_set_const($db, "FTP_PORT_" . $entry,GETPOST($ftp_port,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result1) $result2=dolibarr_set_const($db, "FTP_SERVER_" . $entry, GETPOST($ftp_server,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result2) $result3=dolibarr_set_const($db, "FTP_USER_" . $entry,GETPOST($ftp_user,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result3) $result4=dolibarr_set_const($db, "FTP_PASSWORD_" . $entry,GETPOST($ftp_password,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result4) $result5=dolibarr_set_const($db, "FTP_NAME_" . $entry,GETPOST($ftp_name,'alpha'),'chaine',0,'',$conf->entity);
-		if ($result5) $result6=dolibarr_set_const($db, "FTP_PASSIVE_" . $entry,GETPOST($ftp_passive,'alpha'),'chaine',0,'',$conf->entity);
+		$result1 = dolibarr_set_const($db, "FTP_PORT_".$entry, GETPOST($ftp_port, 'alpha'), 'chaine', 0, '', $conf->entity);
+		if ($result1) $result2 = dolibarr_set_const($db, "FTP_SERVER_".$entry, GETPOST($ftp_server, 'alpha'), 'chaine', 0, '', $conf->entity);
+		if ($result2) $result3 = dolibarr_set_const($db, "FTP_USER_".$entry, GETPOST($ftp_user, 'alpha'), 'chaine', 0, '', $conf->entity);
+		if ($result3) $result4 = dolibarr_set_const($db, "FTP_PASSWORD_".$entry, GETPOST($ftp_password, 'alpha'), 'chaine', 0, '', $conf->entity);
+		if ($result4) $result5 = dolibarr_set_const($db, "FTP_NAME_".$entry, GETPOST($ftp_name, 'alpha'), 'chaine', 0, '', $conf->entity);
+		if ($result5) $result6 = dolibarr_set_const($db, "FTP_PASSIVE_".$entry, GETPOST($ftp_passive, 'alpha'), 'chaine', 0, '', $conf->entity);
 
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
@@ -107,18 +107,18 @@ 
     }
 }
 
-if (GETPOST('delete','alpha'))
+if (GETPOST('delete', 'alpha'))
 {
-    if($entry)
+    if ($entry)
     {
         $db->begin();
 
-		$result1=dolibarr_del_const($db,"FTP_PORT_" . $entry,$conf->entity);
-		if ($result1) $result2=dolibarr_del_const($db,"FTP_SERVER_" . $entry,$conf->entity);
-		if ($result2) $result3=dolibarr_del_const($db,"FTP_USER_" . $entry,$conf->entity);
-		if ($result3) $result4=dolibarr_del_const($db,"FTP_PASSWORD_" . $entry,$conf->entity);
-		if ($result4) $result5=dolibarr_del_const($db,"FTP_NAME_" . $entry,$conf->entity);
-		if ($result4) $result6=dolibarr_del_const($db,"FTP_PASSIVE_" . $entry,$conf->entity);
+		$result1 = dolibarr_del_const($db, "FTP_PORT_".$entry, $conf->entity);
+		if ($result1) $result2 = dolibarr_del_const($db, "FTP_SERVER_".$entry, $conf->entity);
+		if ($result2) $result3 = dolibarr_del_const($db, "FTP_USER_".$entry, $conf->entity);
+		if ($result3) $result4 = dolibarr_del_const($db, "FTP_PASSWORD_".$entry, $conf->entity);
+		if ($result4) $result5 = dolibarr_del_const($db, "FTP_NAME_".$entry, $conf->entity);
+		if ($result4) $result6 = dolibarr_del_const($db, "FTP_PASSIVE_".$entry, $conf->entity);
 		
         if ($result1 && $result2 && $result3 && $result4 && $result5 && $result6)
         {
@@ -139,15 +139,15 @@ 
  * View
  */
 
-$form=new Form($db);
+$form = new Form($db);
 
 llxHeader();
 
-$linkback='<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
+$linkback = '<a href="'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans("BackToModuleList").'</a>';
 print load_fiche_titre($langs->trans("FTPClientSetup"), $linkback, 'title_setup');
 print '<br>';
 
-if (! function_exists('ftp_connect'))
+if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
@@ -166,39 +166,39 @@ 
 
 	print '<tr class="pair">';
 	print '<td>'.$langs->trans("Label").'</td>';
-	print '<td><input type="text" name="FTP_NAME_'.($lastftpentry+1).'" value="'.GETPOST("FTP_NAME_" . ($lastftpentry+1)).'" size="64"></td>';
+	print '<td><input type="text" name="FTP_NAME_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_NAME_".($lastftpentry + 1)).'" size="64"></td>';
 	print '<td>My FTP access</td>';
 	print '</tr>';
 
 	print '<tr class="impair">';
 	print '<td>'.$langs->trans("Server").'</td>';
-	print '<td><input type="text" name="FTP_SERVER_'.($lastftpentry+1).'" value="'.GETPOST("FTP_SERVER_" . ($lastftpentry+1)).'" size="64"></td>';
+	print '<td><input type="text" name="FTP_SERVER_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_SERVER_".($lastftpentry + 1)).'" size="64"></td>';
 	print '<td>localhost</td>';
 	print '</tr>';
 
 	print '<tr class="pair">';
 	print '<td width="100">'.$langs->trans("Port").'</td>';
-	print '<td><input type="text" name="FTP_PORT_'.($lastftpentry+1).'" value="'.GETPOST("FTP_PORT_" . ($lastftpentry+1)).'" size="64"></td>';
+	print '<td><input type="text" name="FTP_PORT_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_PORT_".($lastftpentry + 1)).'" size="64"></td>';
 	print '<td>21 for pure non crypted FTP or if option FTP_CONNECT_WITH_SSL (See Home-Setup-Other) is on (FTPS)<br>22 if option FTP_CONNECT_WITH_SFTP (See Home-Setup-Other) is on (SFTP)</td>';
 	print '</tr>';
 
 	print '<tr class="impair">';
 	print '<td>'.$langs->trans("User").'</td>';
-	print '<td><input type="text" name="FTP_USER_'.($lastftpentry+1).'" value="'.GETPOST("FTP_USER_" . ($lastftpentry+1)).'" size="24"></td>';
+	print '<td><input type="text" name="FTP_USER_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_USER_".($lastftpentry + 1)).'" size="24"></td>';
 	print '<td>myftplogin</td>';
 	print '</tr>';
 
 	print '<tr class="pair">';
 	print '<td>'.$langs->trans("Password").'</td>';
-	print '<td><input type="password" name="FTP_PASSWORD_'.($lastftpentry+1).'" value="'.GETPOST("FTP_PASSWORD_" . ($lastftpentry+1)).'" size="24"></td>';
+	print '<td><input type="password" name="FTP_PASSWORD_'.($lastftpentry + 1).'" value="'.GETPOST("FTP_PASSWORD_".($lastftpentry + 1)).'" size="24"></td>';
 	print '<td>myftppassword</td>';
 	print '</tr>';
 
 	print '<tr class="impair">';
 	print '<td>'.$langs->trans("FTPPassiveMode").'</td>';
-	$defaultpassive=GETPOST("FTP_PASSIVE_" . ($lastftpentry+1));
-	if (! isset($_POST["FTP_PASSIVE_" . ($lastftpentry+1)])) $defaultpassive=empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT)?0:1;
-	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry+1), $defaultpassive, 2).'</td>';
+	$defaultpassive = GETPOST("FTP_PASSIVE_".($lastftpentry + 1));
+	if (!isset($_POST["FTP_PASSIVE_".($lastftpentry + 1)])) $defaultpassive = empty($conf->global->FTP_SUGGEST_PASSIVE_BYDEFAULT) ? 0 : 1;
+	print '<td>'.$form->selectyesno('FTP_PASSIVE_'.($lastftpentry + 1), $defaultpassive, 2).'</td>';
 	print '<td>'.$langs->trans("No").'</td>';
 	print '</tr>';
 	
@@ -207,7 +207,7 @@ 
 	?>
 	<br><div class="center"><input type="submit" class="button" value="<?php echo $langs->trans("Add") ?>"></div>
 	<input type="hidden" name="action" value="add">
-	<input type="hidden" name="numero_entry" value="<?php echo ($lastftpentry+1) ?>">
+	<input type="hidden" name="numero_entry" value="<?php echo ($lastftpentry + 1) ?>">
 	<?php
 	print '</form>';
 	?>
@@ -216,22 +216,22 @@ 
 
 	<?php
 
-	$sql ="select name, value, note from ".MAIN_DB_PREFIX."const";
-	$sql.=" WHERE name like 'FTP_SERVER_%'";
-	$sql.=" ORDER BY name";
+	$sql = "select name, value, note from ".MAIN_DB_PREFIX."const";
+	$sql .= " WHERE name like 'FTP_SERVER_%'";
+	$sql .= " ORDER BY name";
 
 	dol_syslog("ftpclient select ftp setup", LOG_DEBUG);
-	$resql=$db->query($sql);
+	$resql = $db->query($sql);
 	if ($resql)
 	{
-		$num =$db->num_rows($resql);
-		$i=0;
+		$num = $db->num_rows($resql);
+		$i = 0;
 
 		while ($i < $num)
 		{
 			$obj = $db->fetch_object($resql);
 
-		    preg_match('/([0-9]+)$/i',$obj->name,$reg);
+		    preg_match('/([0-9]+)$/i', $obj->name, $reg);
 			$idrss = $reg[0];
 			//print "x".join(',',$reg)."=".$obj->name."=".$idrss;
 
@@ -246,40 +246,40 @@ 
 			print '<td></td>';
 			print "</tr>";
 
-			$keyforname="FTP_NAME_" . $idrss;
-			$keyforserver="FTP_SERVER_" . $idrss;
-			$keyforport="FTP_PORT_" . $idrss;
-			$keyforuser="FTP_USER_" . $idrss;
-			$keyforpassword="FTP_PASSWORD_" . $idrss;
-			$keyforpassive="FTP_PASSIVE_" . $idrss;
+			$keyforname = "FTP_NAME_".$idrss;
+			$keyforserver = "FTP_SERVER_".$idrss;
+			$keyforport = "FTP_PORT_".$idrss;
+			$keyforuser = "FTP_USER_".$idrss;
+			$keyforpassword = "FTP_PASSWORD_".$idrss;
+			$keyforpassive = "FTP_PASSIVE_".$idrss;
 				
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Name")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_" . $idrss . "\" value=\"" . $conf->global->$keyforname . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_NAME_".$idrss."\" value=\"".$conf->global->$keyforname."\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td>".$langs->trans("Server")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_" . $idrss . "\" value=\"" . $conf->global->$keyforserver . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_SERVER_".$idrss."\" value=\"".$conf->global->$keyforserver."\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Port")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_" . $idrss . "\" value=\"" . $conf->global->$keyforport . "\" size=\"64\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_PORT_".$idrss."\" value=\"".$conf->global->$keyforport."\" size=\"64\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("User")."</td>";
-			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_" . $idrss . "\" value=\"" . $conf->global->$keyforuser . "\" size=\"24\"></td>";
+			print "<td><input type=\"text\" class=\"flat\" name=\"FTP_USER_".$idrss."\" value=\"".$conf->global->$keyforuser."\" size=\"24\"></td>";
 			print "</tr>";
 
 			
 			print '<tr class="oddeven">';
 			print "<td width=\"100\">".$langs->trans("Password")."</td>";
-			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_" . $idrss . "\" value=\"" . $conf->global->$keyforpassword . "\" size=\"24\"></td>";
+			print "<td><input type=\"password\" class=\"flat\" name=\"FTP_PASSWORD_".$idrss."\" value=\"".$conf->global->$keyforpassword."\" size=\"24\"></td>";
 			print "</tr>";
 
 			

dolibarr/htdocs/ftp/index.php

Indentation +560 added lines, -560 removed lines

@@ -83,268 +83,268 @@ 
 // Submit file
 if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
 {
-	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-
-	$result=$ecmdir->fetch($_REQUEST["section"]);
-	if (! $result > 0)
-	{
-		dol_print_error($db,$ecmdir->error);
-		exit;
-	}
-	$relativepath=$ecmdir->getRelativePath();
-	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
-
-	if (dol_mkdir($upload_dir) >= 0)
-	{
-		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
-		if (is_numeric($resupload) && $resupload > 0)
-		{
-			$result=$ecmdir->changeNbOfFiles('+');
-		}
-		else {
-			$langs->load("errors");
-			if ($resupload < 0)	// Unknown error
-			{
-				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
-			}
-			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
-			{
-				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
-			}
-			else	// Known error
-			{
-				setEventMessages($langs->trans($resupload), null, 'errors');
-			}
-		}
-	}
-	else
-	{
-		// Echec transfert (fichier depassant la limite ?)
-		$langs->load("errors");
-		setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
-	}
+    require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+
+    $result=$ecmdir->fetch($_REQUEST["section"]);
+    if (! $result > 0)
+    {
+        dol_print_error($db,$ecmdir->error);
+        exit;
+    }
+    $relativepath=$ecmdir->getRelativePath();
+    $upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
+
+    if (dol_mkdir($upload_dir) >= 0)
+    {
+        $resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
+        if (is_numeric($resupload) && $resupload > 0)
+        {
+            $result=$ecmdir->changeNbOfFiles('+');
+        }
+        else {
+            $langs->load("errors");
+            if ($resupload < 0)	// Unknown error
+            {
+                setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
+            }
+            else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+            {
+                setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
+            }
+            else	// Known error
+            {
+                setEventMessages($langs->trans($resupload), null, 'errors');
+            }
+        }
+    }
+    else
+    {
+        // Echec transfert (fichier depassant la limite ?)
+        $langs->load("errors");
+        setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
+    }
 }
 
 // Action ajout d'un rep
 if ($action == 'add' && $user->rights->ftp->setup)
 {
-	$ecmdir->ref                = $_POST["ref"];
-	$ecmdir->label              = $_POST["label"];
-	$ecmdir->description        = $_POST["desc"];
-
-	$id = $ecmdir->create($user);
-	if ($id > 0)
-	{
-		header("Location: ".$_SERVER["PHP_SELF"]);
-		exit;
-	}
-	else
-	{
-		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
-		$action = "create";
-	}
+    $ecmdir->ref                = $_POST["ref"];
+    $ecmdir->label              = $_POST["label"];
+    $ecmdir->description        = $_POST["desc"];
+
+    $id = $ecmdir->create($user);
+    if ($id > 0)
+    {
+        header("Location: ".$_SERVER["PHP_SELF"]);
+        exit;
+    }
+    else
+    {
+        setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
+        $action = "create";
+    }
 }
 
 // Remove file
 if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-	    $langs->load("other");
-
-		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
-
-		//print "x".$newremotefileiso;
-		dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-		$result=@ftp_delete($conn_id, $newremotefileiso);
-		if ($result)
-		{
-			setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-		}
-		else
-		{
-			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-			setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
-		}
-
-		//ftp_close($conn_id);	Close later
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
 
-		$action='';
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    if ($conn_id && $ok && ! $mesg)
+    {
+        $langs->load("other");
+
+        // Remote file
+        $filename=$file;
+        $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+        $newremotefileiso=utf8_decode($remotefile);
+
+        //print "x".$newremotefileiso;
+        dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
+        $result=@ftp_delete($conn_id, $newremotefileiso);
+        if ($result)
+        {
+            setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+        }
+        else
+        {
+            dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
+            setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+        }
+
+        //ftp_close($conn_id);	Close later
+
+        $action='';
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 }
 
 // Delete several lines at once
 if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("Delete"))
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-		foreach($_POST["const"] as $const)
-		{
-			if ($const["check"])	// Is checkbox checked
-			{
-			    $langs->load("other");
-
-				// Remote file
-				$file=$const["file"];
-				$section=$const["section"];
-				$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newremotefileiso=utf8_decode($remotefile);
-
-				//print "x".$newremotefileiso;
-				dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-				$result=@ftp_delete($conn_id, $newremotefileiso);
-				if ($result)
-				{
-					setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-				}
-				else
-				{
-					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-					setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
-				}
-
-				//ftp_close($conn_id);	Close later
-
-				$action='';
-			}
-		}
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
+
+    if ($conn_id && $ok && ! $mesg)
+    {
+        foreach($_POST["const"] as $const)
+        {
+            if ($const["check"])	// Is checkbox checked
+            {
+                $langs->load("other");
+
+                // Remote file
+                $file=$const["file"];
+                $section=$const["section"];
+                $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+                $newremotefileiso=utf8_decode($remotefile);
+
+                //print "x".$newremotefileiso;
+                dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
+                $result=@ftp_delete($conn_id, $newremotefileiso);
+                if ($result)
+                {
+                    setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+                }
+                else
+                {
+                    dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
+                    setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+                }
+
+                //ftp_close($conn_id);	Close later
+
+                $action='';
+            }
+        }
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 }
 
 // Remove directory
 if ($action == 'confirm_deletesection' && $confirm == 'yes')
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
-
-		$result=@ftp_rmdir($conn_id, $newremotefileiso);
-		if ($result)
-		{
-			setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
-		}
-		else
-		{
-			setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
-		}
-
-		//ftp_close($conn_id);	Close later
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
 
-		$action='';
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    if ($conn_id && $ok && ! $mesg)
+    {
+        // Remote file
+        $filename=$file;
+        $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+        $newremotefileiso=utf8_decode($remotefile);
+
+        $result=@ftp_rmdir($conn_id, $newremotefileiso);
+        if ($result)
+        {
+            setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
+        }
+        else
+        {
+            setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
+        }
+
+        //ftp_close($conn_id);	Close later
+
+        $action='';
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 }
 
 // Download directory
 if ($action == 'download')
 {
-	// set up a connection or die
-	if (! $conn_id)
-	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
-	}
-
-	if ($conn_id && $ok && ! $mesg)
-	{
-		// Local file
-		$localfile=tempnam($download_dir,'dol_');
-
-		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
-
-		$result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
-		if ($result)
-		{
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($localfile, octdec($conf->global->MAIN_UMASK));
-
-			// Define mime type
-			$type = 'application/octet-stream';
-			if (! empty($_GET["type"])) $type=$_GET["type"];
-			else $type=dol_mimetype($original_file);
-
-			// Define attachment (attachment=true to force choice popup 'open'/'save as')
-			$attachment = true;
-
-			if ($encoding)   header('Content-Encoding: '.$encoding);
-			if ($type)       header('Content-Type: '.$type);
-			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-			else header('Content-Disposition: inline; filename="'.$filename.'"');
-
-			// Ajout directives pour resoudre bug IE
-			header('Cache-Control: Public, must-revalidate');
-			header('Pragma: public');
-
-			readfile($localfile);
-
-			ftp_close($conn_id);
+    // set up a connection or die
+    if (! $conn_id)
+    {
+        $newsectioniso=utf8_decode($section);
+        $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+        $conn_id=$resultarray['conn_id'];
+        $ok=$resultarray['ok'];
+        $mesg=$resultarray['mesg'];
+    }
 
-			exit;
-		}
-		else
-		{
-			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
-		}
-	}
-	else
-	{
-		dol_print_error('',$mesg);
-	}
+    if ($conn_id && $ok && ! $mesg)
+    {
+        // Local file
+        $localfile=tempnam($download_dir,'dol_');
+
+        // Remote file
+        $filename=$file;
+        $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+        $newremotefileiso=utf8_decode($remotefile);
+
+        $result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
+        if ($result)
+        {
+            if (! empty($conf->global->MAIN_UMASK))
+            @chmod($localfile, octdec($conf->global->MAIN_UMASK));
+
+            // Define mime type
+            $type = 'application/octet-stream';
+            if (! empty($_GET["type"])) $type=$_GET["type"];
+            else $type=dol_mimetype($original_file);
+
+            // Define attachment (attachment=true to force choice popup 'open'/'save as')
+            $attachment = true;
+
+            if ($encoding)   header('Content-Encoding: '.$encoding);
+            if ($type)       header('Content-Type: '.$type);
+            if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
+            else header('Content-Disposition: inline; filename="'.$filename.'"');
+
+            // Ajout directives pour resoudre bug IE
+            header('Cache-Control: Public, must-revalidate');
+            header('Pragma: public');
+
+            readfile($localfile);
+
+            ftp_close($conn_id);
+
+            exit;
+        }
+        else
+        {
+            setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
+        }
+    }
+    else
+    {
+        dol_print_error('',$mesg);
+    }
 
-	//ftp_close($conn_id);	Close later
+    //ftp_close($conn_id);	Close later
 }
 
 
@@ -396,231 +396,231 @@ 
 
 if (! function_exists('ftp_connect'))
 {
-	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
+    print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
 else
 {
     if (! empty($ftp_server))
-	{
-		// Confirm remove file
-		if ($action == 'delete')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
-		}
-
-		// Confirmation de la suppression d'une ligne categorie
-		if ($action == 'delete_section')
-		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
-		}
-
-		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
-		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive?"(Passive)":"(Active)").'<br>';
-		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
+    {
+        // Confirm remove file
+        if ($action == 'delete')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
+        }
+
+        // Confirmation de la suppression d'une ligne categorie
+        if ($action == 'delete_section')
+        {
+            print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
+        }
+
+        print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
+        print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive?"(Passive)":"(Active)").'<br>';
+        print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
         print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
         print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
         print $langs->trans("Directory").': ';
-		$sectionarray=preg_split('|[\/]|',$section);
-		// For /
-		$newsection='/';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
-		print '/';
-		print '</a> ';
-		// For other directories
-		$i=0;
-		foreach($sectionarray as $val)
-		{
-			if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
-			if ($i > 0)
-			{
-				print ' / ';
-				$newsection.='/';
-			}
-			$newsection.=$val;
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
-			print $val;
-			print '</a>';
-			$i++;
-		}
-		print '<br>';
-		print "<br>\n";
-
-		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
+        $sectionarray=preg_split('|[\/]|',$section);
+        // For /
+        $newsection='/';
+        print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+        print '/';
+        print '</a> ';
+        // For other directories
+        $i=0;
+        foreach($sectionarray as $val)
+        {
+            if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
+            if ($i > 0)
+            {
+                print ' / ';
+                $newsection.='/';
+            }
+            $newsection.=$val;
+            print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+            print $val;
+            print '</a>';
+            $i++;
+        }
+        print '<br>';
+        print "<br>\n";
+
+        print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
         print '<input type="hidden" name="numero_ftp" value="'.$numero_ftp.'">';
-		print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
-
-
-		// Construit liste des repertoires
-		print '<table width="100%" class="noborder">'."\n";
-
-		print '<tr class="liste_titre">'."\n";
-		print '<td class="liste_titre" align="left">'.$langs->trans("Content").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Size").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Date").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Owner").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Group").'</td>'."\n";
-		print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
-		print '<td class="liste_titre nowrap" align="right">';
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
-		print '</td>'."\n";
-		print '</tr>'."\n";
-
-		// set up a connection or die
-		if (empty($conn_id))
-		{
-			$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
-
-			$conn_id=$resultarray['conn_id'];
-			$ok=$resultarray['ok'];
-			$mesg=$resultarray['mesg'];
-		}
-
-		if ($ok)
-		{
-			//$type = ftp_systype($conn_id);
-
-			$newsection=$section;
-		    $newsectioniso=utf8_decode($section);
-			//$newsection='/home';
-
-			// List content of directory ($newsection = '/', '/home', ...)
-			if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
-			{
-			    if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
-			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
-			    //var_dump($dirHandle);
+        print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+
+
+        // Construit liste des repertoires
+        print '<table width="100%" class="noborder">'."\n";
+
+        print '<tr class="liste_titre">'."\n";
+        print '<td class="liste_titre" align="left">'.$langs->trans("Content").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Size").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Date").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Owner").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Group").'</td>'."\n";
+        print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
+        print '<td class="liste_titre nowrap" align="right">';
+        if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
+        print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
+        print '</td>'."\n";
+        print '</tr>'."\n";
+
+        // set up a connection or die
+        if (empty($conn_id))
+        {
+            $resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
+
+            $conn_id=$resultarray['conn_id'];
+            $ok=$resultarray['ok'];
+            $mesg=$resultarray['mesg'];
+        }
+
+        if ($ok)
+        {
+            //$type = ftp_systype($conn_id);
+
+            $newsection=$section;
+            $newsectioniso=utf8_decode($section);
+            //$newsection='/home';
+
+            // List content of directory ($newsection = '/', '/home', ...)
+            if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+            {
+                if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
+                //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
+                //var_dump($dirHandle);
                 $contents = scandir('ssh2.sftp://' . $conn_id . $newsection);
                 $buff=array();
                 foreach($contents as $i => $key)
                 {
                     $buff[$i]="---------- - root root 1234 Aug 01 2000 ".$key;
                 }
-    		}
-    		else
-    		{
+            }
+            else
+            {
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso);	// Sometimes rawlist fails but never nlist
-        		//var_dump($contents);
-		        //var_dump($buff);
-    		}
-
-			$nboflines=count($contents);
-			$rawlisthasfailed=false;
-			$i=0;
-			while ($i < $nboflines && $i < 1000)
-			{
-				$vals=preg_split('@ +@',utf8_encode($buff[$i]),9);
-				//$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
-				//var_dump($vals);
-				$file=$vals[8];
-				if (empty($file))
-				{
-					$rawlisthasfailed=true;
-					$file=utf8_encode($contents[$i]);
-				}
-
-				if ($file == '.' || ($file == '..' && $section == '/'))
-				{
-					$i++;
-					continue;
-				}
-
-				// Is it a directory ?
-				$is_directory=0;
-				if ($file == '..') $is_directory=1;
-				else if (! $rawlisthasfailed)
-				{
-					if (preg_match('/^d/',$vals[0])) $is_directory=1;
-					if (preg_match('/^l/',$vals[0])) $is_link=1;
-				}
-				else
-				{
-					// Remote file
-					$filename=$file;
-					//print "section=".$section.' file='.$file.'X';
-					//print preg_match('@[\/]$@','aaa/').'Y';
-					//print preg_match('@[\\\/]$@',"aaa\\").'Y';
-					$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').preg_replace('@^[\\\/]@','',$file);
-					//print 'A'.$remotefile.'A';
-					$newremotefileiso=utf8_decode($remotefile);
-					//print 'Z'.$newremotefileiso.'Z';
-					$is_directory=ftp_isdir($conn_id, $newremotefileiso);
-				}
-
-
-				print '<tr class="oddeven" height="18">';
-				// Name
-				print '<td>';
-				$newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
-				if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
-				print $file;
-				if ($is_directory) print '</a>';
-				print '</td>';
-				// Size
-				print '<td align="center" class="nowrap">';
-				if (! $is_directory && ! $is_link) print $vals[4];
-				else print '&nbsp;';
-				print '</td>';
-				// Date
-				print '<td align="center" class="nowrap">';
-				print $vals[5].' '.$vals[6].' '.$vals[7];
-				print '</td>';
-				// User
-				print '<td align="center" class="nowrap">';
-				print $vals[2];
-				print '</td>';
-				// Group
-				print '<td align="center" class="nowrap">';
-				print $vals[3];
-				print '</td>';
-				// Permissions
-				print '<td align="center" class="nowrap">';
-				print $vals[0];
-				print '</td>';
-				// Action
-				print '<td align="right" width="64" class="nowrap">';
-				if ($is_directory)
-				{
-					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
-					else print '&nbsp;';
-				}
-				else if ($is_link)
-				{
-					$newfile=$file;
-					$newfile=preg_replace('/ ->.*/','',$newfile);
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
-				}
-				else
-				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
-					print ' &nbsp; ';
-					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
-					print ' &nbsp; ';
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
-					print '<input type="hidden" name="const['.$i.'][section]" value="'.$section.'">';
-					print '<input type="hidden" name="const['.$i.'][file]" value="'.$file.'">';
-				}
-				print '</td>';
-				print '</tr>'."\n";
-				$i++;
-				$nbofentries++;
-			}
-		}
+                //var_dump($contents);
+                //var_dump($buff);
+            }
+
+            $nboflines=count($contents);
+            $rawlisthasfailed=false;
+            $i=0;
+            while ($i < $nboflines && $i < 1000)
+            {
+                $vals=preg_split('@ +@',utf8_encode($buff[$i]),9);
+                //$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
+                //var_dump($vals);
+                $file=$vals[8];
+                if (empty($file))
+                {
+                    $rawlisthasfailed=true;
+                    $file=utf8_encode($contents[$i]);
+                }
 
-		print "</table>";
+                if ($file == '.' || ($file == '..' && $section == '/'))
+                {
+                    $i++;
+                    continue;
+                }
 
+                // Is it a directory ?
+                $is_directory=0;
+                if ($file == '..') $is_directory=1;
+                else if (! $rawlisthasfailed)
+                {
+                    if (preg_match('/^d/',$vals[0])) $is_directory=1;
+                    if (preg_match('/^l/',$vals[0])) $is_link=1;
+                }
+                else
+                {
+                    // Remote file
+                    $filename=$file;
+                    //print "section=".$section.' file='.$file.'X';
+                    //print preg_match('@[\/]$@','aaa/').'Y';
+                    //print preg_match('@[\\\/]$@',"aaa\\").'Y';
+                    $remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').preg_replace('@^[\\\/]@','',$file);
+                    //print 'A'.$remotefile.'A';
+                    $newremotefileiso=utf8_decode($remotefile);
+                    //print 'Z'.$newremotefileiso.'Z';
+                    $is_directory=ftp_isdir($conn_id, $newremotefileiso);
+                }
 
-		if (! $ok)
-		{
-		      print $mesg.'<br>'."\n";
-		      setEventMessages($mesg, null, 'errors');
-		}
+
+                print '<tr class="oddeven" height="18">';
+                // Name
+                print '<td>';
+                $newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
+                $newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
+                if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
+                print $file;
+                if ($is_directory) print '</a>';
+                print '</td>';
+                // Size
+                print '<td align="center" class="nowrap">';
+                if (! $is_directory && ! $is_link) print $vals[4];
+                else print '&nbsp;';
+                print '</td>';
+                // Date
+                print '<td align="center" class="nowrap">';
+                print $vals[5].' '.$vals[6].' '.$vals[7];
+                print '</td>';
+                // User
+                print '<td align="center" class="nowrap">';
+                print $vals[2];
+                print '</td>';
+                // Group
+                print '<td align="center" class="nowrap">';
+                print $vals[3];
+                print '</td>';
+                // Permissions
+                print '<td align="center" class="nowrap">';
+                print $vals[0];
+                print '</td>';
+                // Action
+                print '<td align="right" width="64" class="nowrap">';
+                if ($is_directory)
+                {
+                    if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+                    else print '&nbsp;';
+                }
+                else if ($is_link)
+                {
+                    $newfile=$file;
+                    $newfile=preg_replace('/ ->.*/','',$newfile);
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
+                }
+                else
+                {
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
+                    print ' &nbsp; ';
+                    print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
+                    print ' &nbsp; ';
+                    print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+                    print '<input type="hidden" name="const['.$i.'][section]" value="'.$section.'">';
+                    print '<input type="hidden" name="const['.$i.'][file]" value="'.$file.'">';
+                }
+                print '</td>';
+                print '</tr>'."\n";
+                $i++;
+                $nbofentries++;
+            }
+        }
+
+        print "</table>";
+
+
+        if (! $ok)
+        {
+                print $mesg.'<br>'."\n";
+                setEventMessages($mesg, null, 'errors');
+        }
 
 
-		// Actions
-		/*
+        // Actions
+        /*
 		if ($user->rights->ftp->write && ! empty($section))
 		{
 		$formfile->form_attach_new_file(DOL_URL_ROOT.'/ftp/index.php','',0,$section,1);
@@ -628,38 +628,38 @@ 
 		else print '&nbsp;';
 		*/
 
-		print '<br>';
-		print '<div id="delconst" align="right">';
-		print '<input type="submit" name="delete" class="button" value="'.$langs->trans("Delete").'">';
-		print '</div>';
-
-		print "</form>";
-	}
-	else
-	{
-		$foundsetup=false;
-		$MAXFTP=20;
-		$i=1;
-		while ($i <= $MAXFTP)
-		{
-			$paramkey='FTP_NAME_'.$i;
-			//print $paramkey;
-			if (! empty($conf->global->$paramkey))
-			{
-				$foundsetup=true;
-				break;
-			}
-			$i++;
-		}
-	    if (! $foundsetup)
-	    {
+        print '<br>';
+        print '<div id="delconst" align="right">';
+        print '<input type="submit" name="delete" class="button" value="'.$langs->trans("Delete").'">';
+        print '</div>';
+
+        print "</form>";
+    }
+    else
+    {
+        $foundsetup=false;
+        $MAXFTP=20;
+        $i=1;
+        while ($i <= $MAXFTP)
+        {
+            $paramkey='FTP_NAME_'.$i;
+            //print $paramkey;
+            if (! empty($conf->global->$paramkey))
+            {
+                $foundsetup=true;
+                break;
+            }
+            $i++;
+        }
+        if (! $foundsetup)
+        {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    }
-	    else
-	    {
-	        print $langs->trans("ChooseAFTPEntryIntoMenu");
-	    }
-	}
+        }
+        else
+        {
+            print $langs->trans("ChooseAFTPEntryIntoMenu");
+        }
+    }
 }
 
 print '<br>';
@@ -700,94 +700,94 @@ 
  */
 function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive=0)
 {
-	global $langs, $conf;
+    global $langs, $conf;
 
-	$ok=1;
+    $ok=1;
     $conn_id=null;
 
-	if (! is_numeric($ftp_port))
-	{
-		$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-		$ok=0;
-	}
+    if (! is_numeric($ftp_port))
+    {
+        $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
+        $ok=0;
+    }
 
-	if ($ok)
-	{
-		$connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT);
-		if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
-		{
-		    dol_syslog('Try to connect with ssh2_ftp');
-		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		}
-		else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
-		{
-		    dol_syslog('Try to connect with ftp_ssl_connect');
-		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		else
-		{
-		    dol_syslog('Try to connect with ftp_connect');
-		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		if ($conn_id || $tmp_conn_id)
-		{
-			if ($ftp_user)
-			{
-				if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
-				{
-				    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					//if ($ftp_passive) ftp_pasv($conn_id, true);
-
-    					// Change the dir
-    					$newsectioniso=utf8_decode($section);
-    					//ftp_chdir($conn_id, $newsectioniso);
-		                $conn_id = ssh2_sftp($tmp_conn_id);
-		                if (! $conn_id)
-		                {
-        					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
-    	   				    $ok=0;
-        				    $error++;
-		                }
-    				}
-    				else
-    				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
-    				    $error++;
-    				}
-				}
-				else
-				{
-				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
-    				{
-    					// Turn on passive mode transfers (must be after a successful login
-    					if ($ftp_passive) ftp_pasv($conn_id, true);
-
-    					// Change the dir
-    					$newsectioniso=utf8_decode($section);
-    					ftp_chdir($conn_id, $newsectioniso);
-    				}
-    				else
-    				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
-    				    $error++;
-    				}
-				}
-			}
-		}
-		else
-		{
-		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
-			$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-			$ok=0;
-		}
-	}
+    if ($ok)
+    {
+        $connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT);
+        if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+        {
+            dol_syslog('Try to connect with ssh2_ftp');
+            $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
+        }
+        else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+        {
+            dol_syslog('Try to connect with ftp_ssl_connect');
+            $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
+        }
+        else
+        {
+            dol_syslog('Try to connect with ftp_connect');
+            $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
+        }
+        if ($conn_id || $tmp_conn_id)
+        {
+            if ($ftp_user)
+            {
+                if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+                {
+                    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
+                    {
+                        // Turn on passive mode transfers (must be after a successful login
+                        //if ($ftp_passive) ftp_pasv($conn_id, true);
+
+                        // Change the dir
+                        $newsectioniso=utf8_decode($section);
+                        //ftp_chdir($conn_id, $newsectioniso);
+                        $conn_id = ssh2_sftp($tmp_conn_id);
+                        if (! $conn_id)
+                        {
+                            $mesg=$langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
+                                $ok=0;
+                            $error++;
+                        }
+                    }
+                    else
+                    {
+                        $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+                            $ok=0;
+                        $error++;
+                    }
+                }
+                else
+                {
+                    if (ftp_login($conn_id, $ftp_user, $ftp_password))
+                    {
+                        // Turn on passive mode transfers (must be after a successful login
+                        if ($ftp_passive) ftp_pasv($conn_id, true);
+
+                        // Change the dir
+                        $newsectioniso=utf8_decode($section);
+                        ftp_chdir($conn_id, $newsectioniso);
+                    }
+                    else
+                    {
+                        $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+                            $ok=0;
+                        $error++;
+                    }
+                }
+            }
+        }
+        else
+        {
+            dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
+            $mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
+            $ok=0;
+        }
+    }
 
-	$arrayresult=array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
-	return $arrayresult;
+    $arrayresult=array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
+    return $arrayresult;
 }
 
 
@@ -800,14 +800,14 @@ 
  */
 function ftp_isdir($connect_id,$dir)
 {
-	if (@ftp_chdir($connect_id,$dir))
-	{
-		ftp_cdup($connect_id);
-		return 1;
-	}
-	else
-	{
-		return 0;
-	}
+    if (@ftp_chdir($connect_id,$dir))
+    {
+        ftp_cdup($connect_id);
+        return 1;
+    }
+    else
+    {
+        return 0;
+    }
 }
 

Braces +108 added lines, -85 removed lines

@@ -31,13 +31,17 @@ 
 $langs->loadLangs(array('ftp', 'companies', 'other'));
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'ftp','');
 
 // Get parameters
 $action=GETPOST('action','aZ09');
 $section=GETPOST('section');
-if (! $section) $section='/';
+if (! $section) {
+    $section='/';
+}
 $numero_ftp = GETPOST("numero_ftp");
 /* if (! $numero_ftp) $numero_ftp=1; */
 $file=GETPOST("file");
@@ -53,8 +57,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="label";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="label";
+}
 
 $s_ftp_name='FTP_NAME_'.$numero_ftp;
 $s_ftp_server='FTP_SERVER_'.$numero_ftp;
@@ -64,7 +72,9 @@ 
 $s_ftp_passive='FTP_PASSIVE_'.$numero_ftp;
 $ftp_name=$conf->global->$s_ftp_name;
 $ftp_server=$conf->global->$s_ftp_server;
-$ftp_port=$conf->global->$s_ftp_port; if (empty($ftp_port)) $ftp_port=21;
+$ftp_port=$conf->global->$s_ftp_port; if (empty($ftp_port)) {
+    $ftp_port=21;
+}
 $ftp_user=$conf->global->$s_ftp_user;
 $ftp_password=$conf->global->$s_ftp_password;
 $ftp_passive=$conf->global->$s_ftp_passive;
@@ -100,24 +110,24 @@ 
 		if (is_numeric($resupload) && $resupload > 0)
 		{
 			$result=$ecmdir->changeNbOfFiles('+');
-		}
-		else {
+		} else {
 			$langs->load("errors");
-			if ($resupload < 0)	// Unknown error
+			if ($resupload < 0) {
+			    // Unknown error
 			{
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			}
-			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+			} else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload)) {
+			    // Files infected by a virus
 			{
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
-			else	// Known error
+			} else	// Known error
 			{
 				setEventMessages($langs->trans($resupload), null, 'errors');
 			}
 		}
-	}
-	else
+	} else
 	{
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
@@ -137,8 +147,7 @@ 
 	{
 		header("Location: ".$_SERVER["PHP_SELF"]);
 		exit;
-	}
-	else
+	} else
 	{
 		setEventMessages($langs->trans("ErrorFailToCreateDir"), null, 'errors');
 		$action = "create";
@@ -173,8 +182,7 @@ 
 		if ($result)
 		{
 			setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 			setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
@@ -183,8 +191,7 @@ 
 		//ftp_close($conn_id);	Close later
 
 		$action='';
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -207,9 +214,11 @@ 
 	{
 		foreach($_POST["const"] as $const)
 		{
-			if ($const["check"])	// Is checkbox checked
+			if ($const["check"]) {
+			    // Is checkbox checked
 			{
 			    $langs->load("other");
+			}
 
 				// Remote file
 				$file=$const["file"];
@@ -223,8 +232,7 @@ 
 				if ($result)
 				{
 					setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
-				}
-				else
+				} else
 				{
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
 					setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
@@ -235,8 +243,7 @@ 
 				$action='';
 			}
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -266,8 +273,7 @@ 
 		if ($result)
 		{
 			setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
 		}
@@ -275,8 +281,7 @@ 
 		//ftp_close($conn_id);	Close later
 
 		$action='';
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -308,21 +313,32 @@ 
 		$result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
 		if ($result)
 		{
-			if (! empty($conf->global->MAIN_UMASK))
-			@chmod($localfile, octdec($conf->global->MAIN_UMASK));
+			if (! empty($conf->global->MAIN_UMASK)) {
+						@chmod($localfile, octdec($conf->global->MAIN_UMASK));
+			}
 
 			// Define mime type
 			$type = 'application/octet-stream';
-			if (! empty($_GET["type"])) $type=$_GET["type"];
-			else $type=dol_mimetype($original_file);
+			if (! empty($_GET["type"])) {
+			    $type=$_GET["type"];
+			} else {
+			    $type=dol_mimetype($original_file);
+			}
 
 			// Define attachment (attachment=true to force choice popup 'open'/'save as')
 			$attachment = true;
 
-			if ($encoding)   header('Content-Encoding: '.$encoding);
-			if ($type)       header('Content-Type: '.$type);
-			if ($attachment) header('Content-Disposition: attachment; filename="'.$filename.'"');
-			else header('Content-Disposition: inline; filename="'.$filename.'"');
+			if ($encoding) {
+			    header('Content-Encoding: '.$encoding);
+			}
+			if ($type) {
+			    header('Content-Type: '.$type);
+			}
+			if ($attachment) {
+			    header('Content-Disposition: attachment; filename="'.$filename.'"');
+			} else {
+			    header('Content-Disposition: inline; filename="'.$filename.'"');
+			}
 
 			// Ajout directives pour resoudre bug IE
 			header('Cache-Control: Public, must-revalidate');
@@ -333,13 +349,11 @@ 
 			ftp_close($conn_id);
 
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
 		}
-	}
-	else
+	} else
 	{
 		dol_print_error('',$mesg);
 	}
@@ -397,8 +411,7 @@ 
 if (! function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
-}
-else
+} else
 {
     if (! empty($ftp_server))
 	{
@@ -430,7 +443,10 @@ 
 		$i=0;
 		foreach($sectionarray as $val)
 		{
-			if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
+			if (empty($val)) {
+			    continue;
+			}
+			// Discard first and last entry that should be empty as section start/end with /
 			if ($i > 0)
 			{
 				print ' / ';
@@ -461,7 +477,9 @@ 
 		print '<td class="liste_titre" align="center">'.$langs->trans("Group").'</td>'."\n";
 		print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
 		print '<td class="liste_titre nowrap" align="right">';
-		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
+		if ($conf->use_javascript_ajax) {
+		    print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
+		}
 		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
 		print '</td>'."\n";
 		print '</tr>'."\n";
@@ -487,7 +505,10 @@ 
 			// List content of directory ($newsection = '/', '/home', ...)
 			if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
 			{
-			    if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
+			    if ($newsection == '/') {
+			        $newsection='/./';
+			    }
+			    // workaround for bug https://bugs.php.net/bug.php?id=64169
 			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
 			    //var_dump($dirHandle);
                 $contents = scandir('ssh2.sftp://' . $conn_id . $newsection);
@@ -496,8 +517,7 @@ 
                 {
                     $buff[$i]="---------- - root root 1234 Aug 01 2000 ".$key;
                 }
-    		}
-    		else
+    		} else
     		{
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
                 $contents = ftp_nlist($conn_id, $newsectioniso);	// Sometimes rawlist fails but never nlist
@@ -528,13 +548,17 @@ 
 
 				// Is it a directory ?
 				$is_directory=0;
-				if ($file == '..') $is_directory=1;
-				else if (! $rawlisthasfailed)
+				if ($file == '..') {
+				    $is_directory=1;
+				} else if (! $rawlisthasfailed)
 				{
-					if (preg_match('/^d/',$vals[0])) $is_directory=1;
-					if (preg_match('/^l/',$vals[0])) $is_link=1;
-				}
-				else
+					if (preg_match('/^d/',$vals[0])) {
+					    $is_directory=1;
+					}
+					if (preg_match('/^l/',$vals[0])) {
+					    $is_link=1;
+					}
+				} else
 				{
 					// Remote file
 					$filename=$file;
@@ -554,14 +578,21 @@ 
 				print '<td>';
 				$newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
 				$newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
-				if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
+				if ($is_directory) {
+				    print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
+				}
 				print $file;
-				if ($is_directory) print '</a>';
+				if ($is_directory) {
+				    print '</a>';
+				}
 				print '</td>';
 				// Size
 				print '<td align="center" class="nowrap">';
-				if (! $is_directory && ! $is_link) print $vals[4];
-				else print '&nbsp;';
+				if (! $is_directory && ! $is_link) {
+				    print $vals[4];
+				} else {
+				    print '&nbsp;';
+				}
 				print '</td>';
 				// Date
 				print '<td align="center" class="nowrap">';
@@ -583,16 +614,17 @@ 
 				print '<td align="right" width="64" class="nowrap">';
 				if ($is_directory)
 				{
-					if ($file != '..') print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
-					else print '&nbsp;';
-				}
-				else if ($is_link)
+					if ($file != '..') {
+					    print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete_section&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_delete().'</a>';
+					} else {
+					    print '&nbsp;';
+					}
+				} else if ($is_link)
 				{
 					$newfile=$file;
 					$newfile=preg_replace('/ ->.*/','',$newfile);
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
-				}
-				else
+				} else
 				{
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
 					print ' &nbsp; ';
@@ -634,8 +666,7 @@ 
 		print '</div>';
 
 		print "</form>";
-	}
-	else
+	} else
 	{
 		$foundsetup=false;
 		$MAXFTP=20;
@@ -654,8 +685,7 @@ 
 	    if (! $foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
-	    }
-	    else
+	    } else
 	    {
 	        print $langs->trans("ChooseAFTPEntryIntoMenu");
 	    }
@@ -670,12 +700,10 @@ 
     if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
     {
 
-    }
-    else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+    } else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
     {
         ftp_close($conn_id);
-    }
-    else
+    } else
     {
         ftp_close($conn_id);
     }
@@ -718,13 +746,11 @@ 
 		{
 		    dol_syslog('Try to connect with ssh2_ftp');
 		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
-		}
-		else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+		} else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
 		{
 		    dol_syslog('Try to connect with ftp_ssl_connect');
 		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
-		}
-		else
+		} else
 		{
 		    dol_syslog('Try to connect with ftp_connect');
 		    $conn_id = ftp_connect($ftp_server, $ftp_port, $connecttimeout);
@@ -750,26 +776,25 @@ 
     	   				    $ok=0;
         				    $error++;
 		                }
-    				}
-    				else
+    				} else
     				{
     					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok=0;
     				    $error++;
     				}
-				}
-				else
+				} else
 				{
 				    if (ftp_login($conn_id, $ftp_user, $ftp_password))
     				{
     					// Turn on passive mode transfers (must be after a successful login
-    					if ($ftp_passive) ftp_pasv($conn_id, true);
+    					if ($ftp_passive) {
+    					    ftp_pasv($conn_id, true);
+    					}
 
     					// Change the dir
     					$newsectioniso=utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
-    				}
-    				else
+    				} else
     				{
     					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
 	   				    $ok=0;
@@ -777,8 +802,7 @@ 
     				}
 				}
 			}
-		}
-		else
+		} else
 		{
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
 			$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
@@ -804,8 +828,7 @@ 
 	{
 		ftp_cdup($connect_id);
 		return 1;
-	}
-	else
+	} else
 	{
 		return 0;
 	}

Spacing +189 added lines, -189 removed lines

@@ -24,8 +24,8 @@ 
 
 // Copyright (C) 2018 Alxarafe/Alixar  <info@alxarafe.com>
 defined('BASE_PATH') or die('Single entry point through the index.php of the main folder');
-require DOL_BASE_PATH . '/main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+require DOL_BASE_PATH.'/main.inc.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formfile.class.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 require_once DOL_DOCUMENT_ROOT.'/core/lib/treeview.lib.php';
 
@@ -33,48 +33,48 @@ 
 $langs->loadLangs(array('ftp', 'companies', 'other'));
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
-$result = restrictedArea($user, 'ftp','');
+if ($user->societe_id) $socid = $user->societe_id;
+$result = restrictedArea($user, 'ftp', '');
 
 // Get parameters
-$action=GETPOST('action','aZ09');
-$section=GETPOST('section');
-if (! $section) $section='/';
+$action = GETPOST('action', 'aZ09');
+$section = GETPOST('section');
+if (!$section) $section = '/';
 $numero_ftp = GETPOST("numero_ftp");
 /* if (! $numero_ftp) $numero_ftp=1; */
-$file=GETPOST("file");
-$confirm=GETPOST('confirm');
+$file = GETPOST("file");
+$confirm = GETPOST('confirm');
 
 $upload_dir = $conf->ftp->dir_temp;
 $download_dir = $conf->ftp->dir_temp;
 
-$sortfield = GETPOST("sortfield",'alpha');
-$sortorder = GETPOST("sortorder",'alpha');
-$page = GETPOST("page",'int');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$page = GETPOST("page", 'int');
 if (empty($page) || $page == -1) { $page = 0; }     // If $page is not defined, or '' or -1
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="label";
-
-$s_ftp_name='FTP_NAME_'.$numero_ftp;
-$s_ftp_server='FTP_SERVER_'.$numero_ftp;
-$s_ftp_port='FTP_PORT_'.$numero_ftp;
-$s_ftp_user='FTP_USER_'.$numero_ftp;
-$s_ftp_password='FTP_PASSWORD_'.$numero_ftp;
-$s_ftp_passive='FTP_PASSIVE_'.$numero_ftp;
-$ftp_name=$conf->global->$s_ftp_name;
-$ftp_server=$conf->global->$s_ftp_server;
-$ftp_port=$conf->global->$s_ftp_port; if (empty($ftp_port)) $ftp_port=21;
-$ftp_user=$conf->global->$s_ftp_user;
-$ftp_password=$conf->global->$s_ftp_password;
-$ftp_passive=$conf->global->$s_ftp_passive;
+if (!$sortorder) $sortorder = "ASC";
+if (!$sortfield) $sortfield = "label";
+
+$s_ftp_name = 'FTP_NAME_'.$numero_ftp;
+$s_ftp_server = 'FTP_SERVER_'.$numero_ftp;
+$s_ftp_port = 'FTP_PORT_'.$numero_ftp;
+$s_ftp_user = 'FTP_USER_'.$numero_ftp;
+$s_ftp_password = 'FTP_PASSWORD_'.$numero_ftp;
+$s_ftp_passive = 'FTP_PASSIVE_'.$numero_ftp;
+$ftp_name = $conf->global->$s_ftp_name;
+$ftp_server = $conf->global->$s_ftp_server;
+$ftp_port = $conf->global->$s_ftp_port; if (empty($ftp_port)) $ftp_port = 21;
+$ftp_user = $conf->global->$s_ftp_user;
+$ftp_password = $conf->global->$s_ftp_password;
+$ftp_passive = $conf->global->$s_ftp_passive;
 
 // For result on connection
-$ok=0;
-$conn_id=null;	// FTP connection ID
-$mesg='';
+$ok = 0;
+$conn_id = null; // FTP connection ID
+$mesg = '';
 
 
 
@@ -83,25 +83,25 @@ 
  */
 
 // Submit file
-if (GETPOST("sendit") && ! empty($conf->global->MAIN_UPLOAD_DOC))
+if (GETPOST("sendit") && !empty($conf->global->MAIN_UPLOAD_DOC))
 {
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
-	$result=$ecmdir->fetch($_REQUEST["section"]);
-	if (! $result > 0)
+	$result = $ecmdir->fetch($_REQUEST["section"]);
+	if (!$result > 0)
 	{
-		dol_print_error($db,$ecmdir->error);
+		dol_print_error($db, $ecmdir->error);
 		exit;
 	}
-	$relativepath=$ecmdir->getRelativePath();
+	$relativepath = $ecmdir->getRelativePath();
 	$upload_dir = $conf->ecm->dir_output.'/'.$relativepath;
 
 	if (dol_mkdir($upload_dir) >= 0)
 	{
-		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir . "/" . dol_unescapefile($_FILES['userfile']['name']),0);
+		$resupload = dol_move_uploaded_file($_FILES['userfile']['tmp_name'], $upload_dir."/".dol_unescapefile($_FILES['userfile']['name']), 0);
 		if (is_numeric($resupload) && $resupload > 0)
 		{
-			$result=$ecmdir->changeNbOfFiles('+');
+			$result = $ecmdir->changeNbOfFiles('+');
 		}
 		else {
 			$langs->load("errors");
@@ -109,7 +109,7 @@ 
 			{
 				setEventMessages($langs->trans("ErrorFileNotUploaded"), null, 'errors');
 			}
-			else if (preg_match('/ErrorFileIsInfectedWithAVirus/',$resupload))	// Files infected by a virus
+			else if (preg_match('/ErrorFileIsInfectedWithAVirus/', $resupload))	// Files infected by a virus
 			{
 				setEventMessages($langs->trans("ErrorFileIsInfectedWithAVirus"), null, 'errors');
 			}
@@ -123,7 +123,7 @@ 
 	{
 		// Echec transfert (fichier depassant la limite ?)
 		$langs->load("errors");
-		setEventMessages($langs->trans("ErrorFailToCreateDir",$upload_dir), null, 'errors');
+		setEventMessages($langs->trans("ErrorFailToCreateDir", $upload_dir), null, 'errors');
 	}
 }
 
@@ -151,44 +151,44 @@ 
 if ($action == 'confirm_deletefile' && $_REQUEST['confirm'] == 'yes')
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
 	    $langs->load("other");
 
 		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
+		$filename = $file;
+		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$newremotefileiso = utf8_decode($remotefile);
 
 		//print "x".$newremotefileiso;
 		dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-		$result=@ftp_delete($conn_id, $newremotefileiso);
+		$result = @ftp_delete($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+			setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 		}
 		else
 		{
 			dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-			setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+			setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
 
-		$action='';
+		$action = '';
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 }
 
@@ -196,51 +196,51 @@ 
 if ($_POST["const"] && $_POST["delete"] && $_POST["delete"] == $langs->trans("Delete"))
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
-		foreach($_POST["const"] as $const)
+		foreach ($_POST["const"] as $const)
 		{
 			if ($const["check"])	// Is checkbox checked
 			{
 			    $langs->load("other");
 
 				// Remote file
-				$file=$const["file"];
-				$section=$const["section"];
-				$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newremotefileiso=utf8_decode($remotefile);
+				$file = $const["file"];
+				$section = $const["section"];
+				$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+				$newremotefileiso = utf8_decode($remotefile);
 
 				//print "x".$newremotefileiso;
 				dol_syslog("ftp/index.php ftp_delete ".$newremotefileiso);
-				$result=@ftp_delete($conn_id, $newremotefileiso);
+				$result = @ftp_delete($conn_id, $newremotefileiso);
 				if ($result)
 				{
-					setEventMessages($langs->trans("FileWasRemoved",$file), null, 'mesgs');
+					setEventMessages($langs->trans("FileWasRemoved", $file), null, 'mesgs');
 				}
 				else
 				{
 					dol_syslog("ftp/index.php ftp_delete", LOG_ERR);
-					setEventMessages($langs->trans("FTPFailedToRemoveFile",$file), null, 'errors');
+					setEventMessages($langs->trans("FTPFailedToRemoveFile", $file), null, 'errors');
 				}
 
 				//ftp_close($conn_id);	Close later
 
-				$action='';
+				$action = '';
 			}
 		}
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 }
 
@@ -248,39 +248,39 @@ 
 if ($action == 'confirm_deletesection' && $confirm == 'yes')
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
 		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
+		$filename = $file;
+		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$newremotefileiso = utf8_decode($remotefile);
 
-		$result=@ftp_rmdir($conn_id, $newremotefileiso);
+		$result = @ftp_rmdir($conn_id, $newremotefileiso);
 		if ($result)
 		{
-			setEventMessages($langs->trans("DirWasRemoved",$file), null, 'mesgs');
+			setEventMessages($langs->trans("DirWasRemoved", $file), null, 'mesgs');
 		}
 		else
 		{
-			setEventMessages($langs->trans("FTPFailedToRemoveDir",$file), null, 'errors');
+			setEventMessages($langs->trans("FTPFailedToRemoveDir", $file), null, 'errors');
 		}
 
 		//ftp_close($conn_id);	Close later
 
-		$action='';
+		$action = '';
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 }
 
@@ -288,35 +288,35 @@ 
 if ($action == 'download')
 {
 	// set up a connection or die
-	if (! $conn_id)
+	if (!$conn_id)
 	{
-		$newsectioniso=utf8_decode($section);
-		$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
-		$conn_id=$resultarray['conn_id'];
-		$ok=$resultarray['ok'];
-		$mesg=$resultarray['mesg'];
+		$newsectioniso = utf8_decode($section);
+		$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $newsectioniso, $ftp_passive);
+		$conn_id = $resultarray['conn_id'];
+		$ok = $resultarray['ok'];
+		$mesg = $resultarray['mesg'];
 	}
 
-	if ($conn_id && $ok && ! $mesg)
+	if ($conn_id && $ok && !$mesg)
 	{
 		// Local file
-		$localfile=tempnam($download_dir,'dol_');
+		$localfile = tempnam($download_dir, 'dol_');
 
 		// Remote file
-		$filename=$file;
-		$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-		$newremotefileiso=utf8_decode($remotefile);
+		$filename = $file;
+		$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+		$newremotefileiso = utf8_decode($remotefile);
 
-		$result=ftp_get($conn_id,$localfile,$newremotefileiso,FTP_BINARY);
+		$result = ftp_get($conn_id, $localfile, $newremotefileiso, FTP_BINARY);
 		if ($result)
 		{
-			if (! empty($conf->global->MAIN_UMASK))
+			if (!empty($conf->global->MAIN_UMASK))
 			@chmod($localfile, octdec($conf->global->MAIN_UMASK));
 
 			// Define mime type
 			$type = 'application/octet-stream';
-			if (! empty($_GET["type"])) $type=$_GET["type"];
-			else $type=dol_mimetype($original_file);
+			if (!empty($_GET["type"])) $type = $_GET["type"];
+			else $type = dol_mimetype($original_file);
 
 			// Define attachment (attachment=true to force choice popup 'open'/'save as')
 			$attachment = true;
@@ -338,12 +338,12 @@ 
 		}
 		else
 		{
-			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile',$remotefile), null, 'errors');
+			setEventMessages($langs->transnoentitiesnoconv('FailedToGetFile', $remotefile), null, 'errors');
 		}
 	}
 	else
 	{
-		dol_print_error('',$mesg);
+		dol_print_error('', $mesg);
 	}
 
 	//ftp_close($conn_id);	Close later
@@ -386,8 +386,8 @@ 
 <?php
 }
 
-$form=new Form($db);
-$formfile=new FormFile($db);
+$form = new Form($db);
+$formfile = new FormFile($db);
 $userstatic = new User($db);
 
 
@@ -396,50 +396,50 @@ 
 
 print $langs->trans("FTPAreaDesc")."<br>";
 
-if (! function_exists('ftp_connect'))
+if (!function_exists('ftp_connect'))
 {
 	print $langs->trans("FTPFeatureNotSupportedByYourPHP");
 }
 else
 {
-    if (! empty($ftp_server))
+    if (!empty($ftp_server))
 	{
 		// Confirm remove file
 		if ($action == 'delete')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile','','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile', '', '', 1);
 		}
 
 		// Confirmation de la suppression d'une ligne categorie
 		if ($action == 'delete_section')
 		{
-			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection',$ecmdir->label), 'confirm_deletesection','','',1);
+			print $form->formconfirm($_SERVER["PHP_SELF"].'?numero_ftp='.$numero_ftp.'&section='.urlencode($_REQUEST["section"]).'&file='.urlencode($_GET["file"]), $langs->trans('DeleteSection'), $langs->trans('ConfirmDeleteSection', $ecmdir->label), 'confirm_deletesection', '', '', 1);
 		}
 
 		print $langs->trans("Server").': <b>'.$ftp_server.'</b><br>';
-		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive?"(Passive)":"(Active)").'<br>';
+		print $langs->trans("Port").': <b>'.$ftp_port.'</b> '.($ftp_passive ? "(Passive)" : "(Active)").'<br>';
 		print $langs->trans("User").': <b>'.$ftp_user.'</b><br>';
         print $langs->trans("FTPs (FTP over SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SSL).'</b><br>';
         print $langs->trans("SFTP (FTP as a subsytem of SSH)").': <b>'.yn($conf->global->FTP_CONNECT_WITH_SFTP).'</b><br>';
         print $langs->trans("Directory").': ';
-		$sectionarray=preg_split('|[\/]|',$section);
+		$sectionarray = preg_split('|[\/]|', $section);
 		// For /
-		$newsection='/';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+		$newsection = '/';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection ? '&section='.urlencode($newsection) : '').'">';
 		print '/';
 		print '</a> ';
 		// For other directories
-		$i=0;
-		foreach($sectionarray as $val)
+		$i = 0;
+		foreach ($sectionarray as $val)
 		{
-			if (empty($val)) continue;	// Discard first and last entry that should be empty as section start/end with /
+			if (empty($val)) continue; // Discard first and last entry that should be empty as section start/end with /
 			if ($i > 0)
 			{
 				print ' / ';
-				$newsection.='/';
+				$newsection .= '/';
 			}
-			$newsection.=$val;
-			print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection?'&section='.urlencode($newsection):'').'">';
+			$newsection .= $val;
+			print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($newsection ? '&section='.urlencode($newsection) : '').'">';
 			print $val;
 			print '</a>';
 			$i++;
@@ -464,62 +464,62 @@ 
 		print '<td class="liste_titre" align="center">'.$langs->trans("Permissions").'</td>'."\n";
 		print '<td class="liste_titre nowrap" align="right">';
 		if ($conf->use_javascript_ajax) print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a> ';
-		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section?'&section='.urlencode($section):'').'">'.img_picto($langs->trans("Refresh"),'refresh').'</a>&nbsp;';
+		print '<a href="'.$_SERVER["PHP_SELF"].'?action=refreshmanual&numero_ftp='.$numero_ftp.($section ? '&section='.urlencode($section) : '').'">'.img_picto($langs->trans("Refresh"), 'refresh').'</a>&nbsp;';
 		print '</td>'."\n";
 		print '</tr>'."\n";
 
 		// set up a connection or die
 		if (empty($conn_id))
 		{
-			$resultarray=dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
+			$resultarray = dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive);
 
-			$conn_id=$resultarray['conn_id'];
-			$ok=$resultarray['ok'];
-			$mesg=$resultarray['mesg'];
+			$conn_id = $resultarray['conn_id'];
+			$ok = $resultarray['ok'];
+			$mesg = $resultarray['mesg'];
 		}
 
 		if ($ok)
 		{
 			//$type = ftp_systype($conn_id);
 
-			$newsection=$section;
-		    $newsectioniso=utf8_decode($section);
+			$newsection = $section;
+		    $newsectioniso = utf8_decode($section);
 			//$newsection='/home';
 
 			// List content of directory ($newsection = '/', '/home', ...)
-			if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+			if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 			{
-			    if ($newsection == '/') $newsection='/./';  // workaround for bug https://bugs.php.net/bug.php?id=64169
+			    if ($newsection == '/') $newsection = '/./'; // workaround for bug https://bugs.php.net/bug.php?id=64169
 			    //$dirHandle = opendir("ssh2.sftp://$conn_id".$newsection);
 			    //var_dump($dirHandle);
-                $contents = scandir('ssh2.sftp://' . $conn_id . $newsection);
-                $buff=array();
-                foreach($contents as $i => $key)
+                $contents = scandir('ssh2.sftp://'.$conn_id.$newsection);
+                $buff = array();
+                foreach ($contents as $i => $key)
                 {
-                    $buff[$i]="---------- - root root 1234 Aug 01 2000 ".$key;
+                    $buff[$i] = "---------- - root root 1234 Aug 01 2000 ".$key;
                 }
     		}
     		else
     		{
                 $buff = ftp_rawlist($conn_id, $newsectioniso);
-                $contents = ftp_nlist($conn_id, $newsectioniso);	// Sometimes rawlist fails but never nlist
+                $contents = ftp_nlist($conn_id, $newsectioniso); // Sometimes rawlist fails but never nlist
         		//var_dump($contents);
 		        //var_dump($buff);
     		}
 
-			$nboflines=count($contents);
-			$rawlisthasfailed=false;
-			$i=0;
+			$nboflines = count($contents);
+			$rawlisthasfailed = false;
+			$i = 0;
 			while ($i < $nboflines && $i < 1000)
 			{
-				$vals=preg_split('@ +@',utf8_encode($buff[$i]),9);
+				$vals = preg_split('@ +@', utf8_encode($buff[$i]), 9);
 				//$vals=preg_split('@ +@','drwxr-xr-x 2 root root 4096 Aug 30 2008 backup_apollon1',9);
 				//var_dump($vals);
-				$file=$vals[8];
+				$file = $vals[8];
 				if (empty($file))
 				{
-					$rawlisthasfailed=true;
-					$file=utf8_encode($contents[$i]);
+					$rawlisthasfailed = true;
+					$file = utf8_encode($contents[$i]);
 				}
 
 				if ($file == '.' || ($file == '..' && $section == '/'))
@@ -529,40 +529,40 @@ 
 				}
 
 				// Is it a directory ?
-				$is_directory=0;
-				if ($file == '..') $is_directory=1;
-				else if (! $rawlisthasfailed)
+				$is_directory = 0;
+				if ($file == '..') $is_directory = 1;
+				else if (!$rawlisthasfailed)
 				{
-					if (preg_match('/^d/',$vals[0])) $is_directory=1;
-					if (preg_match('/^l/',$vals[0])) $is_link=1;
+					if (preg_match('/^d/', $vals[0])) $is_directory = 1;
+					if (preg_match('/^l/', $vals[0])) $is_link = 1;
 				}
 				else
 				{
 					// Remote file
-					$filename=$file;
+					$filename = $file;
 					//print "section=".$section.' file='.$file.'X';
 					//print preg_match('@[\/]$@','aaa/').'Y';
 					//print preg_match('@[\\\/]$@',"aaa\\").'Y';
-					$remotefile=$section.(preg_match('@[\\\/]$@',$section)?'':'/').preg_replace('@^[\\\/]@','',$file);
+					$remotefile = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').preg_replace('@^[\\\/]@', '', $file);
 					//print 'A'.$remotefile.'A';
-					$newremotefileiso=utf8_decode($remotefile);
+					$newremotefileiso = utf8_decode($remotefile);
 					//print 'Z'.$newremotefileiso.'Z';
-					$is_directory=ftp_isdir($conn_id, $newremotefileiso);
+					$is_directory = ftp_isdir($conn_id, $newremotefileiso);
 				}
 
 
 				print '<tr class="oddeven" height="18">';
 				// Name
 				print '<td>';
-				$newsection=$section.(preg_match('@[\\\/]$@',$section)?'':'/').$file;
-				$newsection=preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@','/',$newsection);	// Change aaa/xxx/.. to new aaa
+				$newsection = $section.(preg_match('@[\\\/]$@', $section) ? '' : '/').$file;
+				$newsection = preg_replace('@[\\\/][^\\\/]+[\\\/]\.\.$@', '/', $newsection); // Change aaa/xxx/.. to new aaa
 				if ($is_directory) print '<a href="'.$_SERVER["PHP_SELF"].'?section='.urlencode($newsection).'&numero_ftp='.$numero_ftp.'">';
 				print $file;
 				if ($is_directory) print '</a>';
 				print '</td>';
 				// Size
 				print '<td align="center" class="nowrap">';
-				if (! $is_directory && ! $is_link) print $vals[4];
+				if (!$is_directory && !$is_link) print $vals[4];
 				else print '&nbsp;';
 				print '</td>';
 				// Date
@@ -590,13 +590,13 @@ 
 				}
 				else if ($is_link)
 				{
-					$newfile=$file;
-					$newfile=preg_replace('/ ->.*/','',$newfile);
+					$newfile = $file;
+					$newfile = preg_replace('/ ->.*/', '', $newfile);
 					print '<a href="'.$_SERVER["PHP_SELF"].'?action=delete&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($newfile).'">'.img_delete().'</a>';
 				}
 				else
 				{
-					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('','file').'</a>';
+					print '<a href="'.$_SERVER["PHP_SELF"].'?action=download&numero_ftp='.$numero_ftp.'&section='.urlencode($section).'&file='.urlencode($file).'">'.img_picto('', 'file').'</a>';
 					print ' &nbsp; ';
 					print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
 					print ' &nbsp; ';
@@ -614,7 +614,7 @@ 
 		print "</table>";
 
 
-		if (! $ok)
+		if (!$ok)
 		{
 		      print $mesg.'<br>'."\n";
 		      setEventMessages($mesg, null, 'errors');
@@ -639,21 +639,21 @@ 
 	}
 	else
 	{
-		$foundsetup=false;
-		$MAXFTP=20;
-		$i=1;
+		$foundsetup = false;
+		$MAXFTP = 20;
+		$i = 1;
 		while ($i <= $MAXFTP)
 		{
-			$paramkey='FTP_NAME_'.$i;
+			$paramkey = 'FTP_NAME_'.$i;
 			//print $paramkey;
-			if (! empty($conf->global->$paramkey))
+			if (!empty($conf->global->$paramkey))
 			{
-				$foundsetup=true;
+				$foundsetup = true;
 				break;
 			}
 			$i++;
 		}
-	    if (! $foundsetup)
+	    if (!$foundsetup)
 	    {
             print $langs->trans("SetupOfFTPClientModuleNotComplete");
 	    }
@@ -669,11 +669,11 @@ 
 // Close FTP connection
 if ($conn_id)
 {
-    if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+    if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
     {
 
     }
-    else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+    else if (!empty($conf->global->FTP_CONNECT_WITH_SSL))
     {
         ftp_close($conn_id);
     }
@@ -700,28 +700,28 @@ 
  * @param	integer	$ftp_passive	Use a passive mode
  * @return	int 	<0 if OK, >0 if KO
  */
-function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive=0)
+function dol_ftp_connect($ftp_server, $ftp_port, $ftp_user, $ftp_password, $section, $ftp_passive = 0)
 {
 	global $langs, $conf;
 
-	$ok=1;
-    $conn_id=null;
+	$ok = 1;
+    $conn_id = null;
 
-	if (! is_numeric($ftp_port))
+	if (!is_numeric($ftp_port))
 	{
-		$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-		$ok=0;
+		$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
+		$ok = 0;
 	}
 
 	if ($ok)
 	{
-		$connecttimeout=(empty($conf->global->FTP_CONNECT_TIMEOUT)?40:$conf->global->FTP_CONNECT_TIMEOUT);
-		if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+		$connecttimeout = (empty($conf->global->FTP_CONNECT_TIMEOUT) ? 40 : $conf->global->FTP_CONNECT_TIMEOUT);
+		if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 		{
 		    dol_syslog('Try to connect with ssh2_ftp');
 		    $tmp_conn_id = ssh2_connect($ftp_server, $ftp_port);
 		}
-		else if (! empty($conf->global->FTP_CONNECT_WITH_SSL))
+		else if (!empty($conf->global->FTP_CONNECT_WITH_SSL))
 		{
 		    dol_syslog('Try to connect with ftp_ssl_connect');
 		    $conn_id = ftp_ssl_connect($ftp_server, $ftp_port, $connecttimeout);
@@ -735,7 +735,7 @@ 
 		{
 			if ($ftp_user)
 			{
-				if (! empty($conf->global->FTP_CONNECT_WITH_SFTP))
+				if (!empty($conf->global->FTP_CONNECT_WITH_SFTP))
 				{
 				    if (ssh2_auth_password($tmp_conn_id, $ftp_user, $ftp_password))
     				{
@@ -743,20 +743,20 @@ 
     					//if ($ftp_passive) ftp_pasv($conn_id, true);
 
     					// Change the dir
-    					$newsectioniso=utf8_decode($section);
+    					$newsectioniso = utf8_decode($section);
     					//ftp_chdir($conn_id, $newsectioniso);
 		                $conn_id = ssh2_sftp($tmp_conn_id);
-		                if (! $conn_id)
+		                if (!$conn_id)
 		                {
-        					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
-    	   				    $ok=0;
+        					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToSFTPAfterSSHAuthentication");
+    	   				    $ok = 0;
         				    $error++;
 		                }
     				}
     				else
     				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
+    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   				    $ok = 0;
     				    $error++;
     				}
 				}
@@ -768,13 +768,13 @@ 
     					if ($ftp_passive) ftp_pasv($conn_id, true);
 
     					// Change the dir
-    					$newsectioniso=utf8_decode($section);
+    					$newsectioniso = utf8_decode($section);
     					ftp_chdir($conn_id, $newsectioniso);
     				}
     				else
     				{
-    					$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
-	   				    $ok=0;
+    					$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServerWithCredentials");
+	   				    $ok = 0;
     				    $error++;
     				}
 				}
@@ -783,12 +783,12 @@ 
 		else
 		{
 		    dol_syslog('FailedToConnectToFTPServer '.$ftp_server.' '.$ftp_port, LOG_ERR);
-			$mesg=$langs->transnoentitiesnoconv("FailedToConnectToFTPServer",$ftp_server,$ftp_port);
-			$ok=0;
+			$mesg = $langs->transnoentitiesnoconv("FailedToConnectToFTPServer", $ftp_server, $ftp_port);
+			$ok = 0;
 		}
 	}
 
-	$arrayresult=array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
+	$arrayresult = array('conn_id'=>$conn_id, 'ok'=>$ok, 'mesg'=>$mesg, 'curdir'=>$section, 'curdiriso'=>$newsectioniso);
 	return $arrayresult;
 }
 
@@ -800,9 +800,9 @@ 
  * @param 		string		$dir			Directory
  * @return		int			1=directory, 0=not a directory
  */
-function ftp_isdir($connect_id,$dir)
+function ftp_isdir($connect_id, $dir)
 {
-	if (@ftp_chdir($connect_id,$dir))
+	if (@ftp_chdir($connect_id, $dir))
 	{
 		ftp_cdup($connect_id);
 		return 1;

dolibarr/htdocs/dav/dav.class.php

Indentation +205 added lines, -205 removed lines

@@ -28,11 +28,11 @@ 
 class CdavLib
 {
 
-	private $db;
+    private $db;
 
-	private $user;
+    private $user;
 
-	private $langs;
+    private $langs;
 
     /**
      * Constructor
@@ -41,25 +41,25 @@ 
      * @param   DoliDB      $db     Database handler
      * @param   Translate   $langs  translation
      */
-	function __construct($user, $db, $langs)
-	{
-		$this->user = $user;
-		$this->db = $db;
-		$this->langs = $langs;
-	}
+    function __construct($user, $db, $langs)
+    {
+        $this->user = $user;
+        $this->db = $db;
+        $this->langs = $langs;
+    }
 
-	/**
-	 * Base sql request for calendar events
-	 *
-	 * @param 	int 		$calid 			Calendard id
-	 * @param 	int|boolean	$oid			Oid
-	 * @param	int|boolean	$ouri			Ouri
-	 * @return string
-	 */
-	public function getSqlCalEvents($calid, $oid=false, $ouri=false)
-	{
-		// TODO : replace GROUP_CONCAT by
-		$sql = 'SELECT
+    /**
+     * Base sql request for calendar events
+     *
+     * @param 	int 		$calid 			Calendard id
+     * @param 	int|boolean	$oid			Oid
+     * @param	int|boolean	$ouri			Ouri
+     * @return string
+     */
+    public function getSqlCalEvents($calid, $oid=false, $ouri=false)
+    {
+        // TODO : replace GROUP_CONCAT by
+        $sql = 'SELECT
 					a.tms AS lastupd,
 					a.*,
 					sp.firstname,
@@ -82,223 +82,223 @@ 
 						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 ?
-		{
-			$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.')
+        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.')
 					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)
+        }
+        else
+        {
+            $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)
-			{
-				$sql.=' AND a.id = '.intval($oid);
-			}
-			else
-			{
-				$sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
-			}
-		}
+        if($oid!==false) {
+            if($ouri===false)
+            {
+                $sql.=' AND a.id = '.intval($oid);
+            }
+            else
+            {
+                $sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
+            }
+        }
 
-		return $sql;
-	}
+        return $sql;
+    }
 
-	/**
-	 * Convert calendar row to VCalendar string
-	 *
-	 * @param 	int		$calid		Calendar id
-	 * @param	Object	$obj		Object id
-	 * @return string
-	 */
-	public function toVCalendar($calid, $obj)
-	{
-		/*$categ = array();
+    /**
+     * Convert calendar row to VCalendar string
+     *
+     * @param 	int		$calid		Calendar id
+     * @param	Object	$obj		Object id
+     * @return string
+     */
+    public function toVCalendar($calid, $obj)
+    {
+        /*$categ = array();
 		if($obj->soc_client)
 		{
 			$nick[] = $obj->soc_code_client;
 			$categ[] = $this->langs->transnoentitiesnoconv('Customer');
 		}*/
 
-		$location=$obj->location;
+        $location=$obj->location;
 
-		// contact address
-		if(empty($location) && !empty($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->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))
-		{
-			$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);
-		}
+        // contact address
+        if(empty($location) && !empty($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[$kAddr] = trim(str_replace(array("\r","\t"),' ', str_replace("\n",' | ', trim($vAddr))));
-		}
-		$address[]='';
-		$address[]='';
+        $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[]='';
+        $address[]='';
 
-		if($obj->percent==-1 && trim($obj->datep)!='')
-			$type='VEVENT';
-		else
-			$type='VTODO';
+        if($obj->percent==-1 && trim($obj->datep)!='')
+            $type='VEVENT';
+        else
+            $type='VTODO';
 
-		$timezone = date_default_timezone_get();
+        $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";
-		else
-			$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')
-			{
-				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";
-			}
-			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')
-			{
-				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";
-			}
-			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";
-		else
-			$caldata.="TRANSP:OPAQUE\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.="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";
+                else
+                    $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";
+        }
+        else
+        {
+            $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";
+                else
+                    $caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,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";
+        else
+            $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";
-		else
-		{
-			$caldata.="STATUS:IN-PROCESS\n";
-			$caldata.="PERCENT-COMPLETE:".$obj->percent."\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.="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;
-	}
+        return $caldata;
+    }
 
-	/**
-	 * getFullCalendarObjects
-	 *
-	 * @param int	 	$calendarId			Calendar id
-	 * @param int		$bCalendarData		Add calendar data
-	 * @return array|string[][]
-	 */
-	public function getFullCalendarObjects($calendarId, $bCalendarData)
-	{
-		$calid = ($calendarId*1);
-		$calevents = array();
+    /**
+     * getFullCalendarObjects
+     *
+     * @param int	 	$calendarId			Calendar id
+     * @param int		$bCalendarData		Add calendar data
+     * @return array|string[][]
+     */
+    public function getFullCalendarObjects($calendarId, $bCalendarData)
+    {
+        $calid = ($calendarId*1);
+        $calevents = array();
 
-		if(! $this->user->rights->agenda->myactions->read)
-			return $calevents;
+        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))
-			return $calevents;
+        if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read))
+            return $calevents;
 
-		$sql = $this->getSqlCalEvents($calid);
+        $sql = $this->getSqlCalEvents($calid);
 
-		$result = $this->db->query($sql);
+        $result = $this->db->query($sql);
 
-		if ($result)
-		{
-			while ($obj = $this->db->fetch_object($result))
-			{
-				$calendardata = $this->toVCalendar($calid, $obj);
+        if ($result)
+        {
+            while ($obj = $this->db->fetch_object($result))
+            {
+                $calendardata = $this->toVCalendar($calid, $obj);
 
-				if($bCalendarData)
-				{
-					$calevents[] = array(
-						'calendardata' => $calendardata,
-						'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
-						'lastmodified' => strtotime($obj->lastupd),
-						'etag' => '"'.md5($calendardata).'"',
-						'calendarid'   => $calendarId,
-						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
-					);
-				}
-				else
-				{
-					$calevents[] = array(
-						// 'calendardata' => $calendardata,  not necessary because etag+size are present
-						'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
-						'lastmodified' => strtotime($obj->lastupd),
-						'etag' => '"'.md5($calendardata).'"',
-						'calendarid'   => $calendarId,
-						'size' => strlen($calendardata),
-						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
-					);
-				}
-			}
-		}
-		return $calevents;
-	}
+                if($bCalendarData)
+                {
+                    $calevents[] = array(
+                        'calendardata' => $calendardata,
+                        'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
+                        'lastmodified' => strtotime($obj->lastupd),
+                        'etag' => '"'.md5($calendardata).'"',
+                        'calendarid'   => $calendarId,
+                        'size' => strlen($calendardata),
+                        'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+                    );
+                }
+                else
+                {
+                    $calevents[] = array(
+                        // 'calendardata' => $calendardata,  not necessary because etag+size are present
+                        'uri' => $obj->id.'-ev-'.CDAV_URI_KEY,
+                        'lastmodified' => strtotime($obj->lastupd),
+                        'etag' => '"'.md5($calendardata).'"',
+                        'calendarid'   => $calendarId,
+                        'size' => strlen($calendardata),
+                        'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
+                    );
+                }
+            }
+        }
+        return $calevents;
+    }
 }

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',
 					);
 				}
 			}

Braces +63 added lines, -52 removed lines

@@ -82,14 +82,15 @@ 
 						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.')
 					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
+		} else
 		{
 			$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)
@@ -105,8 +106,7 @@ 
 			if($ouri===false)
 			{
 				$sql.=' AND a.id = '.intval($oid);
-			}
-			else
+			} else
 			{
 				$sql.=' AND (a.id = '.intval($oid).' OR ac.uuidext = \''.$this->db->escape($ouri).'\')';
 			}
@@ -159,10 +159,11 @@ 
 		$address[]='';
 		$address[]='';
 
-		if($obj->percent==-1 && trim($obj->datep)!='')
-			$type='VEVENT';
-		else
-			$type='VTODO';
+		if($obj->percent==-1 && trim($obj->datep)!='') {
+					$type='VEVENT';
+		} else {
+					$type='VTODO';
+		}
 
 		$timezone = date_default_timezone_get();
 
@@ -174,10 +175,11 @@ 
 		$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";
+		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";
@@ -186,40 +188,42 @@ 
 			$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";
-				else
-					$caldata.="DTEND;VALUE=DATE:".date('Ymd', strtotime($obj->datep)+(25*3600))."\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";
+				}
+			} 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
+		} else
 		{
 			$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";
-				else
-					$caldata.="DTEND;TZID=".$timezone.":".strtr($obj->datep,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";
+				}
+			} 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";
-		else
-			$caldata.="TRANSP:OPAQUE\n";
+		if($obj->transparency==1) {
+					$caldata.="TRANSP:TRANSPARENT\n";
+		} else {
+					$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";
-		else
+		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";
@@ -227,16 +231,22 @@ 
 
 		$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
+		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";
@@ -257,11 +267,13 @@ 
 		$calid = ($calendarId*1);
 		$calevents = array();
 
-		if(! $this->user->rights->agenda->myactions->read)
-			return $calevents;
+		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))
-			return $calevents;
+		if($calid!=$this->user->id && (!isset($this->user->rights->agenda->allactions->read) || !$this->user->rights->agenda->allactions->read)) {
+					return $calevents;
+		}
 
 		$sql = $this->getSqlCalEvents($calid);
 
@@ -284,8 +296,7 @@ 
 						'size' => strlen($calendardata),
 						'component' => strpos($calendardata, 'BEGIN:VEVENT')>0 ? 'vevent' : 'vtodo',
 					);
-				}
-				else
+				} else
 				{
 					$calevents[] = array(
 						// 'calendardata' => $calendardata,  not necessary because etag+size are present

dolibarr/htdocs/dav/dav.lib.php

Indentation +22 added lines, -22 removed lines

@@ -24,19 +24,19 @@ 
 // define CDAV_CONTACT_TAG if not
 if(!defined('CDAV_CONTACT_TAG'))
 {
-	if(isset($conf->global->CDAV_CONTACT_TAG))
-		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-		else
-			define('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(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));
+    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));
 }
 
 
@@ -49,24 +49,24 @@ 
  */
 function dav_admin_prepare_head()
 {
-	global $db, $langs, $conf;
+    global $db, $langs, $conf;
 
-	$h = 0;
-	$head = array();
+    $h = 0;
+    $head = array();
 
-	$head[$h][0] = DOL_URL_ROOT.'/admin/dav.php?id='.$object->id;
-	$head[$h][1] = $langs->trans("WebDAV");
-	$head[$h][2] = 'webdav';
-	$h++;
+    $head[$h][0] = DOL_URL_ROOT.'/admin/dav.php?id='.$object->id;
+    $head[$h][1] = $langs->trans("WebDAV");
+    $head[$h][2] = 'webdav';
+    $h++;
 
-	// 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,'admindav');
+    // 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,'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;
+    return $head;
 }
 

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;
 }

Braces +12 added lines, -10 removed lines

@@ -24,20 +24,22 @@
 // define CDAV_CONTACT_TAG if not
 if(!defined('CDAV_CONTACT_TAG'))
 {
-	if(isset($conf->global->CDAV_CONTACT_TAG))
-		define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-		else
-			define('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(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));
-}
+	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));
+		}
+		}
 
 
 

dolibarr/htdocs/dav/fileserver.php

Indentation +31 added lines, -31 removed lines

@@ -39,8 +39,8 @@ 
 $user = new User($db);
 if(isset($_SERVER['PHP_AUTH_USER']) && $_SERVER['PHP_AUTH_USER']!='')
 {
-	$user->fetch('',$_SERVER['PHP_AUTH_USER']);
-	$user->getrights();
+    $user->fetch('',$_SERVER['PHP_AUTH_USER']);
+    $user->getrights();
 }
 
 // Load translation files required by the page
@@ -48,7 +48,7 @@ 
 
 
 if(empty($conf->dav->enabled))
-	accessforbidden();
+    accessforbidden();
 
 
 // settings
@@ -59,27 +59,27 @@ 
 
 // Authentication callback function
 $authBackend = new \Sabre\DAV\Auth\Backend\BasicCallBack(function ($username, $password) {
-	global $user;
-	global $conf;
-	global $dolibarr_main_authentication;
-
-	if (empty($user->login))
-		return false;
-	if ($user->socid > 0)
-		return false;
-	if ($user->login != $username)
-		return false;
-
-	// 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));
-
-	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
-		return false;
-
-	return true;
+    global $user;
+    global $conf;
+    global $dolibarr_main_authentication;
+
+    if (empty($user->login))
+        return false;
+    if ($user->socid > 0)
+        return false;
+    if ($user->login != $username)
+        return false;
+
+    // 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));
+
+    if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
+        return false;
+
+    return true;
 });
 
 $authBackend->setRealm(constant('DOL_APPLICATION_TITLE'));
@@ -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');
 // 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,12 +135,12 @@ 
 
 // 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));
+    //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');

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);
 

Braces +45 added lines, -19 removed lines

@@ -21,12 +21,28 @@ 
  *      \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';
@@ -47,8 +63,9 @@ 
 $langs->loadLangs(array("main","other"));
 
 
-if(empty($conf->dav->enabled))
+if(empty($conf->dav->enabled)) {
 	accessforbidden();
+}
 
 
 // settings
@@ -63,21 +80,26 @@ 
 	global $conf;
 	global $dolibarr_main_authentication;
 
-	if (empty($user->login))
-		return false;
-	if ($user->socid > 0)
-		return false;
-	if ($user->login != $username)
-		return false;
+	if (empty($user->login)) {
+			return false;
+	}
+	if ($user->socid > 0) {
+			return false;
+	}
+	if ($user->login != $username) {
+			return false;
+	}
 
 	// Authentication mode
-	if (empty($dolibarr_main_authentication))
-		$dolibarr_main_authentication='http,dolibarr';
+	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));
 
-	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username)
-		return false;
+	if (checkLoginPassEntity($username,$password,$entity,$authmode) != $username) {
+			return false;
+	}
 
 	return true;
 });
@@ -131,7 +153,9 @@ 
 // If you want to run the SabreDAV server in a custom location (using mod_rewrite for instance)
 // You can override the baseUri here.
 $baseUri = DOL_URL_ROOT.'/dav/fileserver.php/';
-if (isset($baseUri)) $server->setBaseUri($baseUri);
+if (isset($baseUri)) {
+    $server->setBaseUri($baseUri);
+}
 
 // Add authentication function
 if ((empty($conf->global->DAV_ALLOW_PUBLIC_DIR)
@@ -166,4 +190,6 @@ 
 // And off we go!
 $server->exec();
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+    $db->close();
+}

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

Indentation +796 added lines, -796 removed lines

@@ -30,60 +30,60 @@ 
  */
 class Export
 {
-	/**
+    /**
      * @var DoliDB Database handler.
      */
     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_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;
-	var $hexafiltervalue;
-	var $datatoexport;
-	var $model_name;
+    // To store export modules
+    var $hexa;
+    var $hexafiltervalue;
+    var $datatoexport;
+    var $model_name;
 
-	var $sqlusedforexport;
+    var $sqlusedforexport;
 
 
-	/**
-	 *    Constructor
-	 *
-	 *    @param  	DoliDB		$db		Database handler
-	 */
-	function __construct($db)
-	{
-		$this->db=$db;
-	}
+    /**
+     *    Constructor
+     *
+     *    @param  	DoliDB		$db		Database handler
+     */
+    function __construct($db)
+    {
+        $this->db=$db;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *    Load an exportable dataset
-	 *
-	 *    @param  	User		$user      	Object user making export
-	 *    @param  	string		$filter    	Load a particular dataset only
-	 *    @return	int						<0 if KO, >0 if OK
-	 */
-	function load_arrays($user,$filter='')
-	{
+    /**
+     *    Load an exportable dataset
+     *
+     *    @param  	User		$user      	Object user making export
+     *    @param  	string		$filter    	Load a particular dataset only
+     *    @return	int						<0 if KO, >0 if OK
+     */
+    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);
+        dol_syslog(get_class($this)."::load_arrays user=".$user->id." filter=".$filter);
 
         $i=0;
 
@@ -92,798 +92,798 @@ 
 
         $modulesdir = dolGetModulesDirs();
 
-		foreach($modulesdir as $dir)
-		{
-			// Search available exports
-			$handle=@opendir(dol_osencode($dir));
-			if (is_resource($handle))
-			{
+        foreach($modulesdir as $dir)
+        {
+            // Search available exports
+            $handle=@opendir(dol_osencode($dir));
+            if (is_resource($handle))
+            {
                 // Search module files
-			    while (($file = readdir($handle))!==false)
-				{
-					if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
-					{
-						$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;
-
-						if ($enabled)
-						{
-							// Loading Class
-							$file = $dir.$modulename.".class.php";
-							$classname = $modulename;
-							require_once $file;
-							$module = new $classname($this->db);
-
-							if (isset($module->export_code) && is_array($module->export_code))
-							{
-							    foreach($module->export_code as $r => $value)
-								{
+                while (($file = readdir($handle))!==false)
+                {
+                    if (is_readable($dir.$file) && preg_match("/^(mod.*)\.class\.php$/i",$file,$reg))
+                    {
+                        $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;
+
+                        if ($enabled)
+                        {
+                            // Loading Class
+                            $file = $dir.$modulename.".class.php";
+                            $classname = $modulename;
+                            require_once $file;
+                            $module = new $classname($this->db);
+
+                            if (isset($module->export_code) && is_array($module->export_code))
+                            {
+                                foreach($module->export_code as $r => $value)
+                                {
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-								    if ($filter && ($filter != $module->export_code[$r])) continue;
+                                    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;
 
                                     // Test if permissions are ok
-									$bool=true;
-									if (isset($module->export_permission))
-									{
-										foreach($module->export_permission[$r] as $val)
-										{
-	    									$perm=$val;
-	    									//print_r("$perm[0]-$perm[1]-$perm[2]<br>");
-	    									if (! empty($perm[2]))
-	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else
-	    									{
-	    										$bool=$user->rights->{$perm[0]}->{$perm[1]};
-	    									}
-	    									if ($perm[0]=='user' && $user->admin) $bool=true;
-	    									if (! $bool) break;
-										}
-									}
-									//print $bool." $perm[0]"."<br>";
-
-									// Permissions ok
-									//	          if ($bool)
-									//	          {
-									// Charge fichier lang en rapport
-									$langtoload=$module->getLangFilesArray();
-									if (is_array($langtoload))
-									{
-										foreach($langtoload as $key)
-										{
-											$langs->load($key);
-										}
-									}
-
-									// Module
-									$this->array_export_module[$i]=$module;
-									// Permission
-									$this->array_export_perms[$i]=$bool;
-									// Icon
-									$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];
-									// Libelle du dataset export
-									$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];
-									// 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]:'');
-									// Tableau des entites a exporter (cle=champ, valeur=entite)
-									$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]:'');
-									// Tableau des operations speciales sur champ
-									$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];
-
-									// 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[$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]):''));
-									$i++;
-									//	          }
-								}
-							}
-						}
-					}
-				}
+                                    $bool=true;
+                                    if (isset($module->export_permission))
+                                    {
+                                        foreach($module->export_permission[$r] as $val)
+                                        {
+                                            $perm=$val;
+                                            //print_r("$perm[0]-$perm[1]-$perm[2]<br>");
+                                            if (! empty($perm[2]))
+                                            {
+                                                $bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
+                                            }
+                                            else
+                                            {
+                                                $bool=$user->rights->{$perm[0]}->{$perm[1]};
+                                            }
+                                            if ($perm[0]=='user' && $user->admin) $bool=true;
+                                            if (! $bool) break;
+                                        }
+                                    }
+                                    //print $bool." $perm[0]"."<br>";
+
+                                    // Permissions ok
+                                    //	          if ($bool)
+                                    //	          {
+                                    // Charge fichier lang en rapport
+                                    $langtoload=$module->getLangFilesArray();
+                                    if (is_array($langtoload))
+                                    {
+                                        foreach($langtoload as $key)
+                                        {
+                                            $langs->load($key);
+                                        }
+                                    }
+
+                                    // Module
+                                    $this->array_export_module[$i]=$module;
+                                    // Permission
+                                    $this->array_export_perms[$i]=$bool;
+                                    // Icon
+                                    $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];
+                                    // Libelle du dataset export
+                                    $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];
+                                    // 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]:'');
+                                    // Tableau des entites a exporter (cle=champ, valeur=entite)
+                                    $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]:'');
+                                    // Tableau des operations speciales sur champ
+                                    $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];
+
+                                    // 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[$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]):''));
+                                    $i++;
+                                    //	          }
+                                }
+                            }
+                        }
+                    }
+                }
                 closedir($handle);
-			}
-		}
+            }
+        }
 
-		return 1;
-	}
+        return 1;
+    }
 
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build the sql export request.
-	 *      Arrays this->array_export_xxx are already loaded for required datatoexport
-	 *
-	 *      @param      int		$indice				Indice of export
-	 *      @param      array	$array_selected     Filter fields on array of fields to export
-	 *      @param      array	$array_filterValue  Filter records on array of value for fields
-	 *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
-	 */
-	function build_sql($indice, $array_selected, $array_filterValue)
-	{
+    /**
+     *      Build the sql export request.
+     *      Arrays this->array_export_xxx are already loaded for required datatoexport
+     *
+     *      @param      int		$indice				Indice of export
+     *      @param      array	$array_selected     Filter fields on array of fields to export
+     *      @param      array	$array_filterValue  Filter records on array of value for fields
+     *      @return		string						SQL String. Example "select s.rowid as r_rowid, s.status as s_status from ..."
+     */
+    function build_sql($indice, $array_selected, $array_filterValue)
+    {
         // phpcs:enable
-		// Build the sql request
-		$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
+        // Build the sql request
+        $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.=', ';
-			else $i++;
-
-			if (strpos($key, ' as ')===false) {
-				$newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
-			} else {
-				$newfield=$key;
-			}
-
-			$sql.=$newfield;
-		}
-		$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='';
-			// 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]);
-			}
-			$sql.=$sqlWhere;
-		}
-
-		// Add the order
-		$sql.=$this->array_export_sql_order[$indice];
-
-		// Add the HAVING part.
-		if (is_array($array_filterValue) && !empty($array_filterValue))
-		{
-		    // 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]);
-		    }
-		}
-
-		return $sql;
-	}
+            if ($i > 0) $sql.=', ';
+            else $i++;
+
+            if (strpos($key, ' as ')===false) {
+                $newfield=$key.' as '.str_replace(array('.', '-','(',')'),'_',$key);
+            } else {
+                $newfield=$key;
+            }
+
+            $sql.=$newfield;
+        }
+        $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='';
+            // 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]);
+            }
+            $sql.=$sqlWhere;
+        }
+
+        // Add the order
+        $sql.=$this->array_export_sql_order[$indice];
+
+        // Add the HAVING part.
+        if (is_array($array_filterValue) && !empty($array_filterValue))
+        {
+            // 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]);
+            }
+        }
+
+        return $sql;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build the conditionnal string from filter the query
-	 *
-	 *      @param		string	$TypeField		Type of Field to filter
-	 *      @param		string	$NameField		Name of the field to filter
-	 *      @param		string	$ValueField		Value of the field for filter. Must not be ''
-	 *      @return		string					sql string of then field ex : "field='xxx'>"
-	 */
-	function build_filterQuery($TypeField, $NameField, $ValueField)
-	{
+    /**
+     *      Build the conditionnal string from filter the query
+     *
+     *      @param		string	$TypeField		Type of Field to filter
+     *      @param		string	$NameField		Name of the field to filter
+     *      @param		string	$ValueField		Value of the field for filter. Must not be ''
+     *      @return		string					sql string of then field ex : "field='xxx'>"
+     */
+    function build_filterQuery($TypeField, $NameField, $ValueField)
+    {
         // phpcs:enable
-		//print $TypeField." ".$NameField." ".$ValueField;
-		$InfoFieldList = explode(":", $TypeField);
-		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0]) {
-			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
-				else
-					$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]),"<=").")";
-				}
-				else
-				{
-					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));
-				}
-				break;
-			case 'Duree':
-				break;
-			case 'Numeric':
-				// si le signe -
-				if (strpos($ValueField, "+") > 0)
-				{
-					// mode plage
-					$ValueArray = explode("+", $ValueField);
-					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
-					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else
-				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
-				}
-				break;
-			case 'Boolean':
-				$szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
-				break;
-			case 'Status':
-			case 'List':
-				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
-				else {
+        //print $TypeField." ".$NameField." ".$ValueField;
+        $InfoFieldList = explode(":", $TypeField);
+        // build the input field on depend of the type of file
+        switch ($InfoFieldList[0]) {
+            case 'Text':
+                if (! (strpos($ValueField, '%') === false))
+                    $szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+                else
+                    $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]),"<=").")";
+                }
+                else
+                {
+                    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));
+                }
+                break;
+            case 'Duree':
+                break;
+            case 'Numeric':
+                // si le signe -
+                if (strpos($ValueField, "+") > 0)
+                {
+                    // mode plage
+                    $ValueArray = explode("+", $ValueField);
+                    $szFilterQuery ="(".$NameField.">=".$ValueArray[0];
+                    $szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
+                }
+                else
+                {
+                    if (is_numeric(substr($ValueField,0,1)))
+                        $szFilterQuery=" ".$NameField."=".$ValueField;
+                    else
+                        $szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+                }
+                break;
+            case 'Boolean':
+                $szFilterQuery=" ".$NameField."=".(is_numeric($ValueField) ? $ValueField : ($ValueField =='yes' ? 1: 0) );
+                break;
+            case 'Status':
+            case 'List':
+                if (is_numeric($ValueField))
+                    $szFilterQuery=" ".$NameField."=".$ValueField;
+                else {
                     if (! (strpos($ValueField, '%') === false))
                         $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
                     else
                         $szFilterQuery=" ".$NameField." = '".$ValueField."'";
-				}
-				break;
-			default:
-			    dol_syslog("Error we try to forge an sql export request with a condition on a field with type '".$InfoFieldList[0]."' (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
-		}
-
-		return $szFilterQuery;
-	}
-
-	/**
-	 *	conditionDate
-	 *
-	 *  @param 	string	$Field		Field operand 1
-	 *  @param 	string	$Value		Value operand 2
-	 *  @param 	string	$Sens		Comparison operator
-	 *  @return string
-	 */
-	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;
-		return $Condition;
-	}
+                }
+                break;
+            default:
+                dol_syslog("Error we try to forge an sql export request with a condition on a field with type '".$InfoFieldList[0]."' (defined into module descriptor) but this type is unknown/not supported. It looks like a bug into module descriptor.", LOG_ERR);
+        }
+
+        return $szFilterQuery;
+    }
+
+    /**
+     *	conditionDate
+     *
+     *  @param 	string	$Field		Field operand 1
+     *  @param 	string	$Value		Value operand 2
+     *  @param 	string	$Sens		Comparison operator
+     *  @return string
+     */
+    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;
+        return $Condition;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build an input field used to filter the query
-	 *
-	 *      @param		string	$TypeField		Type of Field to filter. Example: Text, Date, List:c_country:label:rowid, List:c_stcom:label:code, Numeric or Number, Boolean
-	 *      @param		string	$NameField		Name of the field to filter
-	 *      @param		string	$ValueField		Initial value of the field to filter
-	 *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
-	 */
-	function build_filterField($TypeField, $NameField, $ValueField)
-	{
+    /**
+     *      Build an input field used to filter the query
+     *
+     *      @param		string	$TypeField		Type of Field to filter. Example: Text, Date, List:c_country:label:rowid, List:c_stcom:label:code, Numeric or Number, Boolean
+     *      @param		string	$NameField		Name of the field to filter
+     *      @param		string	$ValueField		Initial value of the field to filter
+     *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
+     */
+    function build_filterField($TypeField, $NameField, $ValueField)
+    {
         // phpcs:enable
-		global $conf,$langs;
-
-		$szFilterField='';
-		$InfoFieldList = explode(":", $TypeField);
-
-		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0])
-		{
-			case 'Text':
-			case 'Date':
-				$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.'">';
-				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.'">';
-				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>";
-				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];
-				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');
-				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
-				$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>';
-					$num = $this->db->num_rows($resql);
-
-					$i = 0;
-					if ($num)
-					{
-						while ($i < $num)
-						{
-							$obj = $this->db->fetch_object($resql);
-							if ($obj->label == '-')
-							{
-								// Discard entry '-'
-								$i++;
-								continue;
-							}
-							//var_dump($InfoFieldList[1]);
-							$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);
-							}
-							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);
-							}
-							if (!empty($ValueField) && $ValueField == $obj->rowid)
-							{
-								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else
-							{
-								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
-							}
-							$i++;
-						}
-					}
-					$szFilterField.="</select>";
-
-					$this->db->free($resql);
-				}
-				else dol_print_error($this->db);
-				break;
-		}
-
-		return $szFilterField;
-	}
-
-	/**
-	 *      Build an input field used to filter the query
-	 *
-	 *      @param		string	$TypeField		Type of Field to filter
-	 *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
-	 */
-	function genDocFilter($TypeField)
-	{
+        global $conf,$langs;
+
+        $szFilterField='';
+        $InfoFieldList = explode(":", $TypeField);
+
+        // build the input field on depend of the type of file
+        switch ($InfoFieldList[0])
+        {
+            case 'Text':
+            case 'Date':
+                $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.'">';
+                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.'">';
+                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>";
+                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];
+                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');
+                if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code as code';
+                $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>';
+                    $num = $this->db->num_rows($resql);
+
+                    $i = 0;
+                    if ($num)
+                    {
+                        while ($i < $num)
+                        {
+                            $obj = $this->db->fetch_object($resql);
+                            if ($obj->label == '-')
+                            {
+                                // Discard entry '-'
+                                $i++;
+                                continue;
+                            }
+                            //var_dump($InfoFieldList[1]);
+                            $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);
+                            }
+                            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);
+                            }
+                            if (!empty($ValueField) && $ValueField == $obj->rowid)
+                            {
+                                $szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
+                            }
+                            else
+                            {
+                                $szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
+                            }
+                            $i++;
+                        }
+                    }
+                    $szFilterField.="</select>";
+
+                    $this->db->free($resql);
+                }
+                else dol_print_error($this->db);
+                break;
+        }
+
+        return $szFilterField;
+    }
+
+    /**
+     *      Build an input field used to filter the query
+     *
+     *      @param		string	$TypeField		Type of Field to filter
+     *      @return		string					html string of the input field ex : "<input type=text name=... value=...>"
+     */
+    function genDocFilter($TypeField)
+    {
         global $langs;
 
-		$szMsg='';
-		$InfoFieldList = explode(":", $TypeField);
-		// build the input field on depend of the type of file
-		switch ($InfoFieldList[0]) {
-			case 'Text':
-				$szMsg= $langs->trans('ExportStringFilter');
-				break;
-			case 'Date':
-				$szMsg = $langs->trans('ExportDateFilter');
-				break;
-			case 'Duree':
-				break;
-			case 'Numeric':
-				$szMsg = $langs->trans('ExportNumericFilter');
-				break;
-			case 'Boolean':
-				break;
-			case 'List':
-				break;
-		}
-		return $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');
+                break;
+            case 'Date':
+                $szMsg = $langs->trans('ExportDateFilter');
+                break;
+            case 'Duree':
+                break;
+            case 'Numeric':
+                $szMsg = $langs->trans('ExportNumericFilter');
+                break;
+            case 'Boolean':
+                break;
+            case 'List':
+                break;
+        }
+        return $szMsg;
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *      Build export file.
-	 *      File is built into directory $conf->export->dir_temp.'/'.$user->id
-	 *      Arrays this->array_export_xxx are already loaded for required datatoexport
-	 *
-	 *      @param      User		$user               User that export
-	 *      @param      string		$model              Export format
-	 *      @param      string		$datatoexport       Name of dataset to export
-	 *      @param      array		$array_selected     Filter on array of fields to export
-	 *      @param      array		$array_filterValue  Filter on array of fields with a filter
-	 *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
-	 *      @return		int								<0 if KO, >0 if OK
-	 */
-	function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
- 	{
+    /**
+     *      Build export file.
+     *      File is built into directory $conf->export->dir_temp.'/'.$user->id
+     *      Arrays this->array_export_xxx are already loaded for required datatoexport
+     *
+     *      @param      User		$user               User that export
+     *      @param      string		$model              Export format
+     *      @param      string		$datatoexport       Name of dataset to export
+     *      @param      array		$array_selected     Filter on array of fields to export
+     *      @param      array		$array_filterValue  Filter on array of fields with a filter
+     *      @param		string		$sqlquery			If set, transmit the sql request for select (otherwise, sql request is generated from arrays)
+     *      @return		int								<0 if KO, >0 if OK
+     */
+    function build_file($user, $model, $datatoexport, $array_selected, $array_filterValue, $sqlquery = '')
+        {
         // phpcs:enable
-		global $conf,$langs;
+        global $conf,$langs;
 
-		$indice=0;
-		asort($array_selected);
+        $indice=0;
+        asort($array_selected);
 
-		dol_syslog(get_class($this)."::".__FUNCTION__." ".$model.", ".$datatoexport.", ".implode(",", $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))
-		{
-			$this->error="ErrorBadParameter";
-			return -1;
-		}
+        // Check parameters or context properties
+        if (empty($this->array_export_fields) || ! is_array($this->array_export_fields))
+        {
+            $this->error="ErrorBadParameter";
+            return -1;
+        }
 
-		// Creation of class to export using model ExportXXX
-		$dir = DOL_DOCUMENT_ROOT . "/core/modules/export/";
-		$file = "export_".$model.".modules.php";
-		$classname = "Export".$model;
-		require_once $dir.$file;
-		$objmodel = new $classname($this->db);
+        // Creation of class to export using model ExportXXX
+        $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)
+            {
+                if ($datatoexport == $dataset)
+                {
+                    $indice=$key;
+                    $foundindice++;
+                    //print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
+                    break;
+                }
+            }
+            if (empty($foundindice))
+            {
+                $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);
+        }
+
+        // Run the 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;
+            else
+                $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);
+
+            if ($result >= 0)
+            {
+                // Genere en-tete
+                $objmodel->write_header($outputlangs);
+
+                // Genere ligne de titre
+                $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]))
+                    {
+                        foreach ($this->array_export_special[$indice] as $key => $value)
+                        {
+                            if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
+                            // Operation 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='';
+                            }
+                            // Operation 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';
+                            }
+                            // Operation INVOICEREMAINTOPAY
+                            elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
+                            {
+                                //$alias=$this->array_export_alias[$indice][$key];
+                                $alias=str_replace(array('.', '-','(',')'),'_',$key);
+                                $remaintopay='';
+                                if ($obj->f_rowid > 0)
+                                {
+                                    global $tmpobjforcomputecall;
+                                    if (! is_object($tmpobjforcomputecall))
+                                    {
+                                        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
+                                        $tmpobjforcomputecall=new Facture($this->db);
+                                    }
+                                    $tmpobjforcomputecall->id = $obj->f_rowid;
+                                    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
+                                    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
+                                }
+                                $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;
+
+                                $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]);
+                }
+
+                // Genere en-tete
+                $objmodel->write_footer($outputlangs);
+
+                // Close file
+                $objmodel->close_file();
+
+                return 1;
+            }
+            else
+            {
+                $this->error=$objmodel->error;
+                dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
+                return -1;
+            }
+        }
+        else
+        {
+            $this->error=$this->db->error()." - sql=".$sql;
+            return -1;
+        }
+    }
+
+    /**
+     *  Save an export model in database
+     *
+     *  @param		User	$user 	Object user that save
+     *  @return		int				<0 if KO, >0 if OK
+     */
+    function create($user)
+    {
+        global $conf;
+
+        dol_syslog("Export.class.php::create");
+
+        $this->db->begin();
+
+        $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.= ")";
+
+        dol_syslog(get_class($this)."::create", LOG_DEBUG);
+        $resql=$this->db->query($sql);
+        if ($resql)
+        {
+            $this->db->commit();
+            return 1;
+        }
         else
-		{
-			// Define value for indice from $datatoexport
-			$foundindice=0;
-			foreach($this->array_export_code as $key => $dataset)
-			{
-				if ($datatoexport == $dataset)
-				{
-					$indice=$key;
-					$foundindice++;
-					//print "Found indice = ".$indice." for dataset=".$datatoexport."\n";
-					break;
-				}
-			}
-			if (empty($foundindice))
-			{
-				$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);
-		}
-
-		// Run the 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;
-			else
-				$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);
-
-			if ($result >= 0)
-			{
-				// Genere en-tete
-				$objmodel->write_header($outputlangs);
-
-				// Genere ligne de titre
-				$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]))
-					{
-						foreach ($this->array_export_special[$indice] as $key => $value)
-						{
-							if (! array_key_exists($key, $array_selected)) continue;		// Field not selected
-							// Operation 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='';
-							}
-							// Operation 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';
-							}
-							// Operation INVOICEREMAINTOPAY
-							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
-							{
-								//$alias=$this->array_export_alias[$indice][$key];
-								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								$remaintopay='';
-								if ($obj->f_rowid > 0)
-								{
-								    global $tmpobjforcomputecall;
-								    if (! is_object($tmpobjforcomputecall))
-								    {
-								        include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
-								        $tmpobjforcomputecall=new Facture($this->db);
-								    }
-								    $tmpobjforcomputecall->id = $obj->f_rowid;
-								    $tmpobjforcomputecall->total_ttc = $obj->f_total_ttc;
-								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
-								}
-								$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;
-
-							    $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]);
-				}
-
-				// Genere en-tete
-				$objmodel->write_footer($outputlangs);
-
-				// Close file
-				$objmodel->close_file();
-
-        		return 1;
-			}
-			else
-			{
-				$this->error=$objmodel->error;
-				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
-				return -1;
-			}
-		}
-		else
-		{
-			$this->error=$this->db->error()." - sql=".$sql;
-			return -1;
-		}
-	}
-
-	/**
-	 *  Save an export model in database
-	 *
-	 *  @param		User	$user 	Object user that save
-	 *  @return		int				<0 if KO, >0 if OK
-	 */
-	function create($user)
-	{
-		global $conf;
-
-		dol_syslog("Export.class.php::create");
-
-		$this->db->begin();
-
-		$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.= ")";
-
-		dol_syslog(get_class($this)."::create", LOG_DEBUG);
-		$resql=$this->db->query($sql);
-		if ($resql)
-		{
-			$this->db->commit();
-			return 1;
-		}
-		else
-		{
-			$this->error=$this->db->lasterror();
-			$this->errno=$this->db->lasterrno();
-			$this->db->rollback();
-			return -1;
-		}
-	}
-
-	/**
-	 *  Load an export profil from database
-	 *
-	 *  @param		int		$id		Id of profil to load
-	 *  @return		int				<0 if KO, >0 if OK
-	 */
-	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;
-
-		dol_syslog("Export::fetch", LOG_DEBUG);
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$obj = $this->db->fetch_object($result);
-			if ($obj)
-			{
-				$this->id				= $obj->rowid;
-				$this->model_name		= $obj->label;
-				$this->datatoexport		= $obj->type;
-
-				$this->hexa				= $obj->field;
-				$this->hexafiltervalue	= $obj->filter;
-
-				return 1;
-			}
-			else
-			{
-				$this->error="ModelNotFound";
-				return -2;
-			}
-		}
-		else
-		{
-			dol_print_error($this->db);
-			return -3;
-		}
-	}
-
-
-	/**
-	 *	Delete object in database
-	 *
-	 *	@param      User		$user        	User that delete
-	 *  @param      int			$notrigger	    0=launch triggers after, 1=disable triggers
-	 *	@return		int							<0 if KO, >0 if OK
-	 */
-	function delete($user, $notrigger=0)
-	{
-		global $conf, $langs;
-		$error=0;
-
-		$sql = "DELETE FROM ".MAIN_DB_PREFIX."export_model";
-		$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 (! $error)
-		{
-			if (! $notrigger)
-			{
-				// Uncomment this and change MYOBJECT to your own tag if you
-				// want this action call a trigger.
-
-				//// Call triggers
-				//include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
-				//$interface=new Interfaces($this->db);
-				//$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
-				//if ($result < 0) { $error++; $this->errors=$interface->errors; }
-				//// End call triggers
-			}
-		}
-
-		// Commit or rollback
-		if ($error)
-		{
-			foreach($this->errors as $errmsg)
-			{
-				dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
-				$this->error.=($this->error?', '.$errmsg:$errmsg);
-			}
-			$this->db->rollback();
-			return -1*$error;
-		}
-		else
-		{
-			$this->db->commit();
-			return 1;
-		}
-	}
+        {
+            $this->error=$this->db->lasterror();
+            $this->errno=$this->db->lasterrno();
+            $this->db->rollback();
+            return -1;
+        }
+    }
+
+    /**
+     *  Load an export profil from database
+     *
+     *  @param		int		$id		Id of profil to load
+     *  @return		int				<0 if KO, >0 if OK
+     */
+    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;
+
+        dol_syslog("Export::fetch", LOG_DEBUG);
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $obj = $this->db->fetch_object($result);
+            if ($obj)
+            {
+                $this->id				= $obj->rowid;
+                $this->model_name		= $obj->label;
+                $this->datatoexport		= $obj->type;
+
+                $this->hexa				= $obj->field;
+                $this->hexafiltervalue	= $obj->filter;
+
+                return 1;
+            }
+            else
+            {
+                $this->error="ModelNotFound";
+                return -2;
+            }
+        }
+        else
+        {
+            dol_print_error($this->db);
+            return -3;
+        }
+    }
+
+
+    /**
+     *	Delete object in database
+     *
+     *	@param      User		$user        	User that delete
+     *  @param      int			$notrigger	    0=launch triggers after, 1=disable triggers
+     *	@return		int							<0 if KO, >0 if OK
+     */
+    function delete($user, $notrigger=0)
+    {
+        global $conf, $langs;
+        $error=0;
+
+        $sql = "DELETE FROM ".MAIN_DB_PREFIX."export_model";
+        $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 (! $error)
+        {
+            if (! $notrigger)
+            {
+                // Uncomment this and change MYOBJECT to your own tag if you
+                // want this action call a trigger.
+
+                //// Call triggers
+                //include_once DOL_DOCUMENT_ROOT . '/core/class/interfaces.class.php';
+                //$interface=new Interfaces($this->db);
+                //$result=$interface->run_triggers('MYOBJECT_DELETE',$this,$user,$langs,$conf);
+                //if ($result < 0) { $error++; $this->errors=$interface->errors; }
+                //// End call triggers
+            }
+        }
+
+        // Commit or rollback
+        if ($error)
+        {
+            foreach($this->errors as $errmsg)
+            {
+                dol_syslog(get_class($this)."::delete ".$errmsg, LOG_ERR);
+                $this->error.=($this->error?', '.$errmsg:$errmsg);
+            }
+            $this->db->rollback();
+            return -1*$error;
+        }
+        else
+        {
+            $this->db->commit();
+            return 1;
+        }
+    }
 
     // phpcs:disable PEAR.NamingConventions.ValidFunctionName.NotCamelCaps
-	/**
-	 *	Output list all export models
-	 *  TODO Move this into a class htmlxxx.class.php
-	 *
-	 *	@return	void
-	 */
-	function list_export_model()
-	{
+    /**
+     *	Output list all export models
+     *  TODO Move this into a class htmlxxx.class.php
+     *
+     *	@return	void
+     */
+    function list_export_model()
+    {
         // phpcs:enable
-		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";
-
-		$result = $this->db->query($sql);
-		if ($result)
-		{
-			$num = $this->db->num_rows($result);
-			$i = 0;
-			while ($i < $num)
-			{
-				$obj = $this->db->fetch_object($result);
-				$keyModel = array_search($obj->type, $this->array_export_code);
-				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 $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]);
-				print '</td>';
-				//print '<td>'.$obj->type.$keyModel.'</td>';
-				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>';
-				}
-				// suppression de l'export
-				print '<td align="right">';
-				print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteprof&id='.$obj->rowid.'">';
-				print img_delete();
-				print '</a>';
-				print "</tr>";
-
-				$i++;
-			}
-		}
-		else {
-			dol_print_error($this->db);
-		}
-	}
+        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";
+
+        $result = $this->db->query($sql);
+        if ($result)
+        {
+            $num = $this->db->num_rows($result);
+            $i = 0;
+            while ($i < $num)
+            {
+                $obj = $this->db->fetch_object($result);
+                $keyModel = array_search($obj->type, $this->array_export_code);
+                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 $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]);
+                print '</td>';
+                //print '<td>'.$obj->type.$keyModel.'</td>';
+                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>';
+                }
+                // suppression de l'export
+                print '<td align="right">';
+                print '<a href="'.$_SERVER["PHP_SELF"].'?action=deleteprof&id='.$obj->rowid.'">';
+                print img_delete();
+                print '</a>';
+                print "</tr>";
+
+                $i++;
+            }
+        }
+        else {
+            dol_print_error($this->db);
+        }
+    }
 }

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">';

Braces +127 added lines, -80 removed lines

@@ -108,8 +108,12 @@ 
 						// 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;
+						if ($part == 'propale') {
+						    $part='propal';
+						}
+						if (empty($conf->$part->enabled)) {
+						    $enabled=false;
+						}
 
 						if ($enabled)
 						{
@@ -124,10 +128,14 @@ 
 							    foreach($module->export_code as $r => $value)
 								{
                                     //print $i.'-'.$filter.'-'.$modulename.'-'.join(',',$module->export_code).'<br>';
-								    if ($filter && ($filter != $module->export_code[$r])) continue;
+								    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;
@@ -140,13 +148,16 @@ 
 	    									if (! empty($perm[2]))
 	    									{
 	    										$bool=$user->rights->{$perm[0]}->{$perm[1]}->{$perm[2]};
-	    									}
-	    									else
+	    									} else
 	    									{
 	    										$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>";
@@ -229,10 +240,19 @@ 
 		//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.=', ';
-			else $i++;
+			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);
@@ -251,8 +271,12 @@ 
 			// 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 (preg_match('/GROUP_CONCAT/i', $key)) {
+			        continue;
+			    }
+				if ($value != '') {
+				    $sqlWhere.=" and ".$this->build_filterQuery($this->array_export_TypeFields[$indice][$key], $key, $array_filterValue[$key]);
+				}
 			}
 			$sql.=$sqlWhere;
 		}
@@ -266,7 +290,9 @@ 
 		    // 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,10 +316,11 @@ 
 		// build the input field on depend of the type of file
 		switch ($InfoFieldList[0]) {
 			case 'Text':
-				if (! (strpos($ValueField, '%') === false))
-					$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
-				else
-					$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+				if (! (strpos($ValueField, '%') === false)) {
+									$szFilterQuery.=" ".$NameField." LIKE '".$ValueField."'";
+				} else {
+									$szFilterQuery.=" ".$NameField." = '".$ValueField."'";
+				}
 				break;
 			case 'Date':
 				if (strpos($ValueField, "+") > 0)
@@ -302,13 +329,13 @@ 
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery ="(".$this->conditionDate($NameField,trim($ValueArray[0]),">=");
 					$szFilterQuery.=" AND ".$this->conditionDate($NameField,trim($ValueArray[1]),"<=").")";
-				}
-				else
+				} else
 				{
-					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));
+					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));
+					}
 				}
 				break;
 			case 'Duree':
@@ -321,13 +348,13 @@ 
 					$ValueArray = explode("+", $ValueField);
 					$szFilterQuery ="(".$NameField.">=".$ValueArray[0];
 					$szFilterQuery.=" AND ".$NameField."<=".$ValueArray[1].")";
-				}
-				else
+				} else
 				{
-					if (is_numeric(substr($ValueField,0,1)))
-						$szFilterQuery=" ".$NameField."=".$ValueField;
-					else
-						$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+					if (is_numeric(substr($ValueField,0,1))) {
+											$szFilterQuery=" ".$NameField."=".$ValueField;
+					} else {
+											$szFilterQuery=" ".$NameField.substr($ValueField,0,1).substr($ValueField,1);
+					}
 				}
 				break;
 			case 'Boolean':
@@ -335,13 +362,14 @@ 
 				break;
 			case 'Status':
 			case 'List':
-				if (is_numeric($ValueField))
-					$szFilterQuery=" ".$NameField."=".$ValueField;
-				else {
-                    if (! (strpos($ValueField, '%') === false))
-                        $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
-                    else
-                        $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+				if (is_numeric($ValueField)) {
+									$szFilterQuery=" ".$NameField."=".$ValueField;
+				} else {
+                    if (! (strpos($ValueField, '%') === false)) {
+                                            $szFilterQuery=" ".$NameField." LIKE '".$ValueField."'";
+                    } else {
+                                            $szFilterQuery=" ".$NameField." = '".$ValueField."'";
+                    }
 				}
 				break;
 			default:
@@ -362,9 +390,13 @@ 
 	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;
 	}
 
@@ -399,21 +431,30 @@ 
 			    $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 ';
+				if ($ValueField=='') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="">&nbsp;</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='yes' || $ValueField == '1') $szFilterField.=' selected ';
+				if ($ValueField=='yes' || $ValueField == '1') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="1">'.yn(1).'</option>';
 
 				$szFilterField.='<option ';
-				if ($ValueField=='no' || $ValueField=='0') $szFilterField.=' selected ';
+				if ($ValueField=='no' || $ValueField=='0') {
+				    $szFilterField.=' selected ';
+				}
 				$szFilterField.=' value="0">'.yn(0).'</option>';
 				$szFilterField.="</select>";
 				break;
@@ -422,13 +463,18 @@ 
 				// 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];
-				else
-					$keyList='rowid';
+				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');
-				if ($InfoFieldList[1] == 'c_country') $sql = 'SELECT '.$keyList.' as rowid, '.$InfoFieldList[2].' as label, code 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];
 
 				$resql = $this->db->query($sql);
@@ -466,8 +512,7 @@ 
 							if (!empty($ValueField) && $ValueField == $obj->rowid)
 							{
 								$szFilterField.='<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
-							}
-							else
+							} else
 							{
 								$szFilterField.='<option value="'.$obj->rowid.'" >'.$labeltoshow.'</option>';
 							}
@@ -477,8 +522,9 @@ 
 					$szFilterField.="</select>";
 
 					$this->db->free($resql);
+				} else {
+				    dol_print_error($this->db);
 				}
-				else dol_print_error($this->db);
 				break;
 		}
 
@@ -556,8 +602,9 @@ 
 		require_once $dir.$file;
 		$objmodel = new $classname($this->db);
 
-		if (! empty($sqlquery)) $sql = $sqlquery;
-        else
+		if (! empty($sqlquery)) {
+		    $sql = $sqlquery;
+		} else
 		{
 			// Define value for indice from $datatoexport
 			$foundindice=0;
@@ -586,10 +633,11 @@ 
 		if ($resql)
 		{
 			//$this->array_export_label[$indice]
-			if ($conf->global->EXPORT_PREFIX_SPEC)
-				$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
-			else
-				$filename="export_".$datatoexport;
+			if ($conf->global->EXPORT_PREFIX_SPEC) {
+							$filename=$conf->global->EXPORT_PREFIX_SPEC."_".$datatoexport;
+			} else {
+							$filename="export_".$datatoexport;
+			}
 			$filename.='.'.$objmodel->getDriverExtension();
 			$dirname=$conf->export->dir_temp.'/'.$user->id;
 
@@ -614,20 +662,27 @@ 
 					{
 						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')
 							{
 								//$alias=$this->array_export_alias[$indice][$key];
 								$alias=str_replace(array('.', '-','(',')'),'_',$key);
-								if ($obj->$alias < 0) $obj->$alias='';
+								if ($obj->$alias < 0) {
+								    $obj->$alias='';
+								}
 							}
 							// Operation 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';
+								if ($obj->$alias < 0) {
+								    $obj->$alias='0';
+								}
 							}
 							// Operation INVOICEREMAINTOPAY
 							elseif ($this->array_export_special[$indice][$key]=='getRemainToPay')
@@ -648,8 +703,7 @@ 
 								    $remaintopay=$tmpobjforcomputecall->getRemainToPay();
 								}
 								$obj->$alias=$remaintopay;
-							}
-							else
+							} 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];
@@ -672,15 +726,13 @@ 
 				$objmodel->close_file();
 
         		return 1;
-			}
-			else
+			} else
 			{
 				$this->error=$objmodel->error;
 				dol_syslog("Export::build_file Error: ".$this->error, LOG_ERR);
 				return -1;
 			}
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->error()." - sql=".$sql;
 			return -1;
@@ -723,8 +775,7 @@ 
 		{
 			$this->db->commit();
 			return 1;
-		}
-		else
+		} else
 		{
 			$this->error=$this->db->lasterror();
 			$this->errno=$this->db->lasterrno();
@@ -760,14 +811,12 @@ 
 				$this->hexafiltervalue	= $obj->filter;
 
 				return 1;
-			}
-			else
+			} else
 			{
 				$this->error="ModelNotFound";
 				return -2;
 			}
-		}
-		else
+		} else
 		{
 			dol_print_error($this->db);
 			return -3;
@@ -822,8 +871,7 @@ 
 			}
 			$this->db->rollback();
 			return -1*$error;
-		}
-		else
+		} else
 		{
 			$this->db->commit();
 			return 1;
@@ -881,8 +929,7 @@ 
 
 				$i++;
 			}
-		}
-		else {
+		} else {
 			dol_print_error($this->db);
 		}
 	}