alxarafe / alixar

dolibarr/htdocs/user/perms.php

Braces +4 added lines, -4 removed lines

@@ -211,14 +211,14 @@
     $i = 0;
     while ($i < $num) {
         $obj = $db->fetch_object($result);
-        if (!isset($permsgroupbyentity[$obj->entity]))
-            $permsgroupbyentity[$obj->entity] = array();
+        if (!isset($permsgroupbyentity[$obj->entity])) {
+                    $permsgroupbyentity[$obj->entity] = array();
+        }
         array_push($permsgroupbyentity[$obj->entity], $obj->fk_id);
         $i++;
     }
     $db->free($result);
-}
-else {
+} else {
     dol_print_error($db);
 }
 

dolibarr/htdocs/master.inc.php

Braces +60 added lines, -22 removed lines

@@ -54,7 +54,10 @@ 
 $conf->db->dolibarr_main_db_collation	= $dolibarr_main_db_collation;
 $conf->db->dolibarr_main_db_encryption	= $dolibarr_main_db_encryption;
 $conf->db->dolibarr_main_db_cryptkey	= $dolibarr_main_db_cryptkey;
-if (defined('TEST_DB_FORCE_TYPE')) $conf->db->type=constant('TEST_DB_FORCE_TYPE');	// Force db type (for test purpose, by PHP unit for example)
+if (defined('TEST_DB_FORCE_TYPE')) {
+    $conf->db->type=constant('TEST_DB_FORCE_TYPE');
+}
+// Force db type (for test purpose, by PHP unit for example)
 
 // Set properties specific to conf file
 $conf->file->main_limit_users			= $dolibarr_main_limit_users;
@@ -71,8 +74,9 @@ 
 	// dolibarr_main_document_root_alt can contains several directories
 	$values=preg_split('/[;,]/',$dolibarr_main_document_root_alt);
 	$i=0;
-    foreach ($values as $value)
-        $conf->file->dol_document_root['alt' . ($i++)] = (string)$value;
+    foreach ($values as $value) {
+            $conf->file->dol_document_root['alt' . ($i++)] = (string)$value;
+    }
 	$values=preg_split('/[;,]/',$dolibarr_main_url_root_alt);
 	$i=0;
 	foreach($values as $value)
@@ -98,9 +102,16 @@ 
 }
 
 // Chargement des includes principaux de librairies communes
-if (! defined('NOREQUIREUSER')) require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';		// Need 500ko memory
-if (! defined('NOREQUIRETRAN')) require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
-if (! defined('NOREQUIRESOC'))  require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+if (! defined('NOREQUIREUSER')) {
+    require_once DOL_DOCUMENT_ROOT .'/user/class/user.class.php';
+}
+// Need 500ko memory
+if (! defined('NOREQUIRETRAN')) {
+    require_once DOL_DOCUMENT_ROOT .'/core/class/translate.class.php';
+}
+if (! defined('NOREQUIRESOC')) {
+    require_once DOL_DOCUMENT_ROOT .'/societe/class/societe.class.php';
+}
 
 
 /*
@@ -143,25 +154,32 @@ 
  */
 
 // By default conf->entity is 1, but we change this if we ask another value.
-if (session_id() && ! empty($_SESSION["dol_entity"]))			// Entity inside an opened session
+if (session_id() && ! empty($_SESSION["dol_entity"])) {
+    // Entity inside an opened session
 {
 	$conf->entity = $_SESSION["dol_entity"];
 }
-else if (! empty($_ENV["dol_entity"]))							// Entity inside a CLI script
+} else if (! empty($_ENV["dol_entity"])) {
+    // Entity inside a CLI script
 {
 	$conf->entity = $_ENV["dol_entity"];
 }
-else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int'))	// Just after a login page
+} else if (isset($_POST["loginfunction"]) && GETPOST("entity",'int')) {
+    // Just after a login page
 {
 	$conf->entity = GETPOST("entity",'int');
 }
-else if (defined('DOLENTITY') && is_numeric(DOLENTITY))			// For public page with MultiCompany module
+} else if (defined('DOLENTITY') && is_numeric(DOLENTITY)) {
+    // For public page with MultiCompany module
 {
 	$conf->entity = DOLENTITY;
 }
+}
 
 // Sanitize entity
