Dolibarr / dolibarr

htdocs/public/notice.php

Braces +8 added lines, -5 removed lines

@@ -38,13 +38,16 @@
 {
     print 'Sorry, it seems your internet connexion is off.<br>';
     print 'You need to be connected to network to use this software.<br>';
-}
-else
+} else
 {
     $langs->load("error");
     $langs->load("other");
     
-    if (GETPOST('transphrase')) print GETPOST('transphrase'); 
-    if (GETPOST('transkey')) print $langs->trans(GETPOST('transkey'));
-}
+    if (GETPOST('transphrase')) {
+    	print GETPOST('transphrase');
+    }
+    if (GETPOST('transkey')) {
+    	print $langs->trans(GETPOST('transkey'));
+    }
+    }
 

htdocs/public/websites/styles.css.php

Braces +16 added lines, -7 removed lines

@@ -24,9 +24,15 @@ 
 define('NOTOKENRENEWAL',1); // Disables token renewal
 define("NOLOGIN",1);
 define("NOCSRFCHECK",1);	// We accept to go on this page from external web site.
-if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
 
 /**
  * Header empty
@@ -59,7 +65,9 @@ 
  */
 
 $appli=constant('DOL_APPLICATION_TITLE');
-if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
+	$appli=$conf->global->MAIN_APPLICATION_TITLE;
+}
 
 //print 'Directory with '.$appli.' websites.<br>';
 
@@ -73,8 +81,7 @@ 
     {
         $object->fetch($websiteid);
         $website=$object->ref;
-    }
-    else
+    } else
     {
         $object->fetch(0, $website);
     }
@@ -142,5 +149,7 @@ 
 require_once $original_file_osencoded;
 
 
-if (is_object($db)) $db->close();
+if (is_object($db)) {
+	$db->close();
+}
 

htdocs/public/donations/donateurs_code.php

Braces +6 added lines, -7 removed lines

@@ -42,7 +42,9 @@ 
 require_once DOL_DOCUMENT_ROOT .'/don/class/don.class.php';
 
 // Security check
-if (empty($conf->don->enabled)) accessforbidden('',0,0,1);
+if (empty($conf->don->enabled)) {
+	accessforbidden('',0,0,1);
+}
 
 
 $langs->load("donations");
@@ -85,8 +87,7 @@ 
 			if ($objp->public)
 			{
 				print "<td>".dolGetFirstLastname($objp->firstname, $objp->lastname)." ".$objp->societe."</td>\n";
-			}
-			else
+			} else
 			{
 				print "<td>Anonyme Anonyme</td>\n";
 			}
@@ -97,13 +98,11 @@ 
 		}
 		print "</table>";
 
-	}
-	else
+	} else
 	{
 		print "Aucun don publique";
 	}
-}
-else
+} else
 {
 	dol_print_error($db);
 }

htdocs/webservices/server_user.php

Braces +39 added lines, -39 removed lines

@@ -20,7 +20,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
@@ -193,8 +195,7 @@ 
 foreach($extrafields->attribute_label as $key=>$label)
 {
 	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
 
 	$extrafield_array['contact_options_'.$key]=array('name'=>'contact_options_'.$key,'type'=>$type);
 }
@@ -306,7 +307,9 @@ 
 
     dol_syslog("Function: getUser login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -365,14 +368,12 @@ 
 						'canvas' => $user->canvas
                     )
                 );
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -401,7 +402,9 @@ 
 
 	dol_syslog("Function: getListOfGroups login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -419,8 +422,7 @@ 
 		if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->global->MULTICOMPANY_TRANSVERSE_MODE || ($user->admin && ! $user->entity)))
 		{
 			$sql.= " WHERE g.entity IS NOT NULL";
-		}
-		else
+		} else
 		{
 			$sql.= " WHERE g.entity IN (0,".$conf->entity.")";
 		}
@@ -437,8 +439,7 @@ 
 				$arraygroups[]=array('id'=>$obj->rowid,'name'=>$obj->name,'datec'=>$obj->datec,'nb'=>$obj->nb);
 				$i++;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno();
