alxarafe / alixar

dolibarr/htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php

Braces +10 added lines, -5 removed lines

@@ -166,8 +166,7 @@ 
 	                	}
 
                         $ok = 1;
-	                }
-	                else
+	                } else
 	                {
 	                	$this->error = $userstat->error;
 	                	$this->errors = $userstat->errors;
@@ -282,10 +281,16 @@ 
 			            	}
 
 			            	$qualified = true;
-			            	if (empty($enabled)) $qualified = false;
-			            	if (empty($perms)) $qualified = false;
+			            	if (empty($enabled)) {
+			            	    $qualified = false;
+			            	}
+			            	if (empty($perms)) {
+			            	    $qualified = false;
+			            	}
 
-			            	if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	if ($qualified) {
+			            	    $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			            	}
 			            }
 
 			            $message_customer.='</ul>';

dolibarr/htdocs/core/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php

Braces +14 added lines, -9 removed lines

@@ -56,11 +56,16 @@ 
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->blockedlog->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->blockedlog->enabled)) {
+		    return 0;
+		}
+		// Module not active, we do nothing
 
 		// Test if event/record is qualified
 		$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
-		if (! in_array($object->element, $listofqualifiedelement)) return 1;
+		if (! in_array($object->element, $listofqualifiedelement)) {
+		    return 1;
+		}
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -88,12 +93,14 @@ 
 
 			if (in_array($action, array(
 				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
-			elseif ($action == 'CASHCONTROL_VALIDATE')
+				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) {
+			    $amounts = (double) $object->amount;
+			} elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
+			} else {
+			    $amounts = (double) $object->total_ttc;
 			}
-			else $amounts = (double) $object->total_ttc;
 		}
 		/*if ($action === 'BILL_PAYED' || $action==='BILL_UNPAYED'
 		 || $action === 'BILL_SUPPLIER_PAYED' || $action === 'BILL_SUPPLIER_UNPAYED')
@@ -111,8 +118,7 @@ 
 					$amounts += price2num($amount);
 				}
 			}
-		}
-		elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
+		} elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
 		{
 			$qualified++;
 			$amounts = (double) $object->amount;
@@ -141,8 +147,7 @@ 
 			$this->error = $b->error;
 			$this->errors = $b->errors;
 			return -1;
-		}
-		else
+		} else
 		{
 			return 1;
 		}

dolibarr/htdocs/core/db/DoliDB.class.php

Braces +24 added lines, -17 removed lines

@@ -120,8 +120,7 @@ 
 				dol_syslog('',0,1);
 			}
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened++;
 			dol_syslog('',0,1);
@@ -146,13 +145,11 @@ 
 				$this->transaction_opened=0;
 				dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
 				return 1;
-			}
-			else
+			} else
 			{
 				return 0;
 			}
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -174,8 +171,7 @@ 
 			$this->transaction_opened=0;
 			dol_syslog("ROLLBACK Transaction".($log?' '.$log:''),LOG_DEBUG);
 			return $ret;
-		}
-		else
+		} else
 		{
 			$this->transaction_opened--;
 			return 1;
@@ -192,10 +188,17 @@ 
 	function plimit($limit=0,$offset=0)
 	{
 		global $conf;
-		if (empty($limit)) return "";
-		if ($limit < 0) $limit=$conf->liste_limit;
-		if ($offset > 0) return " LIMIT $offset,$limit ";
-		else return " LIMIT $limit ";
+		if (empty($limit)) {
+		    return "";
+		}
+		if ($limit < 0) {
+		    $limit=$conf->liste_limit;
+		}
+		if ($offset > 0) {
+		    return " LIMIT $offset,$limit ";
+		} else {
+		    return " LIMIT $limit ";
+		}
 	}
 
 	/**
@@ -235,8 +238,11 @@ 
 			$i=0;
 			foreach($fields as $val)
 			{
-				if (! $return) $return.=' ORDER BY ';
-				else $return.=', ';
+				if (! $return) {
+				    $return.=' ORDER BY ';
+				} else {
+				    $return.=', ';
+				}
 
 				$return.=preg_replace('/[^0-9a-z_\.]/i','',$val);
 
@@ -252,8 +258,7 @@ 
 				$i++;
 			}
 			return $return;
-		}
-		else
+		} else
 		{
 			return '';
 		}
@@ -281,7 +286,9 @@ 
 	function jdate($string, $gm=false)
 	{
 		// TODO GMT must set param gm to true by default
-		if ($string==0 || $string=="0000-00-00 00:00:00") return '';
+		if ($string==0 || $string=="0000-00-00 00:00:00") {
+		    return '';
+		}
 		$string=preg_replace('/([^0-9])/i','',$string);
 		$tmp=$string.'000000';
 		$date=dol_mktime(substr($tmp,8,2),substr($tmp,10,2),substr($tmp,12,2),substr($tmp,4,2),substr($tmp,6,2),substr($tmp,0,4),$gm);

dolibarr/htdocs/core/actions_builddoc.inc.php

Braces +33 added lines, -14 removed lines

@@ -37,8 +37,7 @@ 
     if (is_numeric(GETPOST('model','alpha')))
     {
         $error=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Model"));
-    }
-    else
+    } else
     {
    		// Reload to get all modified line records and be ready for hooks
         $ret = $object->fetch($id);
@@ -68,9 +67,17 @@ 
         $outputlangs = $langs;
         $newlang='';
 
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) $newlang=GETPOST('lang_id','aZ09');
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) $newlang=$object->thirdparty->default_lang;  // for proposal, order, invoice, ...
-        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) $newlang=$object->default_lang;                  // for thirdparty
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && GETPOST('lang_id','aZ09')) {
+            $newlang=GETPOST('lang_id','aZ09');
+        }
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->thirdparty->default_lang)) {
+            $newlang=$object->thirdparty->default_lang;
+        }
+        // for proposal, order, invoice, ...
+        if ($conf->global->MAIN_MULTILANGS && empty($newlang) && isset($object->default_lang)) {
+            $newlang=$object->default_lang;
+        }
+        // for thirdparty
         if (! empty($newlang))
         {
             $outputlangs = new Translate("",$conf);
@@ -78,22 +85,31 @@ 
         }
 
         // To be sure vars is defined
-        if (empty($hidedetails)) $hidedetails=0;
-        if (empty($hidedesc)) $hidedesc=0;
-        if (empty($hideref)) $hideref=0;
-        if (empty($moreparams)) $moreparams=null;
+        if (empty($hidedetails)) {
+            $hidedetails=0;
+        }
+        if (empty($hidedesc)) {
+            $hidedesc=0;
+        }
+        if (empty($hideref)) {
+            $hideref=0;
+        }
+        if (empty($moreparams)) {
+            $moreparams=null;
+        }
 
         $result= $object->generateDocument($object->modelpdf, $outputlangs, $hidedetails, $hidedesc, $hideref, $moreparams);
         if ($result <= 0)
         {
             setEventMessages($object->error, $object->errors, 'errors');
             $action='';
-        }
-        else
+        } else
         {
-        	if (empty($donotredirect))	// This is set when include is done by bulk action "Bill Orders"
+        	if (empty($donotredirect)) {
+        	    // This is set when include is done by bulk action "Bill Orders"
         	{
 	            setEventMessages($langs->trans("FileGenerated"), null);
+        	}
 
 	            $urltoredirect = $_SERVER['REQUEST_URI'];
 	            $urltoredirect = preg_replace('/#builddoc$/', '', $urltoredirect);
@@ -122,8 +138,11 @@ 
     $filetodelete=GETPOST('file','alpha');
     $file =	$upload_dir	. '/' .	$filetodelete;
     $ret=dol_delete_file($file,0,0,0,$object);
-    if ($ret) setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
-    else setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    if ($ret) {
+        setEventMessages($langs->trans("FileWasRemoved", $filetodelete), null, 'mesgs');
+    } else {
+        setEventMessages($langs->trans("ErrorFailToDeleteFile", $filetodelete), null, 'errors');
+    }
 
     // Make a redirect to avoid to keep the remove_file into the url that create side effects
     $urltoredirect = $_SERVER['REQUEST_URI'];

dolibarr/htdocs/core/search_page.php

Braces +19 added lines, -8 removed lines

@@ -27,15 +27,24 @@ 
 //if (! defined('NOREQUIREDB'))   define('NOREQUIREDB','1');		// Not disabled cause need to load personalized language
 //if (! defined('NOREQUIRESOC'))    define('NOREQUIRESOC','1');
 //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1');		// Not disabled cause need to do translations
-if (! defined('NOCSRFCHECK'))     define('NOCSRFCHECK',1);
-if (! defined('NOTOKENRENEWAL'))  define('NOTOKENRENEWAL',1);
+if (! defined('NOCSRFCHECK')) {
+    define('NOCSRFCHECK',1);
+}
+if (! defined('NOTOKENRENEWAL')) {
+    define('NOTOKENRENEWAL',1);
+}
 //if (! defined('NOLOGIN')) define('NOLOGIN',1);					// Not disabled cause need to load personalized language
-if (! defined('NOREQUIREMENU'))  define('NOREQUIREMENU',1);
+if (! defined('NOREQUIREMENU')) {
+    define('NOREQUIREMENU',1);
+}
 //if (! defined('NOREQUIREHTML'))  define('NOREQUIREHTML',1);
 
 require_once '../main.inc.php';
 
-if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09'));	// If language was forced on URL by the main.inc.php
+if (GETPOST('lang', 'aZ09')) {
+    $langs->setDefaultLang(GETPOST('lang', 'aZ09'));
+}
+// If language was forced on URL by the main.inc.php
 
 $langs->load("main");
 
@@ -69,13 +78,14 @@ 
 // Define $searchform
 $searchform = '';
 
-if ($conf->use_javascript_ajax && 1 == 2)   // select2 is ko with jmobile
+if ($conf->use_javascript_ajax && 1 == 2) {
+    // select2 is ko with jmobile
 {
     if (! is_object($form)) $form=new Form($db);
+}
     $selected=-1;
     $searchform.='<br><br>'.$form->selectArrayAjax('searchselectcombo', DOL_URL_ROOT.'/core/ajax/selectsearchbox.php', $selected, '', '', 0, 1, 'minwidth300', 1, $langs->trans("Search"), 0);
-}
-else
+} else
 {
     $usedbyinclude = 1; // Used into next include
 	$showtitlebefore = GETPOST('showtitlebefore','int');
@@ -104,8 +114,9 @@ 
 if (empty($reshook))
 {
 	$searchform.=$hookmanager->resPrint;
+} else {
+    $searchform=$hookmanager->resPrint;
 }
-else $searchform=$hookmanager->resPrint;
 
 
 print "\n";

dolibarr/htdocs/core/actions_extrafields.inc.php

Braces +31 added lines, -29 removed lines

@@ -31,10 +31,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
@@ -122,8 +130,7 @@ 
 	    					$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	    					$action = 'create';
 	    				}
-	    			}
-	    			else
+	    			} else
 	    			{
 	    				$error++;
 	    				$langs->load("errors");
@@ -149,8 +156,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -162,7 +168,9 @@ 
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-				if ($type == 'separate') $visibility=3;
+				if ($type == 'separate') {
+				    $visibility=3;
+				}
 
                 $result=$extrafields->addExtraField(
                 	GETPOST('attrname', 'alpha'),
@@ -190,15 +198,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");
@@ -206,8 +212,7 @@ 
     			setEventMessages($mesg, null, 'errors');
     			$action = 'create';
     		}
-	    }
-	    else
+	    } else
 	    {
 	    	setEventMessages($mesg, null, 'errors');
 	    }
@@ -292,8 +297,7 @@ 
 	        				$mesg[]=$langs->trans("ErrorBadFormatValueList",$param_ligne);
 	        				$action = 'edit';
 	        			}
-	        		}
-	        		else
+	        		} else
 	        		{
 	        			$error++;
 	        			$langs->load("errors");
@@ -318,8 +322,7 @@ 
     				{
     					$params['options'] = array($parameters=>null);
     				}
-    			}
-    			else
+    			} else
     			{
     				//Esle it's separated key/value and coma list
     				foreach($parameters_array as $param_ligne)
@@ -331,7 +334,9 @@ 
 
     			// Visibility: -1=not visible by default in list, 1=visible, 0=hidden
     			$visibility = GETPOST('list', 'alpha');
-    			if ($type == 'separate') $visibility=3;
+    			if ($type == 'separate') {
+    			    $visibility=3;
+    			}
 
                 $result=$extrafields->update(
     				GETPOST('attrname', 'alpha'),
@@ -359,23 +364,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');
 	    }
@@ -392,10 +394,10 @@ 
         {
             header("Location: ".$_SERVER["PHP_SELF"]);
             exit;
+        } else {
+            $mesg=$extrafields->error;
         }
-        else $mesg=$extrafields->error;
-	}
-	else
+	} else
 	{
 	    $error++;
 		$langs->load("errors");

dolibarr/htdocs/core/login/functions_openid.php

Braces +4 added lines, -8 removed lines

@@ -56,8 +56,7 @@ 
         {
             $openid->SetApprovedURL($protocol . $_SERVER["HTTP_HOST"] . $_SERVER["SCRIPT_NAME"]);      // Send Response from OpenID server to this script
             $openid->Redirect();     // This will redirect user to OpenID Server
-        }
-        else
+        } else
         {
             $error = $openid->GetError();
             return false;
@@ -89,21 +88,18 @@ 
                     $login=$obj->login;
                 }
             }
-        }
-        else if($openid->IsError() === true)
+        } else if($openid->IsError() === true)
         {
             // ON THE WAY, WE GOT SOME ERROR
             $error = $openid->GetError();
             return false;
-        }
-        else
+        } else
         {
             // Signature Verification Failed
             //echo "INVALID AUTHORIZATION";
             return false;
         }
-    }
-    else if ($_GET['openid_mode'] == 'cancel')
+    } else if ($_GET['openid_mode'] == 'cancel')
     {
         // User Canceled your Request
         //echo "USER CANCELED REQUEST";

dolibarr/htdocs/core/login/functions_forceuser.php

Braces +6 added lines, -2 removed lines

@@ -40,9 +40,13 @@
 	dol_syslog("functions_forceuser::check_user_password_forceuser");
 
 	$login=$dolibarr_auto_user;
-	if (empty($login)) $login='auto';
+	if (empty($login)) {
+	    $login='auto';
+	}
 
-	if ($_SESSION["dol_loginmesg"]) $login='';
+	if ($_SESSION["dol_loginmesg"]) {
+	    $login='';
+	}
 
 	dol_syslog("functions_forceuser::check_user_password_forceuser ok. forced user = ".$login);
 	return $login;

dolibarr/htdocs/core/login/functions_dolibarr.php

Braces +22 added lines, -12 removed lines

@@ -39,7 +39,9 @@ 
 
 	// Force master entity in transversal mode
 	$entity=$entitytotest;
-	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) $entity=1;
+	if (! empty($conf->multicompany->enabled) && ! empty($conf->global->MULTICOMPANY_TRANSVERSE_MODE)) {
+	    $entity=1;
+	}
 
 	$login='';
 
@@ -56,7 +58,9 @@ 
 		$sql ='SELECT rowid, login, entity, pass, pass_crypted';
 		$sql.=' FROM '.$table;
 		$sql.=' WHERE ('.$usernamecol1." = '".$db->escape($usertotest)."'";
-		if (preg_match('/@/',$usertotest)) $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		if (preg_match('/@/',$usertotest)) {
+		    $sql.=' OR '.$usernamecol2." = '".$db->escape($usertotest)."'";
+		}
 		$sql.=') AND '.$entitycol." IN (0," . ($entity ? $entity : 1) . ")";
 		$sql.=' AND statut = 1';
 		// Required to first found the user into entity, then the superadmin.
@@ -77,10 +81,14 @@ 
 
 				// Check crypted password
 				$cryptType='';
-				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				if (! empty($conf->global->DATABASE_PWD_ENCRYPTED)) {
+				    $cryptType=$conf->global->DATABASE_PWD_ENCRYPTED;
+				}
 
 				// By default, we used MD5
-				if (! in_array($cryptType,array('md5'))) $cryptType='md5';
+				if (! in_array($cryptType,array('md5'))) {
+				    $cryptType='md5';
+				}
 				// Check crypted password according to crypt algorithm
 				if ($cryptType == 'md5')
 				{
@@ -106,8 +114,7 @@ 
 				if ($passok)
 				{
 					$login=$obj->login;
-				}
-				else
+				} else
 				{
 					dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko bad password for '".$usertotest."'");
 					sleep(2);      // Anti brut force protection
@@ -119,11 +126,16 @@ 
 				}
 
 				// We must check entity
-				if ($passok && ! empty($conf->multicompany->enabled))	// We must check entity
+				if ($passok && ! empty($conf->multicompany->enabled)) {
+				    // We must check entity
 				{
 					global $mc;
+				}
 
-					if (! isset($mc)) $conf->multicompany->enabled = false; 	// Global not available, disable $conf->multicompany->enabled for safety
+					if (! isset($mc)) {
+					    $conf->multicompany->enabled = false;
+					}
+					// Global not available, disable $conf->multicompany->enabled for safety
 					else
 					{
 						$ret = $mc->checkRight($obj->rowid, $entitytotest);
@@ -134,8 +146,7 @@ 
 						}
 					}
 				}
-			}
-			else
+			} else
 			{
 				dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko user not found for '".$usertotest."'");
 				sleep(1);
@@ -145,8 +156,7 @@ 
 
 				$_SESSION["dol_loginmesg"]=$langs->trans("ErrorBadLoginPassword");
 			}
-		}
-		else
+		} else
 		{
 			dol_syslog("functions_dolibarr::check_user_password_dolibarr Authentification ko db error for '".$usertotest."' error=".$db->lasterror());
 			sleep(1);