-if (! is_numeric($conf->entity)) $conf->entity=1;
+if (! is_numeric($conf->entity)) {
+    $conf->entity=1;
+}
 
 if (! defined('NOREQUIREDB'))
 {
@@ -193,11 +211,26 @@ 
 if (! empty($conf->global->MAIN_ONLY_LOGIN_ALLOWED))
 {
 	$ok=0;
-	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) $ok=1;	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
-	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;				// We let working pages that is a login submission (login submit, to allow login by admin)
-	elseif (defined('NOREQUIREDB'))   $ok=1;				// We let working pages that don't need database access (xxx.css.php)
-	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) $ok=1;	// We let working pages that ask to work even if only login enabled (logout.php)
-	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) $ok=1;	// We let working if user is allowed admin
+	if ((! session_id() || ! isset($_SESSION["dol_login"])) && ! isset($_POST["username"]) && ! empty($_SERVER["GATEWAY_INTERFACE"])) {
+	    $ok=1;
+	}
+	// We let working pages if not logged and inside a web browser (login form, to allow login by admin)
+	elseif (isset($_POST["username"]) && $_POST["username"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	    $ok=1;
+	}
+	// We let working pages that is a login submission (login submit, to allow login by admin)
+	elseif (defined('NOREQUIREDB')) {
+	    $ok=1;
+	}
+	// We let working pages that don't need database access (xxx.css.php)
+	elseif (defined('EVEN_IF_ONLY_LOGIN_ALLOWED')) {
+	    $ok=1;
+	}
+	// We let working pages that ask to work even if only login enabled (logout.php)
+	elseif (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] == $conf->global->MAIN_ONLY_LOGIN_ALLOWED) {
+	    $ok=1;
+	}
+	// We let working if user is allowed admin
 	if (! $ok)
 	{
 		if (session_id() && isset($_SESSION["dol_login"]) && $_SESSION["dol_login"] != $conf->global->MAIN_ONLY_LOGIN_ALLOWED)
@@ -206,8 +239,7 @@ 
 			print 'You are logged with user "'.$_SESSION["dol_login"].'" and only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '?controller=user&method=logout';
 			print 'Please try later or <a href="'.$nexturl.'">click here to disconnect and change login user</a>...'."\n";
-		}
-		else
+		} else
 		{
 			print 'Sorry, your application is offline. Only administrator user "'.$conf->global->MAIN_ONLY_LOGIN_ALLOWED.'" is allowed to connect for the moment.'."\n";
             $nexturl = BASE_URI . '/';
@@ -226,15 +258,19 @@ 
 	$mysoc->setMysoc($conf);
 
 	// For some countries, we need to invert our address with customer address
-	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
-}
+	if ($mysoc->country_code == 'DE' && ! isset($conf->global->MAIN_INVERT_SENDER_RECIPIENT)) {
+	    $conf->global->MAIN_INVERT_SENDER_RECIPIENT=1;
+	}
+	}
 
 
 // Set default language (must be after the setValues setting global $conf->global->MAIN_LANG_DEFAULT. Page main.inc.php will overwrite langs->defaultlang with user value later)
 if (! defined('NOREQUIRETRAN'))
 {
     $langcode=(GETPOST('lang','aZ09')?GETPOST('lang','aZ09',1):(empty($conf->global->MAIN_LANG_DEFAULT)?'auto':$conf->global->MAIN_LANG_DEFAULT));
-    if (defined('MAIN_LANG_DEFAULT')) $langcode=constant('MAIN_LANG_DEFAULT');
+    if (defined('MAIN_LANG_DEFAULT')) {
+        $langcode=constant('MAIN_LANG_DEFAULT');
+    }
     $langs->setDefaultLang($langcode);
 }
 
@@ -244,5 +280,7 @@ 
 $hookmanager=new HookManager($db);
 
 
-if (! defined('MAIN_LABEL_MENTION_NPR') ) define('MAIN_LABEL_MENTION_NPR','NPR');
+if (! defined('MAIN_LABEL_MENTION_NPR') ) {
+    define('MAIN_LABEL_MENTION_NPR','NPR');
+}
 

