Dolibarr / dolibarr

htdocs/webservices/server_project.php

Braces +15 added lines, -15 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
@@ -170,8 +172,7 @@ 
 {
     //$value=$object->array_options["options_".$key];
     $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);
 }
 $project_fields=array_merge($project_fields,$extrafield_array);
@@ -234,7 +235,9 @@ 
 
     dol_syslog("Function: createProject login=".$authentication['login']);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -286,8 +289,7 @@ 
                 {
                     $error++;
                 }
-            }
-            else
+            } else
             {
                 $error++;
             }
@@ -296,16 +298,14 @@ 
             {
                 $db->commit();
                 $objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-            }
-            else
+            } else
             {
                 $db->rollback();
                 $error++;
                 $errorcode='KO';
                 $errorlabel=$newobject->error;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
@@ -334,7 +334,9 @@ 
 
     dol_syslog("Function: getProject login=".$authentication['login']." id=".$id." ref=".$ref);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -407,14 +409,12 @@ 
                     'result'=>array('result_code'=>'OK', 'result_label'=>''),
                     'project'=>$project_result_fields
                 );
-            }
-            else
+            } else
             {
                 $error++;
                 $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref='.$ref;
             }
-        }
-        else
+        } else
         {
             $error++;
             $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';

htdocs/webservices/server_order.php

Braces +61 added lines, -39 removed lines

@@ -22,7 +22,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
@@ -123,8 +125,7 @@ 
 {
 	//$value=$object->array_options["options_".$key];
 	$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_line_array['options_'.$key]=array('name'=>'options_'.$key,'type'=>$type);
 }
 $line_fields=array_merge($line_fields,$extrafield_line_array);
@@ -222,8 +223,7 @@ 
 {
 	//$value=$object->array_options["options_".$key];
 	$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);
 }
 $order_fields=array_merge($order_fields,$extrafield_array);
@@ -349,7 +349,9 @@ 
 
 	dol_syslog("Function: getOrder 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();
@@ -358,7 +360,9 @@ 
 
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid=$fuser->societe_id;
+	}
 
 	// Check parameters
 	if (! $error && (($id && $ref) || ($id && $ref_ext) || ($ref && $ref_ext)))
@@ -465,14 +469,12 @@ 
 					'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';
@@ -501,7 +503,9 @@ 
 
 	dol_syslog("Function: getOrdersForThirdParty 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();
@@ -509,7 +513,9 @@ 
 	$error=0;
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid=$fuser->societe_id;
+	}
 
 	// Check parameters
 	if (! $error && empty($idthirdparty))
@@ -525,7 +531,9 @@ 
 		$sql.='SELECT c.rowid as orderid';
 		$sql.=' FROM '.MAIN_DB_PREFIX.'commande as c';
 		$sql.=" WHERE c.entity = ".$conf->entity;
-		if ($idthirdparty != 'all' ) $sql.=" AND c.fk_soc = ".$db->escape($idthirdparty);
+		if ($idthirdparty != 'all' ) {
+			$sql.=" AND c.fk_soc = ".$db->escape($idthirdparty);
+		}
 
 
 		$resql=$db->query($sql);
