alxarafe / alixar

dolibarr/htdocs/societe/admin/contact_extrafields.php

Braces +6 added lines, -2 removed lines

@@ -36,13 +36,17 @@
 // List of supported format
 $tmptype2label=ExtraFields::$type2label;
 $type2label=array('');
-foreach ($tmptype2label as $key => $val) $type2label[$key]=$langs->transnoentitiesnoconv($val);
+foreach ($tmptype2label as $key => $val) {
+    $type2label[$key]=$langs->transnoentitiesnoconv($val);
+}
 
 $action=GETPOST('action', 'alpha');
 $attrname=GETPOST('attrname', 'alpha');
 $elementtype='socpeople'; //Must be the $element of the class that manage extrafield
 
-if (!$user->admin) accessforbidden();
+if (!$user->admin) {
+    accessforbidden();
+}
 
 
 /*

dolibarr/htdocs/societe/checkvat/checkVatPopup.php

Braces +13 added lines, -16 removed lines

@@ -51,8 +51,7 @@ 
 {
 	print '<br>';
 	print '<font class="error">'.$langs->transnoentities("ErrorFieldRequired",$langs->trans("VATIntraShort")).'</font><br>';
-}
-else
+} else
 {
 	$vatNumber = preg_replace('/\^\w/', '', $vatNumber);
 	$countryCode=substr($vatNumber,0,2);
@@ -103,18 +102,15 @@ 
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow=$soapclient->response;
-	}
-	elseif (preg_match('/TIMEOUT/i',$result['faultstring']))
+	} elseif (preg_match('/TIMEOUT/i',$result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow=$soapclient->response;
-	}
-	elseif (preg_match('/SERVER_BUSY/i',$result['faultstring']))
+	} elseif (preg_match('/SERVER_BUSY/i',$result['faultstring']))
 	{
 		print '<font class="error">'.$langs->trans("ErrorServiceUnavailableTryLater").'</font><br>';
 		$messagetoshow=$soapclient->response;
-	}
-	elseif ($result['faultstring'])
+	} elseif ($result['faultstring'])
 	{
 		print '<font class="error">'.$langs->trans("Error").'</font><br>';
 		$messagetoshow=$result['faultstring'];
@@ -123,22 +119,24 @@ 
 	elseif (preg_match('/INVALID_INPUT/i',$result['faultstring'])
 	|| ($result['requestDate'] && ! $result['valid']))
 	{
-		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+		if ($result['requestDate']) {
+		    print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+		}
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		print $langs->trans("ValueIsValid").': <font class="error">'.$langs->trans("No").'</font> (Might be a non europeen VAT)<br>';
 		//$messagetoshow=$soapclient->response;
-	}
-	else
+	} else
 	{
 		// Syntaxe ok
-		if ($result['requestDate']) print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+		if ($result['requestDate']) {
+		    print $langs->trans("Date").': '.$result['requestDate'].'<br>';
+		}
 		print $langs->trans("VATIntraSyntaxIsValid").': <font class="ok">'.$langs->trans("Yes").'</font><br>';
 		print $langs->trans("ValueIsValid").': ';
 		if (preg_match('/MS_UNAVAILABLE/i',$result['faultstring']))
 		{
 			print '<font class="error">'.$langs->trans("ErrorVATCheckMS_UNAVAILABLE",$countryCode).'</font><br>';
-		}
-		else
+		} else
 		{
 			if (! empty($result['valid']) && ($result['valid']==1 || $result['valid']=='true'))
 			{
@@ -146,8 +144,7 @@ 
 				print '<br>';
 				print $langs->trans("Name").': '.$result['name'].'<br>';
 				print $langs->trans("Address").': '.$result['address'].'<br>';
-			}
-			else
+			} else
 			{
 				print '<font class="error">'.$langs->trans("No").'</font>';
 				print '<br>'."\n";

dolibarr/htdocs/societe/paymentmodes.php

Braces +175 added lines, -102 removed lines

@@ -44,7 +44,9 @@ 
 
 // Security check
 $socid = GETPOST("socid","int");
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe','','');
 
 $id=GETPOST("id","int");
@@ -97,7 +99,9 @@ 
 
 $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -116,8 +120,12 @@ 
 		// Modification
 		if (! GETPOST('label','alpha') || ! GETPOST('bank','alpha'))
 		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('bank','alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			if (! GETPOST('label','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (! GETPOST('bank','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			}
 			$action='edit';
 			$error++;
 		}
@@ -167,8 +175,7 @@ 
 			if (! $result)
 			{
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
-			}
-			else
+			} else
 			{
 				// If this account is the default bank account, we disable others
 				if ($companybankaccount->default_rib)
@@ -188,11 +195,21 @@ 
 		// Modification
 		if (! GETPOST('label','alpha') || ! GETPOST('proprio','alpha') || ! GETPOST('cardnumber','alpha') || ! GETPOST('exp_date_month','alpha') || ! GETPOST('exp_date_year','alpha') || ! GETPOST('cvn','alpha'))
 		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('proprio','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
-			if (! GETPOST('cardnumber','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
-			if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
-			if (! GETPOST('cvn','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
+			if (! GETPOST('label','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (! GETPOST('proprio','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+			}
+			if (! GETPOST('cardnumber','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
+			}
+			if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+			}
+			if (! GETPOST('cvn','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
+			}
 			$action='createcard';
 			$error++;
 		}
@@ -218,8 +235,7 @@ 
 			if (! $result)
 			{
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
-			}
-			else
+			} else
 			{
 				// If this account is the default bank account, we disable others
 				if ($companypaymentmode->default_rib)
@@ -240,8 +256,12 @@ 
 
 		if (! GETPOST('label','alpha') || ! GETPOST('bank','alpha'))
 		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('bank','alpha'))  setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			if (! GETPOST('label','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (! GETPOST('bank','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("BankName")), null, 'errors');
+			}
 			$action='create';
 			$error++;
 		}
@@ -325,8 +345,7 @@ 
 				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
+			} else
 			{
 				$db->rollback();
 			}
@@ -339,11 +358,21 @@ 
 
 		if (! GETPOST('label','alpha') || ! GETPOST('proprio','alpha') || ! GETPOST('cardnumber','alpha') || ! GETPOST('exp_date_month','alpha') || ! GETPOST('exp_date_year','alpha') || ! GETPOST('cvn','alpha'))
 		{
-			if (! GETPOST('label','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
-			if (! GETPOST('proprio','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
-			if (! GETPOST('cardnumber','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
-			if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
-			if (! GETPOST('cvn','alpha')) setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
+			if (! GETPOST('label','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label")), null, 'errors');
+			}
+			if (! GETPOST('proprio','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("NameOnCard")), null, 'errors');
+			}
+			if (! GETPOST('cardnumber','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CardNumber")), null, 'errors');
+			}
+			if (! (GETPOST('exp_date_month','alpha') > 0) || ! (GETPOST('exp_date_year','alpha') > 0)) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("ExpiryDate")), null, 'errors');
+			}
+			if (! GETPOST('cvn','alpha')) {
+			    setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("CVN")), null, 'errors');
+			}
 			$action='createcard';
 			$error++;
 		}
@@ -390,8 +419,7 @@ 
 				$url=$_SERVER["PHP_SELF"].'?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
+			} else
 			{
 				$db->rollback();
 			}
@@ -407,8 +435,7 @@ 
 			$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 			header('Location: '.$url);
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($db->lasterror, null, 'errors');
 		}
@@ -425,13 +452,11 @@ 
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
+			} else
 			{
 				setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 			}
-		}
-		else
+		} else
 		{
 			setEventMessages($companypaymentmode->error, $companypaymentmode->errors, 'errors');
 		}
@@ -447,13 +472,11 @@ 
 				$url = $_SERVER['PHP_SELF']."?socid=".$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			else
+			} else
 			{
 				setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 			}
-		}
-		else
+		} else
 		{
 			setEventMessages($companybankaccount->error, $companybankaccount->errors, 'errors');
 		}
@@ -489,8 +512,7 @@ 
 			{
 				$error++;
 				setEventMessages('ThisThirdpartyIsNotACustomer', null, 'errors');
-			}
-			else
+			} else
 			{
 				// Creation of Stripe customer + update of societe_account
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus, 1);
@@ -498,8 +520,7 @@ 
 				{
 					$error++;
 					setEventMessages($stripe->error, $stripe->errors, 'errors');
-				}
-				else
+				} else
 				{
 					$stripecu = $cu->id;
 				}
@@ -514,8 +535,7 @@ 
 			{
 				$error++;
 				setEventMessages('ThisPaymentModeIsNotACard', null, 'errors');
-			}
-			else
+			} else
 			{
 				// Get the Stripe customer
 				$cu = $stripe->customerStripe($object, $stripeacc, $servicestatus);
@@ -533,8 +553,7 @@ 
 					{
 						$error++;
 						setEventMessages($stripe->error, $stripe->errors, 'errors');
-					}
-					else
+					} else
 					{
 						$stripecard = $card->id;
 					}
@@ -580,8 +599,7 @@ 
 			{
 				$stripecu = $newcu;
 				$db->commit();
-			}
-			else
+			} else
 			{
 				$db->rollback();
 			}
@@ -594,14 +612,12 @@ 
 				$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'setassourcedefault')
+		} elseif ($action == 'setassourcedefault')
 		{
 			try {
 				$cu=$stripe->customerStripe($object, $stripeacc, $servicestatus);
@@ -611,14 +627,12 @@ 
 				$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
 			}
-		}
-		elseif ($action == 'deletecard' && $source)
+		} elseif ($action == 'deletecard' && $source)
 		{
 			try {
 				$cu=$stripe->customerStripe($object, $stripeacc, $servicestatus);
@@ -626,15 +640,17 @@ 
 				if ($card)
 				{
 					// $card->detach();  Does not work with card_, only with src_
-					if (method_exists($card, 'detach')) $card->detach();
-					else $card->delete();
+					if (method_exists($card, 'detach')) {
+					    $card->detach();
+					} else {
+					    $card->delete();
+					}
 				}
 
 				$url=DOL_URL_ROOT.'/societe/paymentmodes.php?socid='.$object->id;
 				header('Location: '.$url);
 				exit;
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				$error++;
 				setEventMessages($e->getMessage(), null, 'errors');
@@ -672,20 +688,23 @@ 
 {
 	$companybankaccount->fetch(0, $object->id);
 	$companypaymentmode->fetch(0, null, $object->id, 'card');
-}
-else
+} else
 {
 	$companybankaccount->fetch($id);
 	$companypaymentmode->fetch($id);
 }
-if (empty($companybankaccount->socid)) $companybankaccount->socid=$object->id;
+if (empty($companybankaccount->socid)) {
+    $companybankaccount->socid=$object->id;
+}
 
 if ($socid && ($action == 'edit' || $action == 'editcard') && $user->rights->societe->creer)
 {
 	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	$actionforadd='update';
-	if ($action == 'editcard') $actionforadd='updatecard';
+	if ($action == 'editcard') {
+	    $actionforadd='updatecard';
+	}
 	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
 	print '<input type="hidden" name="id" value="'.GETPOST("id","int").'">';
 }
@@ -694,7 +713,9 @@ 
 	print '<form action="'.$_SERVER["PHP_SELF"].'?socid='.$object->id.'" method="post">';
 	print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	$actionforadd='add';
-	if ($action == 'createcard') $actionforadd='addcard';
+	if ($action == 'createcard') {
+	    $actionforadd='addcard';
+	}
 	print '<input type="hidden" name="action" value="'.$actionforadd.'">';
 }
 
@@ -720,10 +741,12 @@ 
 	dol_banner_tab($object, 'socid', $linkback, ($user->societe_id?0:1), 'rowid', 'nom');
 
 
-	if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+	if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+	    // Old not used prefix field
 	{
 		print '<tr><td class="titlefield">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
 	}
+	}
 
 	//if ($conf->agenda->enabled && $user->rights->agenda->myactions->read) $elementTypeArray['action']=$langs->transnoentitiesnoconv('Events');
 
@@ -737,19 +760,31 @@ 
 		print '<tr><td class="titlefield">';
 		print $langs->trans('CustomerCode').'</td><td colspan="2">';
 		print $object->code_client;
-		if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		if ($object->check_codeclient() <> 0) {
+		    print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+		}
 		print '</td></tr>';
 		$sql = "SELECT count(*) as nb from ".MAIN_DB_PREFIX."facture where fk_soc = ".$socid;
 		$resql=$db->query($sql);
-		if (!$resql) dol_print_error($db);
+		if (!$resql) {
+		    dol_print_error($db);
+		}
 
 		$obj = $db->fetch_object($resql);
 		$nbFactsClient = $obj->nb;
 		$thirdTypeArray['customer']=$langs->trans("customer");
-		if ($conf->propal->enabled && $user->rights->propal->lire) $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
-		if ($conf->commande->enabled && $user->rights->commande->lire) $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
-		if ($conf->facture->enabled && $user->rights->facture->lire) $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
-		if ($conf->contrat->enabled && $user->rights->contrat->lire) $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+		if ($conf->propal->enabled && $user->rights->propal->lire) {
+		    $elementTypeArray['propal']=$langs->transnoentitiesnoconv('Proposals');
+		}
+		if ($conf->commande->enabled && $user->rights->commande->lire) {
+		    $elementTypeArray['order']=$langs->transnoentitiesnoconv('Orders');
+		}
+		if ($conf->facture->enabled && $user->rights->facture->lire) {
+		    $elementTypeArray['invoice']=$langs->transnoentitiesnoconv('Invoices');
+		}
+		if ($conf->contrat->enabled && $user->rights->contrat->lire) {
+		    $elementTypeArray['contract']=$langs->transnoentitiesnoconv('Contracts');
+		}
 	}
 
 	if (! empty($conf->stripe->enabled))
@@ -764,7 +799,9 @@ 
 		print $form->editfieldval("StripeCustomerId", 'key_account', $stripecu, $object, $permissiontowrite, 'string', '', null, null, '', 2, '', 'socid');
 		if ($stripecu && $action != 'editkey_account')
 		{
-			if (! empty($conf->stripe->enabled) && !empty($stripeacc)) $connect=$stripeacc.'/';
+			if (! empty($conf->stripe->enabled) && !empty($stripeacc)) {
+			    $connect=$stripeacc.'/';
+			}
 			$url='https://dashboard.stripe.com/'.$connect.'test/customers/'.$stripecu;
 			if ($servicestatus)
 			{
@@ -811,8 +848,7 @@ 
 				if ($customerstripe->id) {
 					$listofsources=$customerstripe->sources->data;
 				}
-			}
-			catch(Exception $e)
+			} catch(Exception $e)
 			{
 				dol_syslog("Error when searching/loading Stripe customer for thirdparty id =".$object->id);
 			}
@@ -888,16 +924,21 @@ 
 							print img_credit_card($companypaymentmodetemp->type);
 							print '</td>';
 							print '<td>';
-							if ($companypaymentmodetemp->last_four) print '....'.$companypaymentmodetemp->last_four;
-							if ($companypaymentmodetemp->exp_date_month || $companypaymentmodetemp->exp_date_year) print ' - '.sprintf("%02d", $companypaymentmodetemp->exp_date_month).'/'.$companypaymentmodetemp->exp_date_year.'';
+							if ($companypaymentmodetemp->last_four) {
+							    print '....'.$companypaymentmodetemp->last_four;
+							}
+							if ($companypaymentmodetemp->exp_date_month || $companypaymentmodetemp->exp_date_year) {
+							    print ' - '.sprintf("%02d", $companypaymentmodetemp->exp_date_month).'/'.$companypaymentmodetemp->exp_date_year.'';
+							}
 							print '</td><td>';
 							if ($companypaymentmodetemp->country_code)
 							{
 								$img=picto_from_langcode($companypaymentmodetemp->country_code);
 								print $img?$img.' ':'';
 								print getCountry($companypaymentmodetemp->country_code,1);
+							} else {
+							    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 							}
-							else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 							print '</td>';
 							// Default
 							print '<td align="center">';
@@ -911,8 +952,11 @@ 
 							}
 							print '</td>';
 							print '<td>';
-							if (empty($companypaymentmodetemp->stripe_card_ref)) print $langs->trans("Local");
-							else print $langs->trans("LocalAndRemote");
+							if (empty($companypaymentmodetemp->stripe_card_ref)) {
+							    print $langs->trans("Local");
+							} else {
+							    print $langs->trans("LocalAndRemote");
+							}
 							print '</td>';
 							print '<td>';
 							print dol_print_date($companypaymentmodetemp->tms, 'dayhour');
@@ -939,8 +983,9 @@ 
 						$i++;
 					}
 				}
+			} else {
+			    dol_print_error($db);
 			}
-			else dol_print_error($db);
 		}
 
 		// Show remote sources (not already shown as local source)
@@ -948,7 +993,10 @@ 
 		{
 			foreach ($listofsources as $src)
 			{
-				if (! empty($arrayofstripecard[$src->id])) continue;	// Already in previous list
+				if (! empty($arrayofstripecard[$src->id])) {
+				    continue;
+				}
+				// Already in previous list
 
 				$nbremote++;
 
@@ -961,7 +1009,9 @@ 
 				}
 				// Src ID
 				print '<td>';
-				if (!empty($stripeacc)) $connect=$stripeacc.'/';
+				if (!empty($stripeacc)) {
+				    $connect=$stripeacc.'/';
+				}
 				$url='https://dashboard.stripe.com/'.$connect.'test/sources/'.$src->id;
 				if ($servicestatus)
 				{
@@ -974,12 +1024,10 @@ 
 				if ($src->object=='card')
 				{
 					print img_credit_card($src->brand);
-				}
-				elseif ($src->object=='source' && $src->type=='card')
+				} elseif ($src->object=='source' && $src->type=='card')
 				{
 					print img_credit_card($src->card->brand);
-				}
-				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				} elseif ($src->object=='source' && $src->type=='sepa_debit')
 				{
 					print '<span class="fa fa-university fa-2x fa-fw"></span>';
 				}
@@ -994,10 +1042,10 @@ 
 						$img=picto_from_langcode($src->country);
 						print $img?$img.' ':'';
 						print getCountry($src->country,1);
+					} else {
+					    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object=='source' && $src->type=='card')
+				} elseif ($src->object=='source' && $src->type=='card')
 				{
 					print $src->owner->name.'<br>....'.$src->card->last4.' - '.$src->card->exp_month.'/'.$src->card->exp_year.'';
 					print '</td><td>';
@@ -1007,10 +1055,10 @@ 
 						$img=picto_from_langcode($src->card->country);
 						print $img?$img.' ':'';
 						print getCountry($src->card->country,1);
+					} else {
+					    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
-				}
-				elseif ($src->object=='source' && $src->type=='sepa_debit')
+				} elseif ($src->object=='source' && $src->type=='sepa_debit')
 				{
 					print 'info sepa';
 					print '</td><td>';
@@ -1019,8 +1067,9 @@ 
 							$img=picto_from_langcode($src->sepa_debit->country);
 							print $img?$img.' ':'';
 							print getCountry($src->sepa_debit->country,1);
+					} else {
+					    print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 					}
-					else print img_warning().' <font class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentitiesnoconv("CompanyCountry")).'</font>';
 				}
 				print '</td>';
 				// Default
@@ -1190,12 +1239,16 @@ 
 				$out.= '<input type="hidden" name="socid" value="'.$object->id.'">';
 				$out.= '<input type="hidden" name="companybankid" value="'.$rib->id.'">';
 
-				if (is_array($modellist) && count($modellist) == 1)    // If there is only one element
+				if (is_array($modellist) && count($modellist) == 1) {
+				    // If there is only one element
 				{
 					$arraykeys=array_keys($modellist);
+				}
 					$modelselected=$arraykeys[0];
 				}
-				if (! empty($conf->global->BANKADDON_PDF)) $modelselected = $conf->global->BANKADDON_PDF;
+				if (! empty($conf->global->BANKADDON_PDF)) {
+				    $modelselected = $conf->global->BANKADDON_PDF;
+				}
 
 				$out.= $form->selectarray('modelrib'.$rib->id, $modellist, $modelselected, $showempty, 0, 0, '', 0, 0, 0, '', 'minwidth100');
 				$out.= ajax_combobox('modelrib'.$rib->id);
@@ -1207,21 +1260,29 @@ 
 					$formadmin=new FormAdmin($db);
 					$defaultlang=$codelang?$codelang:$langs->getDefaultLang();
 					$morecss='maxwidth150';
-					if ($conf->browser->layout == 'phone') $morecss='maxwidth100';
+					if ($conf->browser->layout == 'phone') {
+					    $morecss='maxwidth100';
+					}
 					$out.= $formadmin->select_language($defaultlang, 'lang_idrib'.$rib->id, 0, 0, 0, 0, 0, $morecss);
 				}
 				// Button
 				$genbutton = '<input class="button buttongen" id="'.$forname.'_generatebutton" name="'.$forname.'_generatebutton"';
 				$genbutton.= ' type="submit" value="'.$buttonlabel.'"';
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) $genbutton.= ' disabled';
+				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist)) {
+				    $genbutton.= ' disabled';
+				}
 				$genbutton.= '>';
 				if ($allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid')
 				{
 					$langs->load("errors");
 					$genbutton.= ' '.img_warning($langs->transnoentitiesnoconv("WarningNoDocumentModelActivated"));
 				}
-				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') $genbutton='';
-				if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') $genbutton='';
+				if (! $allowgenifempty && ! is_array($modellist) && empty($modellist) && empty($conf->dol_no_mouse_hover) && $modulepart != 'unpaid') {
+				    $genbutton='';
+				}
+				if (empty($modellist) && ! $showempty && $modulepart != 'unpaid') {
+				    $genbutton='';
+				}
 				$out.= $genbutton;
 				$out.= '</form>';
 			}
@@ -1250,7 +1311,9 @@ 
 		if (count($rib_list) == 0)
 		{
 			$colspan=8;
-			if (! empty($conf->prelevement->enabled)) $colspan+=2;
+			if (! empty($conf->prelevement->enabled)) {
+			    $colspan+=2;
+			}
 			print '<tr><td colspan="'.$colspan.'" class="opacitymedium">'.$langs->trans("NoBANRecord").'</td></tr>';
 		}
 
@@ -1368,12 +1431,16 @@ 
 			$name = 'iban';
 			$size = 30;
 			$content = $companybankaccount->iban;
-			if ($companybankaccount->needIBAN()) $require=true;
+			if ($companybankaccount->needIBAN()) {
+			    $require=true;
+			}
 		} elseif ($val == 'BIC') {
 			$name = 'bic';
 			$size = 12;
 			$content = $companybankaccount->bic;
-			if ($companybankaccount->needIBAN()) $require=true;
+			if ($companybankaccount->needIBAN()) {
+			    $require=true;
+			}
 		}
 
 		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';
@@ -1403,7 +1470,9 @@ 
 
 		print '<table class="border" width="100%">';
 
-		if (empty($companybankaccount->rum)) $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
+		if (empty($companybankaccount->rum)) {
+		    $companybankaccount->rum = $prelevement->buildRumNumber($object->code_client, $companybankaccount->datec, $companybankaccount->id);
+		}
 
 		// RUM
 		print '<tr><td class="titlefield">'.$langs->trans("RUM").'</td>';
@@ -1515,11 +1584,15 @@ 
 		} elseif ($val == 'IBAN') {
 			$name = 'iban';
 			$size = 30;
-			if ($companybankaccount->needIBAN()) $require=true;
+			if ($companybankaccount->needIBAN()) {
+			    $require=true;
+			}
 		} elseif ($val == 'BIC') {
 			$name = 'bic';
 			$size = 12;
-			if ($companybankaccount->needIBAN()) $require=true;
+			if ($companybankaccount->needIBAN()) {
+			    $require=true;
+			}
 		}
 
 		print '<tr><td'.($require?' class="fieldrequired" ':'').'>'.$langs->trans($val).'</td>';

dolibarr/htdocs/societe/note.php

Braces +22 added lines, -9 removed lines

@@ -35,11 +35,15 @@ 
 
 // Security check
 $id = GETPOST('id')?GETPOST('id','int'):GETPOST('socid','int');
-if ($user->societe_id) $id=$user->societe_id;
+if ($user->societe_id) {
+    $id=$user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $id, '&societe');
 
 $object = new Societe($db);
-if ($id > 0) $object->fetch($id);
+if ($id > 0) {
+    $object->fetch($id);
+}
 
 $permissionnote=$user->rights->societe->creer;	// Used by the include of actions_setnotes.inc.php
 
@@ -61,7 +65,9 @@ 
 $form = new Form($db);
 
 $title=$langs->trans("ThirdParty").' - '.$langs->trans("Notes");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name.' - '.$langs->trans("Notes");
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name.' - '.$langs->trans("Notes");
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
@@ -70,7 +76,9 @@ 
     /*
      * Affichage onglets
      */