@@ -452,8 +453,7 @@ 
 		'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
 		'groups'=>$arraygroups
 		);
-	}
-	else
+	} else
 	{
 		$objectresp = array(
 		'result'=>array('result_code' => 'OK', 'result_label' => ''),
@@ -478,7 +478,9 @@ 
 
 	dol_syslog("Function: createUserFromThirdparty login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -486,7 +488,9 @@ 
 
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid=$fuser->societe_id;
+	}
 
 	if (! $error && ! $thirdpartywithuser)
 	{
@@ -519,8 +523,7 @@ 
 				{
 					$error++;
 					$errorcode='ALREADY_EXIST'; $errorlabel='Object not create : company or contact exists '.$thirdpartywithuser['email'];
-				}
-				else
+				} else
 				{
 					$db->begin();
 					/*
@@ -619,16 +622,15 @@ 
 							{
 								$edituser->setPassword($fuser,trim($thirdpartywithuser['password']));
 
-								if($thirdpartywithuser['group_id'] > 0 )
-									$edituser->SetInGroup($thirdpartywithuser['group_id'],$conf->entity);
-							}
-							else
+								if($thirdpartywithuser['group_id'] > 0 ) {
+																	$edituser->SetInGroup($thirdpartywithuser['group_id'],$conf->entity);
+								}
+							} else
 							{
 								$error++;
 								$errorcode='NOT_CREATE'; $errorlabel='Object not create : '.$edituser->error;
 							}
-						}
-						else
+						} else
 						{
 							$error++;
 							$errorcode='NOT_CREATE'; $errorlabel='Object not create : '.$contact->error;
@@ -639,22 +641,19 @@ 
 							$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>'SUCCESS'),'id'=>$socid_return);
 							$error=0;
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$errors=($thirdparty->error?array($thirdparty->error):$thirdparty->errors);
 					}
 				}
-			}
-			else
+			} else
 			{
 				// retour creation KO
 				$error++;
 				$errorcode='NOT_CREATE'; $errorlabel='Object not create';
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -686,7 +685,9 @@ 
 
 	dol_syslog("Function: setUserPassword login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -694,7 +695,9 @@ 
 
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid=$fuser->societe_id;
+	}
 
 	if (! $error && ! $shortuser)
 	{
@@ -719,21 +722,18 @@ 
 						'result'=>array('result_code' => 'OK', 'result_label' => ''),
 						'groups'=>$arraygroups
 					);
-				}
-				else
+				} else
 				{
 					$error++;
 					$errorcode='NOT_MODIFIED'; $errorlabel='Error when changing password';
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='User not found';
 			}
 
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';

htdocs/webservices/server_invoice.php

Braces +48 added lines, -31 removed lines

@@ -21,7 +21,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';		// Include SOAP
@@ -292,7 +294,9 @@ 
 
 	dol_syslog("Function: getInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -369,14 +373,12 @@ 
 			        	'payment_mode_id' => $invoice->mode_reglement_id?$invoice->mode_reglement_id:'',
 			        	'lines' => $linesresp
 			        ));
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -405,7 +407,9 @@ 
 
 	dol_syslog("Function: getInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -413,7 +417,9 @@ 
     $error=0;
     $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->socid) $socid=$fuser->socid;
+	if ($fuser->socid) {
+		$socid=$fuser->socid;
+	}
 
 	// Check parameters
 	if (! $error && empty($idthirdparty))
@@ -429,7 +435,9 @@ 
 		$sql ='SELECT f.rowid as facid, facnumber as ref, ref_ext, type, fk_statut as status, total_ttc, total, tva';
 		$sql.=' FROM '.MAIN_DB_PREFIX.'facture as f';
 		$sql.=" WHERE f.entity = ".$conf->entity;
-		if ($idthirdparty != 'all' ) $sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		if ($idthirdparty != 'all' ) {
+			$sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -510,8 +518,7 @@ 
 		        'invoices'=>$linesinvoice
 
 			);
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();
@@ -543,7 +550,9 @@ 
     dol_syslog("Function: createInvoice login=".$authentication['login']." id=".$invoice->id.
     		", ref=".$invoice->ref.", ref_ext=".$invoice->ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -575,13 +584,17 @@ 
         if ($res > 0) {
     	    $new_invoice->mode_reglement_id = ! empty($invoice['payment_mode_id'])?$invoice['payment_mode_id']:$soc->mode_reglement_id;
             $new_invoice->cond_reglement_id  = $soc->cond_reglement_id; 
+        } else {
+        	$new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
         }
-        else $new_invoice->mode_reglement_id = $invoice['payment_mode_id'];
 
         // Trick because nusoap does not store data with same structure if there is one or several lines
         $arrayoflines=array();
-        if (isset($invoice['lines']['line'][0])) $arrayoflines=$invoice['lines']['line'];
-        else $arrayoflines=$invoice['lines'];
+        if (isset($invoice['lines']['line'][0])) {
+        	$arrayoflines=$invoice['lines']['line'];
+        } else {
+        	$arrayoflines=$invoice['lines'];
+        }
 
         foreach($arrayoflines as $key => $line)
         {
@@ -612,9 +625,11 @@ 
             $error++;
         }
 
-        if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED)   // We want invoice to have status validated
+        if (!$error && $invoice['status'] == Facture::STATUS_VALIDATED) {
+        	// We want invoice to have status validated
         {
             $result=$new_invoice->validate($fuser);
+        }
             if ($result < 0)
             {
                 $error++;
@@ -626,8 +641,7 @@ 
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_invoice->id,
             		'ref'=>$new_invoice->ref,'ref_ext'=>$new_invoice->ref_ext);
-        }
-        else
+        } else
         {
             $db->rollback();
             $error++;
@@ -664,14 +678,18 @@ 
 	dol_syslog("Function: createInvoiceFromOrder login=".$authentication['login']." id=".$id_order.
 			", ref=".$ref_order.", ref_ext=".$ref_ext_order);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
 	$error=0;
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
-    if ($fuser->socid) $socid=$fuser->socid;
+    if ($fuser->socid) {
+    	$socid=$fuser->socid;
+    }
 
 	// Check parameters
 	if (empty($id_order) && empty($ref_order) && empty($ref_ext_order))	{
@@ -709,14 +727,12 @@ 
 					}
 					
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id_order.' nor ref='.$ref_order.' nor ref_ext='.$ref_ext_order;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -726,8 +742,7 @@ 
 	if ($error)
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-	else
+	} else
 	{
 		$objectresp= array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref,'ref_ext'=>$newobject->ref_ext);
 	}
@@ -749,7 +764,9 @@ 
 	dol_syslog("Function: updateInvoice login=".$authentication['login']." id=".$invoice['id'].
     		", ref=".$invoice['ref'].", ref_ext=".$invoice['ref_ext']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -796,8 +813,9 @@ 
 				{
 					$result = $object->set_paid($fuser,$invoice->close_code,$invoice->close_note);			
 				}
-				if ($invoice['status'] == Facture::STATUS_ABANDONED)
-					$result = $object->set_canceled($fuser,$invoice->close_code,$invoice->close_note);
+				if ($invoice['status'] == Facture::STATUS_ABANDONED) {
+									$result = $object->set_canceled($fuser,$invoice->close_code,$invoice->close_note);
+				}
 			}
 		}
 	
@@ -810,8 +828,7 @@ 
 					'ref'=>$object->ref,
 					'ref_ext'=>$object->ref_ext
 			);
-		}
-		elseif ($objectfound)
+		} elseif ($objectfound)
 		{
 			$db->rollback();
 			$error++;

htdocs/webservices/server_actioncomm.php

Braces +22 added lines, -19 removed lines

@@ -23,7 +23,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once("../master.inc.php");
 require_once(NUSOAP_PATH.'/nusoap.php');		// Include SOAP
@@ -121,8 +123,7 @@ 
 foreach($extrafields->attribute_label as $key=>$label)
 {
 	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
 
 	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
@@ -249,7 +250,9 @@ 
 
     dol_syslog("Function: getActionComm login=".$authentication['login']." id=".$id);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -316,14 +319,12 @@ 
                 $objectresp = array(
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncomm'=>$actioncomm_result_fields);
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -351,7 +352,9 @@ 
 
 	dol_syslog("Function: getListActionCommType login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -378,14 +381,12 @@ 
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'actioncommtypes'=>$resultarray);
 
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -416,7 +417,9 @@ 
 
 	dol_syslog("Function: createActionComm login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -466,8 +469,7 @@ 
 		{
 			$db->commit();
 			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id);
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			$error++;
@@ -499,7 +501,9 @@ 
 
 	dol_syslog("Function: updateActionComm login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -563,8 +567,7 @@ 
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'id'=>$object->id
 			);
-		}
-		elseif ($objectfound)
+		} elseif ($objectfound)
 		{
 			$db->rollback();
 			$error++;

htdocs/webservices/server_productorservice.php

Braces +80 added lines, -55 removed lines

@@ -23,7 +23,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
@@ -140,8 +142,7 @@ 
 foreach($extrafields->attribute_label as $key=>$label)
 {
 	$type =$extrafields->attribute_type[$key];
-	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';}
-	else {$type='xsd:string';}
+	if ($type=='date' || $type=='datetime') {$type='xsd:dateTime';} else {$type='xsd:string';}
 
 	$extrafield_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
@@ -341,7 +342,9 @@ 
     $langcode=($lang?$lang:(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
     $langs->setDefaultLang($langcode);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -376,9 +379,15 @@ 
             	$pdir = get_exdir($product->id,2,0,0,$product,'product') . $product->ref . "/";
             	$dir = $dir . '/'. $pdir;
 
-            	if (! empty($product->multilangs[$langs->defaultlang]["label"]))     		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["description"]))     	$product->description =  $product->multilangs[$langs->defaultlang]["description"];
-            	if (! empty($product->multilangs[$langs->defaultlang]["note"]))     		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
+            	if (! empty($product->multilangs[$langs->defaultlang]["label"])) {
+            		$product->label =  $product->multilangs[$langs->defaultlang]["label"];
+            	}
+            	if (! empty($product->multilangs[$langs->defaultlang]["description"])) {
+            		$product->description =  $product->multilangs[$langs->defaultlang]["description"];
+            	}
+            	if (! empty($product->multilangs[$langs->defaultlang]["note"])) {
+            		$product->note =  $product->multilangs[$langs->defaultlang]["note"];
+            	}
 
             	$productorservice_result_fields = array(
 	            	'id' => $product->id,
@@ -436,14 +445,12 @@ 
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'product'=>$productorservice_result_fields
                 );
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -474,7 +481,9 @@ 
 
     dol_syslog("Function: createProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -482,8 +491,12 @@ 
     $error=0;
     $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
     // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
+    if ($product['price_net'] > 0) {
+    	$product['price_base_type']='HT';
+    }
+    if ($product['price'] > 0) {
+    	$product['price_base_type']='TTC';
+    }
 
     if ($product['price_net'] > 0 && $product['price'] > 0)
     {
@@ -528,7 +541,9 @@ 
         $newobject->seuil_stock_alert=$product['stock_alert'];
 
         $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
+        if ($product['country_code']) {
+        	$newobject->country_id=getCountry($product['country_code'],3);
+        }
         $newobject->customcode=$product['customcode'];
 
         $newobject->canvas=$product['canvas'];
@@ -594,8 +609,7 @@ 
 							$error++;
 							$newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
@@ -608,8 +622,7 @@ 
         {
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
+        } else
         {
             $db->rollback();
             $error++;
@@ -643,7 +656,9 @@ 
 
     dol_syslog("Function: updateProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -651,8 +666,12 @@ 
     $error=0;
     $fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
     // Check parameters
-    if ($product['price_net'] > 0) $product['price_base_type']='HT';
-    if ($product['price'] > 0)     $product['price_base_type']='TTC';
+    if ($product['price_net'] > 0) {
+    	$product['price_base_type']='HT';
+    }
+    if ($product['price'] > 0) {
+    	$product['price_base_type']='TTC';
+    }
 
     if ($product['price_net'] > 0 && $product['price'] > 0)
     {
@@ -672,8 +691,12 @@ 
         $newobject=new Product($db);
         $newobject->fetch($product['id']);
 
-        if (isset($product['ref']))     $newobject->ref=$product['ref'];
-        if (isset($product['ref_ext'])) $newobject->ref_ext=$product['ref_ext'];
+        if (isset($product['ref'])) {
+        	$newobject->ref=$product['ref'];
+        }
+        if (isset($product['ref_ext'])) {
+        	$newobject->ref_ext=$product['ref_ext'];
+        }
         $newobject->type=$product['type'];
         $newobject->libelle=$product['label'];    // @deprecated
         $newobject->label=$product['label'];
@@ -698,7 +721,9 @@ 
         $newobject->seuil_stock_alert=$product['stock_alert'];
 
         $newobject->country_id=$product['country_id'];
-        if ($product['country_code']) $newobject->country_id=getCountry($product['country_code'],3);
+        if ($product['country_code']) {
+        	$newobject->country_id=getCountry($product['country_code'],3);
+        }
         $newobject->customcode=$product['customcode'];
 
         $newobject->canvas=$product['canvas'];
@@ -732,8 +757,7 @@ 
         if ($result <= 0)
         {
             $error++;
-        }
-        else
+        } else
 		{
         	// Update stock if stock count is provided and differs from database after creation or update
 			if (isset($product['stock_real']) && $product['stock_real'] != '' && ! empty($conf->global->stock->enabled))
@@ -763,8 +787,7 @@ 
 							$error++;
 							$newobject->error='You set a different value for stock, but correction of stock count (before='.$getstockreal.', after='.$savstockreal.') fails with error '.$newobject->error;
 						}
-					}
-					else
+					} else
 					{
 						$error++;
 						$newobject->error='You set a different value for stock but we failed to find warehouse '.$product['warehouse_ref'].' to make correction.';
@@ -782,8 +805,7 @@ 
                 {
                     $error++;
                 }
-            }
-            elseif ($newobject->price_base_type == 'TTC')
+            } elseif ($newobject->price_base_type == 'TTC')
             {
                 $result=$newobject->updatePrice($newobject->price_ttc, $newobject->price_base_type);
                 if ($result <= 0)
@@ -797,8 +819,7 @@ 
         {
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-        }
-        else
+        } else
 		{
             $db->rollback();
             $error++;
@@ -832,7 +853,9 @@ 
 
     dol_syslog("Function: deleteProductOrService login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -869,8 +892,7 @@ 
 	        	$error++;
 		        $firsterror='Product or service with id '.$id.' not found';
 		        break;
-	        }
-	        else
+	        } else
 			{
 		        $result=$newobject->delete($user);
 		        if ($result <= 0)
@@ -889,8 +911,7 @@ 
 	        $db->commit();
             //$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'listofid'=>$listofiddeleted);
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''), 'nbdeleted'=>count($listofiddeleted));
-	    }
-	    else
+	    } else
 	    {
 	    	$db->rollback();
 	        $error++;
@@ -903,8 +924,7 @@ 
     {
         //$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'listofid'=>$listofiddeleted);
         $objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel), 'nbdeleted'=>0);
-    }
-    else if (count($listofiddeleted) == 0)
+    } else if (count($listofiddeleted) == 0)
     {
    		//$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'listofid'=>$listofiddeleted);
    		$objectresp=array('result'=>array('result_code'=>'NOT_FOUND', 'result_label'=>'No product or service with id '.join(',',$listofid).' found'), 'nbdeleted'=>0);
@@ -929,7 +949,9 @@ 
 
     dol_syslog("Function: getListOfProductsOrServices login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -946,9 +968,15 @@ 
         $sql.=" WHERE entity=".$conf->entity;
         foreach($filterproduct as $key => $val)
         {
-		if ($key == 'type' && $val >= 0)   	$sql.=" AND fk_product_type = ".$db->escape($val);
-		if ($key == 'status_tosell') 				$sql.=" AND tosell = ".$db->escape($val);
-		if ($key == 'status_tobuy')  				$sql.=" AND tobuy = ".$db->escape($val);
+		if ($key == 'type' && $val >= 0) {
+			$sql.=" AND fk_product_type = ".$db->escape($val);
+		}
+		if ($key == 'status_tosell') {
+			$sql.=" AND tosell = ".$db->escape($val);
+		}
+		if ($key == 'status_tobuy') {
+			$sql.=" AND tobuy = ".$db->escape($val);
+		}
         }
 		$resql=$db->query($sql);
         if ($resql)
@@ -962,8 +990,7 @@ 
          		$arrayproducts[]=array('id'=>$obj->rowid,'ref'=>$obj->ref,'ref_ext'=>$obj->ref_ext);
          		$i++;
          	}
-        }
-        else
+        } else
         {
             $error++;
             $errorcode=$db->lasterrno();
@@ -977,8 +1004,7 @@ 
 			'result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel),
         	'products'=>$arrayproducts
         );
-    }
-    else
+    } else
     {
         $objectresp = array(
 			'result'=>array('result_code' => 'OK', 'result_label' => ''),
@@ -1007,7 +1033,9 @@ 
 
 	dol_syslog("Function: getProductsForCategory login=".$authentication['login']." id=".$id);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -1113,22 +1141,19 @@ 
 					'products'=> $products
 					);
 
-				}
-				else
+				} else
 				{
 					$errorcode='NORECORDS_FOR_ASSOCIATION'; $errorlabel='No products associated'.$sql;
 					$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
 					dol_syslog("getProductsForCategory:: ".$c->error, LOG_DEBUG);
 
 				}
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';

htdocs/webservices/server_payment.php

Braces +4 added lines, -3 removed lines

@@ -146,7 +146,9 @@ 
     dol_syslog("Function: createPayment login=".$authentication['login']." id=".$payment->id.
                ", ref=".$payment->ref.", ref_ext=".$payment->ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp = array();
@@ -196,8 +198,7 @@ 
         {
             $db->commit();
             $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$new_payment->id);
-        }
-        else
+        } else
         {
             $db->rollback();
             $error++;

htdocs/webservices/server_supplier_invoice.php

Braces +15 added lines, -10 removed lines

@@ -20,7 +20,9 @@ 
  *       \brief      File that is entry point to call Dolibarr WebServices
  */
 
-if (! defined("NOCSRFCHECK"))    define("NOCSRFCHECK",'1');
+if (! defined("NOCSRFCHECK")) {
+	define("NOCSRFCHECK",'1');
+}
 
 require_once '../master.inc.php';
 require_once NUSOAP_PATH.'/nusoap.php';        // Include SOAP
@@ -229,7 +231,9 @@ 
 
 	dol_syslog("Function: getSupplierInvoice login=".$authentication['login']." id=".$id." ref=".$ref." ref_ext=".$ref_ext);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -302,14 +306,12 @@ 
 //				        				 '1'=>array('id'=>333,'type'=>1))
 
 			    ));
-			}
-			else
+			} else
 			{
 				$error++;
 				$errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref.' nor ref_ext='.$ref_ext;
 			}
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -339,7 +341,9 @@ 
 
 	dol_syslog("Function: getSupplierInvoicesForThirdParty login=".$authentication['login']." idthirdparty=".$idthirdparty);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -364,7 +368,9 @@ 
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
 		//$sql.=" WHERE f.fk_soc = s.rowid AND nom = '".$db->escape($idthirdparty)."'";
         $sql.=" WHERE f.entity = ".$conf->entity;
-		if ($idthirdparty != 'all') $sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		if ($idthirdparty != 'all') {
+			$sql.=" AND f.fk_soc = ".$db->escape($idthirdparty);
+		}
 
 		$resql=$db->query($sql);
 		if ($resql)
@@ -440,8 +446,7 @@ 
 		        'invoices'=>$linesinvoice
 
 			);
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();