@@ -630,8 +638,7 @@ 
 			'orders'=>$linesorders
 
 			);
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();
@@ -664,7 +671,9 @@ 
 
 	dol_syslog("Function: createOrder login=".$authentication['login']." socid :".$order['socid']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -705,8 +714,11 @@ 
 
 		// Trick because nusoap does not store data with same structure if there is one or several lines
 		$arrayoflines=array();
-		if (isset($order['lines']['line'][0])) $arrayoflines=$order['lines']['line'];
-		else $arrayoflines=$order['lines'];
+		if (isset($order['lines']['line'][0])) {
+			$arrayoflines=$order['lines']['line'];
+		} else {
+			$arrayoflines=$order['lines'];
+		}
 
 		foreach($arrayoflines as $key => $line)
 		{
@@ -751,9 +763,11 @@ 
 
 		}
 
-		if ($order['status'] == 1)   // We want order to have status validated
+		if ($order['status'] == 1) {
+			// We want order to have status validated
 		{
 			dol_syslog("Webservice server_order:: order validation start", LOG_DEBUG);
+		}
 			$result=$newobject->valid($fuser);
 			if ($result < 0)
 			{
@@ -767,8 +781,7 @@ 
 			dol_syslog("Webservice server_order:: order creation & validation succeeded, commit", LOG_DEBUG);
 			$db->commit();
 			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-		}
-		else
+		} else
 		{
 			dol_syslog("Webservice server_order:: order creation or validation failed, rollback", LOG_ERR);
 			$db->rollback();
@@ -806,7 +819,9 @@ 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
 	$error=0;
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
 	if (! $error)
@@ -831,16 +846,14 @@ 
 					$outputlangs = $langs;
 					$order->generateDocument($order->modelpdf, $outputlangs);
 
-				}
-				else
+				} else
 				{
 					$db->rollback();
 					$error++;
 					$errorcode='KO';
 					$errorlabel=$newobject->error;
 				}
-			}
-			else
+			} else
 			{
 				$db->rollback();
 				$error++;
@@ -848,8 +861,7 @@ 
 				$errorlabel=$newobject->error;
 			}
 
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			$error++;
@@ -862,8 +874,7 @@ 
 	if ($error)
 	{
 		$objectresp = array('result'=>array('result_code' => $errorcode, 'result_label' => $errorlabel));
-	}
-	else
+	} else
 	{
 		$db->commit();
 		$objectresp= array('result'=>array('result_code'=>'OK', 'result_label'=>''));
@@ -887,7 +898,9 @@ 
 
 	dol_syslog("Function: updateOrder login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -916,7 +929,9 @@ 
 
 			if (isset($order['status']))
 			{
-				if ($order['status'] == -1) $result=$object->cancel($fuser);
+				if ($order['status'] == -1) {
+					$result=$object->cancel($fuser);
+				}
 				if ($order['status'] == 1)
 				{
 					$result=$object->valid($fuser);
@@ -928,14 +943,22 @@ 
 					
 					}
 				}
-				if ($order['status'] == 0)  $result=$object->set_reopen($fuser);
-				if ($order['status'] == 3)  $result=$object->cloture($fuser);
+				if ($order['status'] == 0) {
+					$result=$object->set_reopen($fuser);
+				}
+				if ($order['status'] == 3) {
+					$result=$object->cloture($fuser);
+				}
 			}
 
 			if (isset($order['billed']))
 			{
-				if ($order['billed'])   $result=$object->classifyBilled($fuser);
-				if (! $order['billed']) $result=$object->classifyUnBilled($fuser);
+				if ($order['billed']) {
+					$result=$object->classifyBilled($fuser);
+				}
+				if (! $order['billed']) {
+					$result=$object->classifyUnBilled($fuser);
+				}
 			}
 
 			//Retreive all extrafield for object
@@ -965,8 +988,7 @@ 
 					'ref'=>$object->ref,
 					'ref_ext'=>$object->ref_ext
 			);