-    if (! empty($conf->notification->enabled)) $langs->load("mails");
+    if (! empty($conf->notification->enabled)) {
+        $langs->load("mails");
+    }
 
     $head = societe_prepare_head($object);
 
@@ -89,17 +97,21 @@ 
     print '<div class="underbanner clearboth"></div>';
     print '<table class="border centpercent">';
 
-    if (! empty($conf->global->SOCIETE_USEPREFIX))  // Old not used prefix field
+    if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+        // Old not used prefix field
     {
         print '<tr><td class="'.$cssclass.'">'.$langs->trans('Prefix').'</td><td colspan="3">'.$object->prefix_comm.'</td></tr>';
     }
+    }
 
     if ($object->client)
     {
         print '<tr><td class="'.$cssclass.'">';
         print $langs->trans('CustomerCode').'</td><td colspan="3">';
         print $object->code_client;
-        if ($object->check_codeclient() <> 0) print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        if ($object->check_codeclient() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongCustomerCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -108,7 +120,9 @@ 
         print '<tr><td class="'.$cssclass.'">';
         print $langs->trans('SupplierCode').'</td><td colspan="3">';
         print $object->code_fournisseur;
-        if ($object->check_codefournisseur() <> 0) print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        if ($object->check_codefournisseur() <> 0) {
+            print ' <font class="error">('.$langs->trans("WrongSupplierCode").')</font>';
+        }
         print '</td></tr>';
     }
 
@@ -122,8 +136,7 @@ 
     include DOL_DOCUMENT_ROOT.'/core/tpl/notes.tpl.php';
 
     dol_fiche_end();
-}
-else
+} else
 {
 	$langs->load("errors");
 	print $langs->trans("ErrorRecordNotFound");

dolibarr/htdocs/societe/index.php

Braces +67 added lines, -29 removed lines

@@ -32,7 +32,9 @@ 
 $langs->load("companies");
 
 $socid = GETPOST('socid','int');
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 
 // Security check
 $result=restrictedArea($user,'societe',0,'','','','');
@@ -57,12 +59,14 @@ 
 print '<div class="fichecenter"><div class="fichethirdleft">';
 
 
-if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS))     // This is useless due to the global search combo
+if (! empty($conf->global->MAIN_SEARCH_FORM_ON_HOME_AREAS)) {
+    // This is useless due to the global search combo
 {
     // Search thirdparty
     if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
     {
     	$listofsearchfields['search_thirdparty']=array('text'=>'ThirdParty');
+}
     }
     // Search contact/address
     if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
@@ -78,10 +82,14 @@ 
     	$i=0;
     	foreach($listofsearchfields as $key => $value)
     	{
-    		if ($i == 0) print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
+    		if ($i == 0) {
+    		    print '<tr class="liste_titre"><th colspan="3">'.$langs->trans("Search").'</th></tr>';
+    		}
     		print '<tr '.$bc[false].'>';
     		print '<td class="nowrap"><label for="'.$key.'">'.$langs->trans($value["text"]).'</label></td><td><input type="text" class="flat inputsearch" name="'.$key.'" id="'.$key.'" size="18"></td>';
-    		if ($i == 0) print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		if ($i == 0) {
+    		    print '<td rowspan="'.count($listofsearchfields).'"><input type="submit" value="'.$langs->trans("Search").'" class="button"></td>';
+    		}
     		print '</tr>';
     		$i++;
     	}
@@ -106,11 +114,20 @@ 
 
 $sql = "SELECT s.rowid, s.client, s.fournisseur";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)	$sql.= " AND s.rowid = ".$socid;