dolibarr/htdocs/core/lib/product.lib.php

Braces +63 added lines, -26 removed lines

@@ -53,13 +53,15 @@ 
     	$h++;
 	}
 
-	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status)))   // If margin is on and product on sell, we may need the cost price even if product os not on purchase
+	if (! empty($object->status_buy) || (! empty($conf->margin->enabled) && ! empty($object->status))) {
+	    // If margin is on and product on sell, we may need the cost price even if product os not on purchase
 	{
     	if ((! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->lire)
     	|| (! empty($conf->margin->enabled) && $user->rights->margin->liretous)
     	)
     	{
             $head[$h][0] = BASE_URI . "?controller=product&method=fournisseurs&id=" . $object->id;
+	}
     		$head[$h][1] = $langs->trans("BuyingPrices");
     		$head[$h][2] = 'suppliers';
     		$h++;
@@ -82,7 +84,9 @@ 
 		$head[$h][1] = $langs->trans('AssociatedProducts');
 
 		$nbFatherAndChild = $object->hasFatherOrChild();
-		if ($nbFatherAndChild > 0) $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+		if ($nbFatherAndChild > 0) {
+		    $head[$h][1].= ' <span class="badge">'.$nbFatherAndChild.'</span>';
+		}
 		$head[$h][2] = 'subproduct';
 		$h++;
 	}
@@ -111,17 +115,21 @@ 
 			$head[$h][1] = $langs->trans('ProductCombinations');
 			$head[$h][2] = 'combinations';
 			$nbVariant = $prodcomb->countNbOfCombinationForFkProductParent($object->id);
-            if ($nbVariant > 0) $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
+            if ($nbVariant > 0) {
+                $head[$h][1].= ' <span class="badge">'.$nbVariant.'</span>';
+            }
 		}
 
 		$h++;
 	}
 
-    if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES)))    // If physical product we can stock (or service with option)
+    if ($object->isProduct() || ($object->isService() && ! empty($conf->global->STOCK_SUPPORTS_SERVICES))) {
+        // If physical product we can stock (or service with option)
     {
         if (! empty($conf->stock->enabled) && $user->rights->stock->lire)
         {
             $head[$h][0] = BASE_URI . "?controller=product/stock&method=product&id=" . $object->id;
+    }
             $head[$h][1] = $langs->trans("Stock");
             $head[$h][2] = 'stock';
             $h++;
@@ -138,11 +146,17 @@ 
     if (empty($conf->global->MAIN_DISABLE_NOTES_TAB))
     {
         $nbNote = 0;
-        if(!empty($object->note_private)) $nbNote++;
-        if(!empty($object->note_public)) $nbNote++;
+        if(!empty($object->note_private)) {
+            $nbNote++;
+        }
+        if(!empty($object->note_public)) {
+            $nbNote++;
+        }
         $head[$h][0] = BASE_URI . '?controller=product&method=note&id=' . $object->id;
         $head[$h][1] = $langs->trans('Notes');
-        if ($nbNote > 0) $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        if ($nbNote > 0) {
+            $head[$h][1].= ' <span class="badge">'.$nbNote.'</span>';
+        }
         $head[$h][2] = 'note';
         $h++;
     }
@@ -150,18 +164,28 @@ 
     // Attachments
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
     require_once DOL_DOCUMENT_ROOT.'/core/class/link.class.php';
-    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
-    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) {
+        $upload_dir = $conf->product->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    }
+    if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) {
+        $upload_dir = $conf->service->multidir_output[$object->entity].'/'.dol_sanitizeFileName($object->ref);
+    }
     $nbFiles = count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     if (! empty($conf->global->PRODUCT_USE_OLD_PATH_FOR_PHOTO)) {
-        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
-        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        if (! empty($conf->product->enabled) && ($object->type==Product::TYPE_PRODUCT)) {
+            $upload_dir = $conf->produit->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        }
+        if (! empty($conf->service->enabled) && ($object->type==Product::TYPE_SERVICE)) {
+            $upload_dir = $conf->service->multidir_output[$object->entity].'/'.get_exdir($object->id,2,0,0,$object,'product').$object->id.'/photos';
+        }
         $nbFiles += count(dol_dir_list($upload_dir,'files',0,'','(\.meta|_preview.*\.png)$'));
     }
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = BASE_URI . '?controller=product&method=document&id=' . $object->id;
 	$head[$h][1] = $langs->trans('Documents');
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
 	$head[$h][2] = 'documents';
 	$h++;
 