-		}
-		elseif ($objectfound)
+		} elseif ($objectfound)
 		{
 			$db->rollback();
 			$error++;

htdocs/webservices/server_other.php

Braces +16 added lines, -7 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
@@ -144,7 +146,9 @@ 
 
 	dol_syslog("Function: getVersions login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
     // Init and check authentication
     $objectresp=array();
@@ -187,7 +191,9 @@ 
 
 	dol_syslog("Function: getDocument login=".$authentication['login'].' - modulepart='.$modulepart.' - file='.$file);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -203,7 +209,9 @@ 
 
 	$fuser=check_authentication($authentication,$error,$errorcode,$errorlabel);
 
-	if ($fuser->societe_id) $socid=$fuser->societe_id;
+	if ($fuser->societe_id) {
+		$socid=$fuser->societe_id;
+	}
 
 	// Check parameters
 	if (! $error && ( ! $file || ! $modulepart ) )
@@ -220,7 +228,9 @@ 
 		$original_file = str_replace("../","/", $original_file);
 
 		// find the subdirectory name as the reference
-		if (empty($refname)) $refname=basename(dirname($original_file)."/");
+		if (empty($refname)) {
+			$refname=basename(dirname($original_file)."/");
+		}
 
 		// Security check
 		$check_access = dol_check_secure_access_document($modulepart,$original_file,$conf->entity,$fuser,$refname);
@@ -298,8 +308,7 @@ 
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'document'=>$objectret
 				);
-			}
-			else
+			} else
 			{
 				dol_syslog("File doesn't exist ".$original_file);
 				$errorcode='NOT_FOUND';

htdocs/webservices/server_category.php

Braces +8 added lines, -6 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
@@ -192,7 +194,9 @@ 
 
 	dol_syslog("Function: getCategory login=".$authentication['login']." id=".$id);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	$objectresp=array();
 	$errorcode='';$errorlabel='';
@@ -260,14 +264,12 @@ 
 					'result'=>array('result_code'=>'OK', 'result_label'=>''),
 					'categorie'=> $cat
 			   );
-			}
-			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/admin/index.php

Braces +11 added lines, -6 removed lines

@@ -29,8 +29,9 @@ 
 
 $langs->load("admin");
 
-if (! $user->admin)
+if (! $user->admin) {
 	accessforbidden();
+}
 
 $actionsave=GETPOST("save");
 
@@ -47,8 +48,7 @@ 
     {
         $db->commit();
         setEventMessages($langs->trans("SetupSaved"), null, 'mesgs');
-    }
-    else
+    } else
     {
         $db->rollback();
         setEventMessages($langs->trans("Error"), null, 'errors');
@@ -82,8 +82,9 @@ 
 print '<tr class="impair">';
 print '<td class="fieldrequired">'.$langs->trans("KeyForWebServicesAccess").'</td>';
 print '<td><input type="text" class="flat" id="WEBSERVICES_KEY" name="WEBSERVICES_KEY" value="'. (GETPOST('WEBSERVICES_KEY')?GETPOST('WEBSERVICES_KEY'):(! empty($conf->global->WEBSERVICES_KEY)?$conf->global->WEBSERVICES_KEY:'')) . '" size="40">';
-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>';
 print '<td>&nbsp;</td>';
 print '</tr>';
@@ -118,7 +119,9 @@ 
 print '<u>'.$langs->trans("WSDLCanBeDownloadedHere").':</u><br>';
 foreach($webservices as $name => $right)
 {
-	if (!empty($right) && !verifCond($right)) continue;
+	if (!empty($right) && !verifCond($right)) {
+		continue;
+	}
 	$url=DOL_MAIN_URL_ROOT.'/webservices/server_'.$name.'.php?wsdl';
 	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 }
@@ -129,7 +132,9 @@ 
 print '<u>'.$langs->trans("EndPointIs").':</u><br>';
 foreach($webservices as $name => $right)
 {
-	if (!empty($right) && !verifCond($right)) continue;
+	if (!empty($right) && !verifCond($right)) {
+		continue;
+	}
 	$url=DOL_MAIN_URL_ROOT.'/webservices/server_'.$name.'.php';
 	print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 }

htdocs/webservices/server_contact.php

Braces +24 added lines, -18 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
@@ -126,8 +128,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);
 }
@@ -241,7 +242,9 @@ 
 
     dol_syslog("Function: getContact login=".$authentication['login']." id=".$id." ref_ext=".$ref_ext);
 
-    if ($authentication['entity']) $conf->entity=$authentication['entity'];
+    if ($authentication['entity']) {
+    	$conf->entity=$authentication['entity'];
+    }
 
     // Init and check authentication
     $objectresp=array();
@@ -323,14 +326,12 @@ 
 			    	'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			        'contact'=>$contact_result_fields
                 );