-if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";    // client=0, fournisseur=0 must be visible
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
+if (! $user->rights->fournisseur->lire) {
+    $sql.=" AND (s.fournisseur <> 1 OR s.client <> 0)";
+}
+// client=0, fournisseur=0 must be visible
 //print $sql;
 $result = $db->query($sql);
 if ($result)
@@ -122,10 +139,13 @@ 
         if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS) && ($objp->client == 1 || $objp->client == 3)) { $found=1; $third['customer']++; }
         if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS) && $objp->fournisseur) { $found=1; $third['supplier']++; }
         if (! empty($conf->societe->enabled) && $objp->client == 0 && $objp->fournisseur == 0) { $found=1; $third['other']++; }
-        if ($found) $total++;
+        if ($found) {
+            $total++;
+        }
     }
+} else {
+    dol_print_error($db);
 }
-else dol_print_error($db);
 
 print '<div class="div-table-responsive-no-min">';
 print '<table class="noborder nohover" width="100%">'."\n";
@@ -134,10 +154,18 @@ 
 {
     print '<tr><td align="center" colspan="2">';
     $dataseries=array();
-    if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))     $dataseries[]=array($langs->trans("Prospects"), round($third['prospect']));
-    if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))     $dataseries[]=array($langs->trans("Customers"), round($third['customer']));
-    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) $dataseries[]=array($langs->trans("Suppliers"), round($third['supplier']));
-    if (! empty($conf->societe->enabled)) $dataseries[]=array($langs->trans("Others"), round($third['other']));
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) {
+        $dataseries[]=array($langs->trans("Prospects"), round($third['prospect']));
+    }
+    if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) {
+        $dataseries[]=array($langs->trans("Customers"), round($third['customer']));
+    }
+    if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS)) {
+        $dataseries[]=array($langs->trans("Suppliers"), round($third['supplier']));
+    }
+    if (! empty($conf->societe->enabled)) {
+        $dataseries[]=array($langs->trans("Others"), round($third['other']));
+    }
     include_once DOL_DOCUMENT_ROOT.'/core/class/dolgraph.class.php';
     $dolgraph = new DolGraph();
 	$dolgraph->SetData($dataseries);