@@ -210,7 +234,9 @@ 
     $nbLinks=Link::count($db, $object->element, $object->id);
     $head[$h][0] = BASE_URI . "?controller=product/stock&method=productlot_document&id=" . $object->id;
 	$head[$h][1] = $langs->trans("Documents");
-	if (($nbFiles+$nbLinks) > 0) $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	if (($nbFiles+$nbLinks) > 0) {
+	    $head[$h][1].= ' <span class="badge">'.($nbFiles+$nbLinks).'</span>';
+	}
     $head[$h][2] = 'documents';
 	$h++;
 
@@ -335,7 +361,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_propale($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("propal");
 		print '<tr><td>';
 		print '<a href="propal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("Proposals").'</a>';
@@ -353,7 +381,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_proposal_supplier($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("propal");
 		print '<tr><td>';
 		print '<a href="supplier_proposal.php?id='.$product->id.'">'.img_object('','propal').' '.$langs->trans("SupplierProposals").'</a>';
@@ -371,7 +401,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_commande($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
 		print '<a href="commande.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("CustomersOrders").'</a>';
@@ -389,7 +421,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_commande_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("orders");
 		print '<tr><td>';
 		print '<a href="commande_fournisseur.php?id='.$product->id.'">'.img_object('','order').' '.$langs->trans("SuppliersOrders").'</a>';
@@ -407,7 +441,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_facture($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
 		print '<a href="facture.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("CustomersInvoices").'</a>';
@@ -425,7 +461,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_facture_fournisseur($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("bills");
 		print '<tr><td>';
 		print '<a href="facture_fournisseur.php?id='.$product->id.'">'.img_object('','bill').' '.$langs->trans("SuppliersInvoices").'</a>';
@@ -444,7 +482,9 @@ 
 	{
 		$nblines++;
 		$ret=$product->load_stats_contrat($socid);
-		if ($ret < 0) dol_print_error($db);
+		if ($ret < 0) {
+		    dol_print_error($db);
+		}
 		$langs->load("contracts");
 		print '<tr><td>';
 		print '<a href="contrat.php?id='.$product->id.'">'.img_object('','contract').' '.$langs->trans("Contracts").'</a>';
@@ -483,8 +523,7 @@ 
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("WeightUnitmg");
 		$measuring_units[98] = $langs->transnoentitiesnoconv("WeightUnitounce");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("WeightUnitpound");
-	}
-	else if ($measuring_style == 'size')
+	} else if ($measuring_style == 'size')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("SizeUnitm");
 		$measuring_units[-1] = $langs->transnoentitiesnoconv("SizeUnitdm");
@@ -492,8 +531,7 @@ 
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("SizeUnitmm");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SizeUnitfoot");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("SizeUnitinch");
-	}
-	else if ($measuring_style == 'surface')
+	} else if ($measuring_style == 'surface')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("SurfaceUnitm2");
 		$measuring_units[-2] = $langs->transnoentitiesnoconv("SurfaceUnitdm2");
@@ -501,8 +539,7 @@ 
 		$measuring_units[-6] = $langs->transnoentitiesnoconv("SurfaceUnitmm2");
         $measuring_units[98] = $langs->transnoentitiesnoconv("SurfaceUnitfoot2");
 		$measuring_units[99] = $langs->transnoentitiesnoconv("SurfaceUnitinch2");
-	}
-	else if ($measuring_style == 'volume')
+	} else if ($measuring_style == 'volume')
 	{
 		$measuring_units[0] = $langs->transnoentitiesnoconv("VolumeUnitm3");
 		$measuring_units[-3] = $langs->transnoentitiesnoconv("VolumeUnitdm3");

dolibarr/htdocs/don/card.php

Braces +41 added lines, -35 removed lines

@@ -74,7 +74,9 @@ 
  */
 
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+    setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if ($action == 'update')
 {
@@ -122,7 +124,9 @@ 
 
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		if ($object->update($user) > 0)
 		{
@@ -176,15 +180,16 @@ 
 
 		// Fill array 'array_options' with data from add form
         $ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-		if ($ret < 0) $error++;
+		if ($ret < 0) {
+		    $error++;
+		}
 
 		$res = $object->create($user);
 		if ($res > 0)
 		{
             header("Location: " . $_SERVER['PHP_SELF'] . '&id=' . $res);
 			exit;
-		}
-		else
+		} else
 		{
 			setEventMessages($object->error, $object->errors, 'errors');
 		}
@@ -198,8 +203,7 @@ 
     {
         header("Location: index.php");
         exit;
-    }
-    else
+    } else
     {
         dol_syslog($object->error,LOG_DEBUG);
         setEventMessages($object->error, $object->errors, 'errors');
@@ -214,8 +218,7 @@ 
 
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -226,8 +229,7 @@ 
     {
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
         exit;
-    }
-    else {
+    } else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
 }
@@ -238,12 +240,10 @@ 
 	{
         header("Location: " . $_SERVER['PHP_SELF'] . "&id=" . $id);
 		exit;
-	}
-    else {
+	} else {
 	    setEventMessages($object->error, $object->errors, 'errors');
     }
-}
-else if ($action == 'classin' && $user->rights->don->creer)
+} else if ($action == 'classin' && $user->rights->don->creer)
 {
 	$object->fetch($id);
 	$object->setProject($projectid);
@@ -351,13 +351,14 @@ 
 			print price($outstandingBills, '', $langs, 0, 0, -1, $conf->currency);
 			if ($soc->outstanding_limit != '')
 			{
-				if ($outstandingBills > $soc->outstanding_limit) print img_warning($langs->trans("OutstandingBillReached"));
+				if ($outstandingBills > $soc->outstanding_limit) {
+				    print img_warning($langs->trans("OutstandingBillReached"));
+				}
 				print ' / ' . price($soc->outstanding_limit, '', $langs, 0, 0, -1, $conf->currency);
 			}
 			print ')';
 			print '</td>';
-		}
-		else
+		} else
 		{
 			print '<td colspan="2">';
 			print $form->select_company($soc->id, 'socid', '(s.client = 1 OR s.client = 3) AND status=1', 'SelectThirdParty', 0, 0, null, 0, 'minwidth300');
@@ -413,7 +414,9 @@ 
 		// Country
 		print '<tr><td><label for="selectcountry_id">'.$langs->trans('Country').'</label></td><td class="maxwidthonsmartphone">';
 		print $form->select_country(GETPOST('country_id')!=''?GETPOST('country_id'):$object->country_id);
-		if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		if ($user->admin) {
+		    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+		}
 		print '</td></tr>';
 
 		print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" value="'.dol_escape_htmltag(GETPOST("email")).'" class="maxwidth200"></td></tr>';
@@ -522,8 +525,7 @@ 
 	if ($object->statut == 0)
 	{
 		print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.dol_escape_htmltag($object->amount).'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>';
-	}
-	else
+	} else
 	{
 		print '<tr><td>'.$langs->trans("Amount").'</td><td>';
 		print price($object->amount,0,$langs,0,0,-1,$conf->currency);
@@ -552,15 +554,20 @@ 
 	// Country
 	print '<tr><td class="titlefieldcreate">'.$langs->trans('Country').'</td><td>';
 	print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
-	if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	if ($user->admin) {
+	    print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
+	}
 	print '</td></tr>';
 
 	print "<tr>".'<td>'.$langs->trans("EMail").'</td><td><input type="text" name="email" class="maxwidth200" value="'.dol_escape_htmltag($object->email).'"></td></tr>';
 
 	// Payment mode
     print "<tr><td>".$langs->trans("PaymentMode")."</td><td>\n";
-    if ($object->modepaymentid) $selected = $object->modepaymentid;
-    else $selected = '';
+    if ($object->modepaymentid) {
+        $selected = $object->modepaymentid;
+    } else {
+        $selected = '';
+    }
     $form->select_types_paiements($selected, 'modepayment', 'CRDT', 0, 1);
     print "</td></tr>\n";
 
@@ -640,8 +647,9 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        }
 	            if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