-	        }
-	        else
+	        } else
 	        {
 	            $error++;
 	            $errorcode='PERMISSION_DENIED'; $errorlabel='User does not have permission for this request';
 	        }
-         }
-         else
+         } else
          {
              $error++;
              $errorcode='NOT_FOUND'; $errorlabel='Object not found for id='.$id.' nor ref_ext='.$ref_ext;
@@ -361,7 +362,9 @@ 
 
 	dol_syslog("Function: createContact login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -440,8 +443,7 @@ 
 		{
 			$db->commit();
 			$objectresp=array('result'=>array('result_code'=>'OK', 'result_label'=>''),'id'=>$newobject->id,'ref'=>$newobject->ref);
-		}
-		else
+		} else
 		{
 			$db->rollback();
 			$error++;
@@ -471,7 +473,9 @@ 
 
 	dol_syslog("Function: getContactsForThirdParty 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();
@@ -574,8 +578,7 @@ 
 			'contacts'=>$linescontact
 
 			);
-		}
-		else
+		} else
 		{
 			$error++;
 			$errorcode=$db->lasterrno(); $errorlabel=$db->lasterror();
@@ -606,7 +609,9 @@ 
 
 	dol_syslog("Function: updateContact login=".$authentication['login']);
 
-	if ($authentication['entity']) $conf->entity=$authentication['entity'];
+	if ($authentication['entity']) {
+		$conf->entity=$authentication['entity'];
+	}
 
 	// Init and check authentication
 	$objectresp=array();
@@ -646,7 +651,9 @@ 
 			$object->town=$contact['town'];
 
 			$object->country_id=$contact['country_id'];
-			if ($contact['country_code']) $object->country_id=getCountry($contact['country_code'],3);
+			if ($contact['country_code']) {
+				$object->country_id=getCountry($contact['country_code'],3);
+			}
 			$object->province_id=$contact['province_id'];
 
 
@@ -687,8 +694,7 @@ 
 			'result'=>array('result_code'=>'OK', 'result_label'=>''),
 			'id'=>$object->id
 			);
-		}
-		elseif ($objectfound)
+		} elseif ($objectfound)
 		{
 			$db->rollback();
 			$error++;

htdocs/core/actions_extrafields.inc.php

Braces +25 added lines, -27 removed lines

@@ -30,10 +30,18 @@ 
 $type=GETPOST('type','alpha');
 $param=GETPOST('param','alpha');;
 
-if ($type=='double' && strpos($extrasize,',')===false) $extrasize='24,8';
-if ($type=='date')     $extrasize='';
-if ($type=='datetime') $extrasize='';
-if ($type=='select')   $extrasize='';
+if ($type=='double' && strpos($extrasize,',')===false) {
+	$extrasize='24,8';
+}
+if ($type=='date') {
+	$extrasize='';
+}
+if ($type=='datetime') {
+	$extrasize='';
+}
+if ($type=='select') {
+	$extrasize='';
+}
 
 
 // Add attribute
@@ -121,8 +129,7 @@ 
 	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	    					$action = 'create';
 	    				}
-	    			}
-	    			else
+	    			} else
 	    			{
 	    				$error++;
 	    				$langs->load("errors");
@@ -148,8 +155,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -181,15 +187,13 @@ 
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
+    			} else
     			{
                     $error++;
     			    $mesg=$extrafields->error;
                     setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
+    		} else
     		{
                 $error++;
     		    $langs->load("errors");
@@ -197,8 +201,7 @@ 
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
-	    }
-	    else
+	    } else
 	    {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
@@ -283,8 +286,7 @@ 
 	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	        				$action = 'edit';
 	        			}
-	        		}
-	        		else
+	        		} else
 	        		{
 	        			$error++;
 	        			$langs->load("errors");
@@ -309,8 +311,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -342,23 +343,20 @@ 
     				setEventMessages($langs->trans('SetupSaved'), null, 'mesgs');
     				header("Location: ".$_SERVER["PHP_SELF"]);
     				exit;
-    			}
-    			else
+    			} else
     			{
                     $error++;
     			    $mesg=$extrafields->error;
     			    setEventMessages($mesg, null, 'errors');
     			}