@@ -148,8 +176,7 @@ 
 	$dolgraph->draw('idgraphthirdparties');
 	print $dolgraph->show();
     print '</td></tr>'."\n";
-}
-else
+} else
 {
     if (! empty($conf->societe->enabled) && $user->rights->societe->lire && empty($conf->global->SOCIETE_DISABLE_PROSPECTS) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
     {
@@ -193,7 +220,9 @@ 
 	$sql.= " FROM ".MAIN_DB_PREFIX."categorie_societe as cs";
 	$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON cs.fk_categorie = c.rowid";
 	$sql.= " WHERE c.type = 2";
-	if (! is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) $sql.= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
+	if (! is_numeric($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)) {
+	    $sql.= " AND c.label like '".$db->escape($conf->global->CATEGORY_GRAPHSTATS_ON_THIRDPARTIES)."'";
+	}
 	$sql.= " AND c.entity IN (".getEntity('category').")";
 	$sql.= " GROUP BY c.label";
 	$total=0;
@@ -214,8 +243,7 @@ 
 				if ($i < $nbmax)
 				{
 					$dataseries[]=array($obj->label, round($obj->nb));
-				}
-				else
+				} else
 				{
 					$rest+=$obj->nb;
 				}
@@ -235,8 +263,7 @@ 
 			$dolgraph->setWidth('100%');
 			$dolgraph->draw('idgraphcateg');
 			print $dolgraph->show();
-		}
-		else
+		} else
 		{
 			while ($i < $num)
 			{
@@ -270,11 +297,19 @@ 
 $sql.= ", s.logo";
 $sql.= ", s.canvas, s.tms as datem, s.status as status";
 $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
+}
 $sql.= ' WHERE s.entity IN ('.getEntity('societe').')';
-if (! $user->rights->societe->client->voir && ! $socid) $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid)	$sql.= " AND s.rowid = ".$socid;
-if (! $user->rights->fournisseur->lire) $sql.=" AND (s.fournisseur != 1 OR s.client != 0)";
+if (! $user->rights->societe->client->voir && ! $socid) {
+    $sql.= " AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
+}
+if ($socid) {
+    $sql.= " AND s.rowid = ".$socid;
+}
+if (! $user->rights->fournisseur->lire) {
+    $sql.=" AND (s.fournisseur != 1 OR s.client != 0)";
+}
 $sql.= $db->order("s.tms","DESC");
 $sql.= $db->plimit($max,0);
 