@@ -763,8 +771,7 @@ 
 		}
 		print "</table>";
 		$db->free($resql);
-	}
-	else
+	} else
 	{
 		dol_print_error($db);
 	}
@@ -801,8 +808,7 @@ 
 		if ($remaintopay == 0)
 		{
 			print '<div class="inline-block divButAction"><span class="butActionRefused classfortooltip" title="' . $langs->trans("DisabledBecauseRemainderToPayIsZero") . '">' . $langs->trans('DoPayment') . '</span></div>';
-		}
-		else
+		} else
 		{
             print '<div class="inline-block divButAction"><a class="butAction" href="' . BASE_URI . '?controller=don/payment&method=payment&rowid=' . $object->id . '&amp;action=create">' . $langs->trans('DoPayment') . '</a></div>';
 		}
@@ -821,13 +827,11 @@ 
 		{
             // TODO: Original href="card.php?rowid='.$object->id.'&action=delete"
             print '<div class="inline-block divButAction"><a class="butActionDelete" href="?controller=don&method=card&rowid=' . $object->id . '&action=delete">' . $langs->trans("Delete") . "</a></div>";
-		}
-		else
+		} else
 		{
 			print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 		}
-	}
-	else
+	} else
 	{
 		print '<div class="inline-block divButAction"><a class="butActionRefused classfortooltip" href="#">'.$langs->trans("Delete")."</a></div>";
 	}