-    		}
-    		else
+    		} else
     		{
     		    $error++;
     			$langs->load("errors");
     			$mesg=$langs->trans("ErrorFieldCanNotContainSpecialCharacters",$langs->transnoentities("AttributeCode"));
     			setEventMessages($mesg, null, 'errors');
     		}
-	    }
-	    else
+	    } else
 	    {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
@@ -375,10 +373,10 @@ 
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
+        } else {
+        	$mesg=$extrafields->error;
         }
-        else $mesg=$extrafields->error;
-	}
-	else
+	} else
 	{
 	    $error++;
 		$langs->load("errors");

htdocs/core/ajax/extraparams.php

Braces +20 added lines, -16 removed lines

@@ -20,11 +20,22 @@ 
  *	\brief      File to return Ajax response on set extra parameters of elements
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
 //if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
 
 include '../../main.inc.php';
@@ -52,20 +63,13 @@ 
 	$classpath = $subelement = $element;
 
 	// For compatibility
-	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; }
-	else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; }
-	else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; }
-	else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; }
-	else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; }
-	else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; }
-	else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; }
-	else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
+	if ($element == 'order' || $element == 'commande')    { $classpath = $subelement = 'commande'; } else if ($element == 'propal')				{ $classpath = 'comm/propal'; $subelement = 'propal'; } else if ($element == 'facture')				{ $classpath = 'compta/facture'; $subelement = 'facture'; } else if ($element == 'contract')			{ $classpath = $subelement = 'contrat'; } else if ($element == 'shipping')			{ $classpath = $subelement = 'expedition'; } else if ($element == 'deplacement')			{ $classpath = 'compta/deplacement'; $subelement = 'deplacement'; } else if ($element == 'order_supplier')		{ $classpath = 'fourn'; $subelement = 'fournisseur.commande'; } else if ($element == 'invoice_supplier')	{ $classpath = 'fourn'; $subelement = 'fournisseur.facture'; }
 
 	dol_include_once('/'.$classpath.'/class/'.$subelement.'.class.php');
 
-	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; }
-	else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; }
-	else $classname = ucfirst($subelement);
+	if ($element == 'order_supplier')			{ $classname = 'CommandeFournisseur'; } else if ($element == 'invoice_supplier')	{ $classname = 'FactureFournisseur'; } else {
+		$classname = ucfirst($subelement);
+	}
 
 	$object	= new $classname($db);
 	$object->fetch($id);

htdocs/core/ajax/security.php

Braces +22 added lines, -7 removed lines

@@ -21,13 +21,28 @@
  *                   like key to use into URL to protect them.
  */
 
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL','1'); // Disables token renewal
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU','1');
-if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML','1');
-if (! defined('NOREQUIREAJAX'))  define('NOREQUIREAJAX','1');
-if (! defined('NOREQUIRESOC'))   define('NOREQUIRESOC','1');
-if (! defined('NOREQUIRETRAN'))  define('NOREQUIRETRAN','1');
-if (! defined('NOREQUIREHOOK'))  define('NOREQUIREHOOK','1');
+if (! defined('NOTOKENRENEWAL')) {
+	define('NOTOKENRENEWAL','1');
+}
+// Disables token renewal
+if (! defined('NOREQUIREMENU')) {
+	define('NOREQUIREMENU','1');
+}
+if (! defined('NOREQUIREHTML')) {
+	define('NOREQUIREHTML','1');
+}
+if (! defined('NOREQUIREAJAX')) {
+	define('NOREQUIREAJAX','1');
+}
+if (! defined('NOREQUIRESOC')) {
+	define('NOREQUIRESOC','1');
+}
+if (! defined('NOREQUIRETRAN')) {
+	define('NOREQUIRETRAN','1');
+}
+if (! defined('NOREQUIREHOOK')) {
+	define('NOREQUIREHOOK','1');
+}
 
 require '../../main.inc.php';