@@ -327,7 +362,9 @@ 
             	$thirdparty_static->name=$langs->trans("Customer");
             	print $thirdparty_static->getNomUrl(0,'customer',0,1);
             }
-            if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) print " / ";
+            if ($thirdparty_static->client == 3 && empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) {
+                print " / ";
+            }
             if (($thirdparty_static->client==2 || $thirdparty_static->client==3) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS))
             {
             	$thirdparty_static->name=$langs->trans("Prospect");
@@ -335,7 +372,9 @@ 
             }
             if (! empty($conf->fournisseur->enabled) && $thirdparty_static->fournisseur)
             {
-                if ($thirdparty_static->client) print " / ";
+                if ($thirdparty_static->client) {
+                    print " / ";
+                }
             	$thirdparty_static->name=$langs->trans("Supplier");
             	print $thirdparty_static->getNomUrl(0,'supplier',0,1);
             }
@@ -357,8 +396,7 @@ 
         print '</div>';
         print "<!-- End last thirdparties modified -->\n";
     }
-}
-else
+} else
 {
     dol_print_error($db);
 }

dolibarr/htdocs/societe/price.php

Braces +31 added lines, -20 removed lines

@@ -46,8 +46,9 @@ 
 
 // Security check
 $socid = GETPOST('socid', 'int')?GETPOST('socid', 'int'):GETPOST('id', 'int');