@@ -855,9 +859,11 @@ 
 		// Show online payment link
 		$useonlinepayment = (! empty($conf->paypal->enabled) || ! empty($conf->stripe->enabled) || ! empty($conf->paybox->enabled));
 
-		if ($useonlinepayment) //$object->statut != Facture::STATUS_DRAFT &&
+		if ($useonlinepayment) {
+		    //$object->statut != Facture::STATUS_DRAFT &&
 		{
 			print '<br><!-- Link to pay -->'."\n";
+		}
 			require_once DOL_DOCUMENT_ROOT.'/core/lib/payments.lib.php';
 			print showOnlinePaymentUrl('donation', $object->ref).'<br>';
 		}

dolibarr/htdocs/don/class/paymentdonation.class.php

Braces +73 added lines, -24 removed lines

@@ -116,26 +116,47 @@ 
         }
 
         // Clean parameters
-        if (isset($this->fk_donation)) $this->fk_donation = trim($this->fk_donation);
-        if (isset($this->amount)) $this->amount = trim($this->amount);
-        if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
-        if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-        if (isset($this->note)) $this->note = trim($this->note);
-        if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
-        if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
-        if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
+        if (isset($this->fk_donation)) {
+            $this->fk_donation = trim($this->fk_donation);
+        }
+        if (isset($this->amount)) {
+            $this->amount = trim($this->amount);
+        }
+        if (isset($this->fk_typepayment)) {
+            $this->fk_typepayment = trim($this->fk_typepayment);
+        }
+        if (isset($this->num_payment)) {
+            $this->num_payment = trim($this->num_payment);
+        }
+        if (isset($this->note)) {
+            $this->note = trim($this->note);
+        }
+        if (isset($this->fk_bank)) {
+            $this->fk_bank = trim($this->fk_bank);
+        }
+        if (isset($this->fk_user_creat)) {
+            $this->fk_user_creat = trim($this->fk_user_creat);
+        }
+        if (isset($this->fk_user_modif)) {
+            $this->fk_user_modif = trim($this->fk_user_modif);
+        }
 
         $totalamount = 0;
-        foreach ($this->amounts as $key => $value)  // How payment is dispatch
+        foreach ($this->amounts as $key => $value) {
+            // How payment is dispatch
         {
             $newvalue = price2num($value, 'MT');
+        }
             $this->amounts[$key] = $newvalue;
             $totalamount += $newvalue;
         }
         $totalamount = price2num($totalamount);
 
         // Check parameters
-        if ($totalamount == 0) return -1; // On accepte les montants negatifs pour les rejets de prelevement mais pas null
+        if ($totalamount == 0) {
+            return -1;
+        }
+        // On accepte les montants negatifs pour les rejets de prelevement mais pas null
 
 
         $this->db->begin();