-if ($user->societe_id)
+if ($user->societe_id) {
 	$socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'societe', $socid, '&societe');
 
 $object = new Societe($db);
@@ -63,14 +64,18 @@ 
 
 $parameters=array('id'=>$socid);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
-    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) // Both test are required to be compatible with all browsers
+    if (GETPOST('button_removefilter_x','alpha') || GETPOST('button_removefilter.x','alpha') || GETPOST('button_removefilter','alpha')) {
+        // Both test are required to be compatible with all browsers
     {
         $search_prod = '';
     }
+    }
 
     if ($action == 'add_customer_price_confirm' && ! $cancel && ($user->rights->produit->creer || $user->rights->service->creer)) {
 
@@ -181,8 +186,9 @@ 
 $result = $object->fetch($socid);
 llxHeader("", $langs->trans("ThirdParty") . '-' . $langs->trans('PriceByCustomer'));
 
-if (! empty($conf->notification->enabled))
+if (! empty($conf->notification->enabled)) {
 	$langs->load("mails");
+}
 $head = societe_prepare_head($object);
 
 dol_fiche_head($head, 'price', $langs->trans("ThirdParty"), -1, 'company');
@@ -196,17 +202,20 @@ 
 print '<div class="underbanner clearboth"></div>';
 print '<table class="border centpercent">';
 
-if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
+if (! empty($conf->global->SOCIETE_USEPREFIX)) {
+    // Old not used prefix field
 {
 	print '<tr><td class="titlefield">' . $langs->trans('Prefix') . '</td><td colspan="3">' . $object->prefix_comm . '</td></tr>';
 }
+}
 
 if ($object->client) {
 	print '<tr><td class="titlefield">';
 	print $langs->trans('CustomerCode') . '</td><td colspan="3">';
 	print $object->code_client;
-	if ($object->check_codeclient() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+	if ($object->check_codeclient() != 0) {
+			print ' <font class="error">(' . $langs->trans("WrongCustomerCode") . ')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -214,8 +223,9 @@ 
 	print '<tr><td class="titlefield">';
 	print $langs->trans('SupplierCode') . '</td><td colspan="3">';
 	print $object->code_fournisseur;
-	if ($object->check_codefournisseur() != 0)
-		print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+	if ($object->check_codefournisseur() != 0) {
+			print ' <font class="error">(' . $langs->trans("WrongSupplierCode") . ')</font>';
+	}
 	print '</td></tr>';
 }
 
@@ -239,10 +249,12 @@ 
 	$offset = $limit * $page;
 	$pageprev = $page - 1;
 	$pagenext = $page + 1;
-	if (! $sortorder)
-		$sortorder = "ASC";
-	if (! $sortfield)
-		$sortfield = "soc.nom";
+	if (! $sortorder) {
+			$sortorder = "ASC";
+	}
+	if (! $sortfield) {
+			$sortfield = "soc.nom";
+	}
 
 		// Build filter to diplay only concerned lines
 	$filter = array (
@@ -474,8 +486,7 @@ 
 				print '</td>';
 			}
 			print "</table>";
-		}
-		else
+		} else
 		{
 			print $langs->trans('None');
 		}
@@ -483,8 +494,7 @@ 
 		print "\n" . '<div class="tabsAction">' . "\n";
 		print '<div class="inline-block divButAction"><a class="butAction" href="' . $_SERVER["PHP_SELF"] . '?socid=' . $object->id . '">' . $langs->trans("Ok") . '</a></div>';
 		print "\n</div><br>\n";
-	}
-	else
+	} else
 	{
         // View mode
 
@@ -598,11 +608,12 @@ 
 
                 print "</tr>\n";
             }
-        }
-        else
+        } else
         {
             $colspan=9;
-            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) $colspan+=1;
+            if ($user->rights->produit->supprimer || $user->rights->service->supprimer) {
+                $colspan+=1;
+            }
             print '<tr ' . $bc[false] . '><td colspan="'.$colspan.'">' . $langs->trans('None') . '</td></tr>';
         }
 

dolibarr/htdocs/societe/contact.php

Braces +31 added lines, -11 removed lines

@@ -42,12 +42,20 @@ 
 require_once DOL_DOCUMENT_ROOT.'/core/class/extrafields.class.php';
 require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
-if (! empty($conf->adherent->enabled)) require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+if (! empty($conf->adherent->enabled)) {
+    require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
+}
 
 $langs->loadLangs(array("companies","commercial","bills","banks","users"));
-if (! empty($conf->categorie->enabled)) $langs->load("categories");
-if (! empty($conf->incoterm->enabled)) $langs->load("incoterm");
-if (! empty($conf->notification->enabled)) $langs->load("mails");
+if (! empty($conf->categorie->enabled)) {
+    $langs->load("categories");
+}
+if (! empty($conf->incoterm->enabled)) {
+    $langs->load("incoterm");
+}
+if (! empty($conf->notification->enabled)) {
+    $langs->load("mails");
+}
 
 $mesg=''; $error=0; $errors=array();
 