@@ -260,14 +281,30 @@ 
 
         // Clean parameters
 
-        if (isset($this->fk_donation)) $this->fk_donation = trim($this->fk_donation);
-        if (isset($this->amount)) $this->amount = trim($this->amount);
-        if (isset($this->fk_typepayment)) $this->fk_typepayment = trim($this->fk_typepayment);
-        if (isset($this->num_payment)) $this->num_payment = trim($this->num_payment);
-        if (isset($this->note)) $this->note = trim($this->note);
-        if (isset($this->fk_bank)) $this->fk_bank = trim($this->fk_bank);
-        if (isset($this->fk_user_creat)) $this->fk_user_creat = trim($this->fk_user_creat);
-        if (isset($this->fk_user_modif)) $this->fk_user_modif = trim($this->fk_user_modif);
+        if (isset($this->fk_donation)) {
+            $this->fk_donation = trim($this->fk_donation);
+        }
+        if (isset($this->amount)) {
+            $this->amount = trim($this->amount);
+        }
+        if (isset($this->fk_typepayment)) {
+            $this->fk_typepayment = trim($this->fk_typepayment);
+        }
+        if (isset($this->num_payment)) {
+            $this->num_payment = trim($this->num_payment);
+        }
+        if (isset($this->note)) {
+            $this->note = trim($this->note);
+        }
+        if (isset($this->fk_bank)) {
+            $this->fk_bank = trim($this->fk_bank);
+        }
+        if (isset($this->fk_user_creat)) {
+            $this->fk_user_creat = trim($this->fk_user_creat);
+        }
+        if (isset($this->fk_user_modif)) {
+            $this->fk_user_modif = trim($this->fk_user_modif);
+        }
 
         // Check parameters
         // Put here code to add control on parameters values
@@ -522,7 +559,9 @@ 
             $acc->fetch($accountid);
 
             $total = $this->total;