@@ -56,8 +64,12 @@ 
 $backtopage = GETPOST('backtopage','alpha');
 $confirm	= GETPOST('confirm');
 $socid		= GETPOST('socid','int')?GETPOST('socid','int'):GETPOST('id','int');
-if ($user->societe_id) $socid=$user->societe_id;
-if (empty($socid) && $action == 'view') $action='create';
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
+if (empty($socid) && $action == 'view') {
+    $action='create';
+}
 
 $object = new Societe($db);
 $extrafields = new ExtraFields($db);
@@ -98,7 +110,9 @@ 
 
 $parameters=array('id'=>$socid, 'objcanvas'=>$objcanvas);
 $reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action);    // Note that $action and $object may have been modified by some hooks
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook))
 {
@@ -129,18 +143,24 @@ 
 if ($socid > 0 && empty($object->id))
 {
     $result=$object->fetch($socid);
-	if ($result <= 0) dol_print_error('',$object->error);
-}
+	if ($result <= 0) {
+	    dol_print_error('',$object->error);
+	}
+	}
 
 $title=$langs->trans("ThirdParty");
-if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) $title=$object->name." - ".$langs->trans('Card');
+if (! empty($conf->global->MAIN_HTML_TITLE) && preg_match('/thirdpartynameonly/',$conf->global->MAIN_HTML_TITLE) && $object->name) {
+    $title=$object->name." - ".$langs->trans('Card');
+}
 $help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
 llxHeader('',$title,$help_url);
 
 $countrynotdefined=$langs->trans("ErrorSetACountryFirst").' ('.$langs->trans("SeeAbove").')';
 
 
-if (!empty($object->id)) $res=$object->fetch_optionals($object->id,$extralabels);
+if (!empty($object->id)) {
+    $res=$object->fetch_optionals($object->id,$extralabels);
+}
 //if ($res < 0) { dol_print_error($db); exit; }
 
 

dolibarr/htdocs/api/class/api_login.class.php

Braces +10 added lines, -6 removed lines

@@ -61,12 +61,15 @@ 
 	    global $conf, $dolibarr_main_authentication, $dolibarr_auto_user;
 
 		// Authentication mode
-		if (empty($dolibarr_main_authentication))
-			$dolibarr_main_authentication = 'http,dolibarr';
+		if (empty($dolibarr_main_authentication)) {
+					$dolibarr_main_authentication = 'http,dolibarr';
+		}
 		// Authentication mode: forceuser
 		if ($dolibarr_main_authentication == 'forceuser')
 		{
-			if (empty($dolibarr_auto_user)) $dolibarr_auto_user='auto';
+			if (empty($dolibarr_auto_user)) {
+			    $dolibarr_auto_user='auto';
+			}
 			if ($dolibarr_auto_user != $login)
 			{
 				dol_syslog("Warning: your instance is set to use the automatic forced login '".$dolibarr_auto_user."' that is not the requested login. API usage is forbidden in this mode.");
@@ -80,7 +83,9 @@ 
 		{
 			throw new RestException(403, "Bad value for entity, must be the numeric ID of company.");
 		}
-		if ($entity == '') $entity=1;
+		if ($entity == '') {
+		    $entity=1;
+		}
 
 		include_once DOL_DOCUMENT_ROOT . '/core/lib/security2.lib.php';
 		$login = checkLoginPassEntity($login, $password, $entity, $authmode);
@@ -121,8 +126,7 @@ 
     		{
     			throw new RestException(500, 'Error when updating api_key for user :'.$this->db->lasterror());
     		}
-		}
-		else
+		} else
 		{
             $token = $tmpuser->api_key;
 		}

dolibarr/htdocs/api/class/api.class.php

Braces +17 added lines, -9 removed lines

@@ -50,7 +50,9 @@ 
     {
         global $conf, $dolibarr_main_url_root;
 
-        if (empty($cachedir)) $cachedir = $conf->api->dir_temp;
+        if (empty($cachedir)) {
+            $cachedir = $conf->api->dir_temp;
+        }
         Defaults::$cacheDirectory = $cachedir;
 
         $this->db = $db;
@@ -229,8 +231,7 @@ 
 		$featuresarray = array($resource);
 		if (preg_match('/&/', $resource)) {
 			$featuresarray = explode("&", $resource);
-		}
-		else if (preg_match('/\|/', $resource)) {
+		} else if (preg_match('/\|/', $resource)) {
 			$featuresarray = explode("|", $resource);
 		}
 
@@ -258,8 +259,12 @@ 
 	    $counter=0;
 	    while ($i < $nb)
 	    {
-	        if ($tmp[$i]=='(') $counter++;
-	        if ($tmp[$i]==')') $counter--;
+	        if ($tmp[$i]=='(') {
+	            $counter++;
+	        }
+	        if ($tmp[$i]==')') {
+	            $counter--;
+	        }
             if ($counter < 0)
             {
 	           $error="Bad sqlfilters=".$sqlfilters;
@@ -284,16 +289,19 @@ 
 	    global $db;
 
 	    //dol_syslog("Convert matches ".$matches[1]);
-	    if (empty($matches[1])) return '';
+	    if (empty($matches[1])) {
+	        return '';
+	    }
 	    $tmp=explode(':',$matches[1]);
-        if (count($tmp) < 3) return '';
+        if (count($tmp) < 3) {
+            return '';
+        }
 
 	    $tmpescaped=$tmp[2];
 	    if (preg_match('/^\'(.*)\'$/', $tmpescaped, $regbis))
 	    {
 	        $tmpescaped = "'".$db->escape($regbis[1])."'";
-	    }
-	    else
+	    } else
 	    {
 	        $tmpescaped = $db->escape($tmpescaped);
 	    }