-            if ($mode == 'payment_donation') $amount = $total;
+            if ($mode == 'payment_donation') {
+                $amount = $total;
+            }
 
             // Insert payment into llx_bank
             $bank_line_id = $acc->addline(
@@ -548,7 +587,9 @@ 
 
                 // Add link 'payment', 'payment_supplier', 'payment_donation' in bank_url between payment and bank transaction
                 $url = '';
-                if ($mode == 'payment_donation') $url = DOL_URL_ROOT . '/don/payment/card.php?rowid=';
+                if ($mode == 'payment_donation') {
+                    $url = DOL_URL_ROOT . '/don/payment/card.php?rowid=';
+                }
                 if ($url) {
                     $result = $acc->add_url_line($bank_line_id, $this->id, $url, '(paiement)', $mode);
                     if ($result <= 0) {
@@ -606,16 +647,24 @@ 
 
         $result = '';
 
-        if (empty($this->ref)) $this->ref = $this->lib;
+        if (empty($this->ref)) {
+            $this->ref = $this->lib;
+        }
         $label = $langs->trans("ShowPayment") . ': ' . $this->ref;
 
         if (!empty($this->id)) {
             $link = '<a href="' . DOL_URL_ROOT . '/don/payment/card.php?id=' . $this->id . '" title="' . dol_escape_htmltag($label, 1) . '" class="classfortooltip">';
             $linkend = '</a>';
 
-            if ($withpicto) $result .= ($link . img_object($label, 'payment', 'class="classfortooltip"') . $linkend . ' ');
-            if ($withpicto && $withpicto != 2) $result .= ' ';
-            if ($withpicto != 2) $result .= $link . ($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref) . $linkend;
+            if ($withpicto) {
+                $result .= ($link . img_object($label, 'payment', 'class="classfortooltip"') . $linkend . ' ');
+            }
+            if ($withpicto && $withpicto != 2) {
+                $result .= ' ';
+            }
+            if ($withpicto != 2) {
+                $result .= $link . ($maxlen ? dol_trunc($this->ref, $maxlen) : $this->ref) . $linkend;
+            }
         }
 
         return $result;

dolibarr/htdocs/don/note.php

Braces +6 added lines, -3 removed lines

@@ -47,7 +47,9 @@ 
 
 // Security check
 $socid=0;
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result=restrictedArea($user,'don',$id,'');
 
 $object = new Don($db);
@@ -98,10 +100,11 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 	            if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+	        }
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
 	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

dolibarr/htdocs/don/info.php

Braces +6 added lines, -3 removed lines

@@ -40,7 +40,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid = $user->societe_id;
+if ($user->societe_id) {
+    $socid = $user->societe_id;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 $object = new Don($db);
@@ -79,10 +81,11 @@ 
     $langs->load("projects");
     $morehtmlref .= $langs->trans('Project') . ' ';
     if ($user->rights->don->creer) {
-        if ($action != 'classify')
-            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+        if ($action != 'classify') {
+                    // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
             if ($action == 'classify') {
                 $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+        }
                 $morehtmlref .= '<input type="hidden" name="action" value="classin">';
                 $morehtmlref .= '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
                 $morehtmlref .= $formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);

dolibarr/htdocs/don/document.php

Braces +13 added lines, -7 removed lines

@@ -54,7 +54,9 @@ 
 $projectid = (GETPOST('projectid') ? GETPOST('projectid', 'int') : 0);
 
 // Security check
-if ($user->societe_id) $socid=$user->societe_id;
+if ($user->societe_id) {
+    $socid=$user->societe_id;
+}
 $result = restrictedArea($user, 'don', $id, '');
 
 
@@ -66,8 +68,12 @@ 
 $offset = $conf->liste_limit * $page;
 $pageprev = $page - 1;
 $pagenext = $page + 1;
-if (! $sortorder) $sortorder="ASC";
-if (! $sortfield) $sortfield="name";
+if (! $sortorder) {
+    $sortorder="ASC";
+}
+if (! $sortfield) {
+    $sortfield="name";
+}
 
 
 $object = new Don($db);
@@ -129,10 +135,11 @@ 
 	    $morehtmlref.=$langs->trans('Project') . ' ';
 	    if ($user->rights->don->creer)
 	    {
-	        if ($action != 'classify')
-	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
+	        if ($action != 'classify') {
+	        	            // $morehtmlref.='<a href="' . $_SERVER['PHP_SELF'] . '?action=classify&amp;id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetProject')) . '</a> : ';
 	            if ($action == 'classify') {
                     $morehtmlref .= '<form method="post" action="' . $_SERVER['PHP_SELF'] . '&id=' . $object->id . '">';
+	        }
 	                $morehtmlref.='<input type="hidden" name="action" value="classin">';
 	                $morehtmlref.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 	                $morehtmlref.=$formproject->select_projects($object->socid, $object->fk_project, 'projectid', $maxlength, 0, 1, 0, 1, 0, 0, '', 1);
@@ -188,8 +195,7 @@ 
     $permtoedit = $user->rights->don->creer;
     $param = '&id=' . $object->id;
     include_once DOL_DOCUMENT_ROOT . '/core/tpl/document_actions_post_headers.tpl.php';
-}
-else
+} else
 {
 	print $langs->trans("ErrorUnknown");
 }

dolibarr/htdocs/dav/dav.lib.php

Braces +12 added lines, -10 removed lines

@@ -23,19 +23,21 @@
 
 // define CDAV_CONTACT_TAG if not
 if (!defined('CDAV_CONTACT_TAG')) {
-    if (isset($conf->global->CDAV_CONTACT_TAG))
-        define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
-    else
-        define('CDAV_CONTACT_TAG', '');
-}
+    if (isset($conf->global->CDAV_CONTACT_TAG)) {
+            define('CDAV_CONTACT_TAG', $conf->global->CDAV_CONTACT_TAG);
+    } else {
+            define('CDAV_CONTACT_TAG', '');
+    }
+    }
 
 // define CDAV_URI_KEY if not
 if (!defined('CDAV_URI_KEY')) {
-    if (isset($conf->global->CDAV_URI_KEY))
-        define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
-    else
-        define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
-}
+    if (isset($conf->global->CDAV_URI_KEY)) {
+            define('CDAV_URI_KEY', $conf->global->CDAV_URI_KEY);
+    } else {
+            define('CDAV_URI_KEY', substr(md5($_SERVER['HTTP_HOST']), 0, 8));
+    }
+    }
 
 
 /**