Inspection of "Testing the use of the new controller." - alxarafe/alixar - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 65bdac...4e88da )

by Alxarafe

created 2019-01-21 18:24 UTC

Status

Spacing +299 added lines, -299 removed lines patch added patch discarded remove patch

@@ -71,7 +71,7 @@  discard block
 block discarded – undo
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->agenda->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->agenda->enabled)) return 0; // Module not active, we do nothing
 
 		$key = 'MAIN_AGENDA_ACTIONAUTO_'.$action;
 
@@ -82,25 +82,25 @@  discard block
 block discarded – undo
 
 		$langs->load("agenda");
 
-		if (empty($object->actiontypecode)) $object->actiontypecode='AC_OTH_AUTO';
+		if (empty($object->actiontypecode)) $object->actiontypecode = 'AC_OTH_AUTO';
 
 		// Actions
 		if ($action == 'COMPANY_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","companies"));
+            $langs->loadLangs(array("agenda", "other", "companies"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
-            $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
-            if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+            $object->actionmsg = $langs->transnoentities("NewCompanyToDolibarr", $object->name);
+            if (!empty($object->prefix)) $object->actionmsg .= " (".$object->prefix.")";
 
-			$object->sendtoid=0;
-			$object->socid=$object->id;
+			$object->sendtoid = 0;
+			$object->socid = $object->id;
         }
         elseif ($action == 'COMPANY_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
             if (empty($object->actionmsg2)) dol_syslog('Trigger called with property actionmsg2 on object not defined', LOG_ERR);
 
@@ -110,22 +110,22 @@  discard block
 block discarded – undo
         elseif ($action == 'CONTRACT_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","contracts"));
+            $langs->loadLangs(array("agenda", "other", "contracts"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("ContractValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("ContractValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'CONTRACT_SENTBYMAIL')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","contracts"));
+            $langs->loadLangs(array("agenda", "other", "contracts"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ContractSentByEMail",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ContractSentByEMail", $object->ref);
 			if (empty($object->actionmsg))
 			{
-				$object->actionmsg=$langs->transnoentities("ContractSentByEMail",$object->ref);
+				$object->actionmsg = $langs->transnoentities("ContractSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -134,22 +134,22 @@  discard block
 block discarded – undo
 		elseif ($action == 'PROPAL_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
         elseif ($action == 'PROPAL_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -158,82 +158,82 @@  discard block
 block discarded – undo
 		elseif ($action == 'PROPAL_CLOSE_SIGNED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPAL_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("PropalClassifiedBilledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("PropalClassifiedBilledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPAL_CLOSE_REFUSED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","orders"));
+            $langs->loadLangs(array("agenda", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_CLOSE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderDeliveredInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("OrderDeliveredInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderBilledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("OrderBilledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_CANCEL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("OrderCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("OrderCanceledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("OrderSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("OrderSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -242,32 +242,32 @@  discard block
 block discarded – undo
 		elseif ($action == 'BILL_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_UNVALIDATE')
         {
            // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
         elseif ($action == 'BILL_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("InvoiceSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("InvoiceSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -276,69 +276,69 @@  discard block
 block discarded – undo
 		elseif ($action == 'BILL_PAYED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
             // Values for this action can't be defined by caller.
-            $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
+            $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_CANCEL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'FICHINTER_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionCreatedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InterventionCreatedInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
 		elseif ($action == 'FICHINTER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("InterventionValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("InterventionValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
 		elseif ($action == 'FICHINTER_MODIFY')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionModifiedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InterventionModifiedInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
 		elseif ($action == 'FICHINTER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-            	$object->actionmsg=$langs->transnoentities("InterventionSentByEMail",$object->ref);
+            	$object->actionmsg = $langs->transnoentities("InterventionSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -347,44 +347,44 @@  discard block
 block discarded – undo
         elseif ($action == 'FICHINTER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
-           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedBilledInDolibarr",$object->ref);
+           	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
+           	$object->actionmsg = $langs->transnoentities("InterventionClassifiedBilledInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
 	    elseif ($action == 'FICHINTER_CLASSIFY_UNBILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-           	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
-           	$object->actionmsg=$langs->transnoentities("InterventionClassifiedUnbilledInDolibarr",$object->ref);
+           	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
+           	$object->actionmsg = $langs->transnoentities("InterventionClassifiedUnbilledInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
         elseif ($action == 'FICHINTER_DELETE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","interventions"));
+            $langs->loadLangs(array("agenda", "other", "interventions"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InterventionDeletedInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InterventionDeletedInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
-			$object->fk_element=0;
-			$object->elementtype='';
+            $object->sendtoid = 0;
+			$object->fk_element = 0;
+			$object->elementtype = '';
 		}
         elseif ($action == 'SHIPPING_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","sendings"));
+            $langs->loadLangs(array("agenda", "other", "sendings"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
         	if (empty($object->actionmsg))
         	{
-        		$object->actionmsg=$langs->transnoentities("ShippingValidated",($object->newref?$object->newref:$object->ref));
+        		$object->actionmsg = $langs->transnoentities("ShippingValidated", ($object->newref ? $object->newref : $object->ref));
         	}
 
         	// Parameters $object->sendtoid defined by caller
@@ -393,12 +393,12 @@  discard block
 block discarded – undo
 		elseif ($action == 'SHIPPING_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","sendings"));
+            $langs->loadLangs(array("agenda", "other", "sendings"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ShippingSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ShippingSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("ShippingSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("ShippingSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -409,10 +409,10 @@  discard block
 block discarded – undo
             $langs->load("other");
         	$langs->load("receptions");
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
         	if (empty($object->actionmsg))
         	{
-        		$object->actionmsg=$langs->transnoentities("ReceptionValidated",($object->newref?$object->newref:$object->ref));
+        		$object->actionmsg = $langs->transnoentities("ReceptionValidated", ($object->newref ? $object->newref : $object->ref));
         	}
 
         	// Parameters $object->sendtoid defined by caller
@@ -424,10 +424,10 @@  discard block
 block discarded – undo
             $langs->load("other");
             $langs->load("receptions");
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ReceptionSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("ReceptionSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("ReceptionSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -436,22 +436,22 @@  discard block
 block discarded – undo
 		elseif ($action == 'PROPOSAL_SUPPLIER_VALIDATE')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-			$object->actionmsg=$langs->transnoentities("PropalValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+			$object->actionmsg = $langs->transnoentities("PropalValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPOSAL_SUPPLIER_SENTBYMAIL')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			if (empty($object->actionmsg))
 			{
-				$object->actionmsg=$langs->transnoentities("ProposalSentByEMail",$object->ref);
+				$object->actionmsg = $langs->transnoentities("ProposalSentByEMail", $object->ref);
 			}
 
 			// Parameters $object->sendtoid defined by caller
@@ -460,92 +460,92 @@  discard block
 block discarded – undo
 		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_SIGNED')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("PropalClosedSignedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("PropalClosedSignedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'PROPOSAL_SUPPLIER_CLOSE_REFUSED')
 		{
 			// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","propal"));
+            $langs->loadLangs(array("agenda", "other", "propal"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("PropalClosedRefusedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("PropalClosedRefusedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("OrderCreatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("OrderCreatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("OrderValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("OrderValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_APPROVE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("OrderApprovedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("OrderApprovedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_REFUSE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("OrderRefusedInDolibarr",$object->ref);
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("OrderRefusedInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_SUBMIT')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("SupplierOrderSubmitedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("SupplierOrderSubmitedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_RECEIVE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","orders"));
+            $langs->loadLangs(array("agenda", "other", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("SupplierOrderReceivedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("SupplierOrderReceivedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'ORDER_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills","orders"));
+            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("SupplierOrderSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("SupplierOrderSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -554,45 +554,45 @@  discard block
 block discarded – undo
 		elseif ($action == 'ORDER_SUPPLIER_CLASSIFY_BILLED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills","orders"));
+            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("SupplierOrderClassifiedBilled",$object->ref);
+                $object->actionmsg = $langs->transnoentities("SupplierOrderClassifiedBilled", $object->ref);
             }
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
 		elseif ($action == 'BILL_SUPPLIER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
-            $object->actionmsg=$langs->transnoentities("InvoiceValidatedInDolibarr",($object->newref?$object->newref:$object->ref));
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
+            $object->actionmsg = $langs->transnoentities("InvoiceValidatedInDolibarr", ($object->newref ? $object->newref : $object->ref));
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_SUPPLIER_UNVALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceBackToDraftInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceBackToDraftInDolibarr", $object->ref);
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
         elseif ($action == 'BILL_SUPPLIER_SENTBYMAIL')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills","orders"));
+            $langs->loadLangs(array("agenda", "other", "bills", "orders"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
             if (empty($object->actionmsg))
             {
-                $object->actionmsg=$langs->transnoentities("SupplierInvoiceSentByEMail",$object->ref);
+                $object->actionmsg = $langs->transnoentities("SupplierInvoiceSentByEMail", $object->ref);
             }
 
             // Parameters $object->sendtoid defined by caller
@@ -601,201 +601,201 @@  discard block
 block discarded – undo
 		elseif ($action == 'BILL_SUPPLIER_PAYED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoicePaidInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoicePaidInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		elseif ($action == 'BILL_SUPPLIER_CANCELED')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","bills"));
+            $langs->loadLangs(array("agenda", "other", "bills"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("InvoiceCanceledInDolibarr",$object->ref);
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("InvoiceCanceledInDolibarr", $object->ref);
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 
         // Members
         elseif ($action == 'MEMBER_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberValidatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberValidatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberValidatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
         }
 		elseif ($action == 'MEMBER_MODIFY')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberModifiedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberModifiedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberModifiedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
 		}
         elseif ($action == 'MEMBER_SUBSCRIPTION_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref,$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberSubscriptionAddedInDolibarr",$object->ref,$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-            $object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-            $object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->ref, $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberSubscriptionAddedInDolibarr", $object->ref, $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+            $object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+            $object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
-			$object->sendtoid=0;
-			if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+			$object->sendtoid = 0;
+			if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION_MODIFY')
         {
         	// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionModifiedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg = $langs->transnoentities("MemberSubscriptionModifiedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+        	$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
-        	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+        	$object->sendtoid = 0;
+        	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
         }
         elseif ($action == 'MEMBER_SUBSCRIPTION_DELETE')
         {
         	// Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg=$langs->transnoentities("MemberSubscriptionDeletedInDolibarr",$object->ref,$object->getFullName($langs));
-        	$object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-        	$object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
-        	$object->actionmsg.="\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
-        	$object->actionmsg.="\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start,'day').' - '.dol_print_date($object->last_subscription_date_end,'day');
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg = $langs->transnoentities("MemberSubscriptionDeletedInDolibarr", $object->ref, $object->getFullName($langs));
+        	$object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+        	$object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Amount").': '.$object->last_subscription_amount;
+        	$object->actionmsg .= "\n".$langs->transnoentities("Period").': '.dol_print_date($object->last_subscription_date_start, 'day').' - '.dol_print_date($object->last_subscription_date_end, 'day');
 
-        	$object->sendtoid=0;
-        	if ($object->fk_soc > 0) $object->socid=$object->fk_soc;
+        	$object->sendtoid = 0;
+        	if ($object->fk_soc > 0) $object->socid = $object->fk_soc;
         }
         elseif ($action == 'MEMBER_RESILIATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberResiliatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberResiliatedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberResiliatedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
         }
         elseif ($action == 'MEMBER_DELETE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","members"));
+            $langs->loadLangs(array("agenda", "other", "members"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("MemberDeletedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg=$langs->transnoentities("MemberDeletedInDolibarr",$object->getFullName($langs));
-            $object->actionmsg.="\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
-            $object->actionmsg.="\n".$langs->transnoentities("Type").': '.$object->type;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg = $langs->transnoentities("MemberDeletedInDolibarr", $object->getFullName($langs));
+            $object->actionmsg .= "\n".$langs->transnoentities("Member").': '.$object->getFullName($langs);
+            $object->actionmsg .= "\n".$langs->transnoentities("Type").': '.$object->type;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
         }
 
         // Projects
         elseif ($action == 'PROJECT_CREATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-        	if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg=$langs->transnoentities("ProjectCreatedInDolibarr",$object->ref);
-        	$object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+        	if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+        	$object->actionmsg = $langs->transnoentities("ProjectCreatedInDolibarr", $object->ref);
+        	$object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
-        	$object->sendtoid=0;
+        	$object->sendtoid = 0;
         }
-        elseif($action == 'PROJECT_VALIDATE')
+        elseif ($action == 'PROJECT_VALIDATE')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("ProjectValidatedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Project").': '.$object->ref;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("ProjectValidatedInDolibarr", $object->ref);
+            $object->actionmsg .= "\n".$langs->transnoentities("Project").': '.$object->ref;
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
-        elseif($action == 'PROJECT_MODIFY')
+        elseif ($action == 'PROJECT_MODIFY')
         {
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-            if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
-            $object->actionmsg=$langs->transnoentities("ProjectModifiedInDolibarr",$object->ref);
-            $object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+            if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+            $object->actionmsg = $langs->transnoentities("ProjectModifiedInDolibarr", $object->ref);
+            $object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-            $object->sendtoid=0;
+            $object->sendtoid = 0;
         }
 
 		// Project tasks
-		elseif($action == 'TASK_CREATE')
+		elseif ($action == 'TASK_CREATE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskCreatedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("TaskCreatedInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 
-		elseif($action == 'TASK_MODIFY')
+		elseif ($action == 'TASK_MODIFY')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskModifiedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskModifieddInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskModifiedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("TaskModifieddInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 
-		elseif($action == 'TASK_DELETE')
+		elseif ($action == 'TASK_DELETE')
 		{
             // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other","projects"));
+            $langs->loadLangs(array("agenda", "other", "projects"));
 
-			if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
-			$object->actionmsg=$langs->transnoentities("TaskDeletedInDolibarr",$object->ref);
-			$object->actionmsg.="\n".$langs->transnoentities("Task").': '.$object->ref;
+			if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+			$object->actionmsg = $langs->transnoentities("TaskDeletedInDolibarr", $object->ref);
+			$object->actionmsg .= "\n".$langs->transnoentities("Task").': '.$object->ref;
 
-			$object->sendtoid=0;
+			$object->sendtoid = 0;
 		}
 		// TODO Merge all previous cases into this generic one
 		else	// $action = TICKET_CREATE, TICKET_MODIFY, TICKET_DELETE, ...
 		{
 		    // Note: We are here only if $conf->global->MAIN_AGENDA_ACTIONAUTO_action is on (tested at begining of this function)
 		    // Load translation files required by the page
-            $langs->loadLangs(array("agenda","other"));
+            $langs->loadLangs(array("agenda", "other"));
 
-		    if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities($action."InDolibarr",$object->ref);
-		    if (empty($object->actionmsg))  $object->actionmsg=$langs->transnoentities($action."InDolibarr",$object->ref);
+		    if (empty($object->actionmsg2)) $object->actionmsg2 = $langs->transnoentities($action."InDolibarr", $object->ref);
+		    if (empty($object->actionmsg))  $object->actionmsg = $langs->transnoentities($action."InDolibarr", $object->ref);
 
-		    $object->sendtoid=0;
+		    $object->sendtoid = 0;
 		}
 
 		$object->actionmsg = $langs->transnoentities("Author").': '.$user->login."\n".$object->actionmsg;
@@ -803,21 +803,21 @@  discard block
 block discarded – undo
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         // Add entry in event table
-		$now=dol_now();
+		$now = dol_now();
 
 		if (isset($_SESSION['listofnames-'.$object->trackid]))
 		{
-			$attachs=$_SESSION['listofnames-'.$object->trackid];
-			if ($attachs && strpos($action,'SENTBYMAIL'))
+			$attachs = $_SESSION['listofnames-'.$object->trackid];
+			if ($attachs && strpos($action, 'SENTBYMAIL'))
 			{
-                $object->actionmsg=dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
+                $object->actionmsg = dol_concatdesc($object->actionmsg, "\n".$langs->transnoentities("AttachedFiles").': '.$attachs);
 			}
 		}
 
         require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
         require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
-		$contactforaction=new Contact($this->db);
-        $societeforaction=new Societe($this->db);
+		$contactforaction = new Contact($this->db);
+        $societeforaction = new Societe($this->db);
         // Set contactforaction if there is only 1 contact.
         if (is_array($object->sendtoid))
         {
@@ -831,7 +831,7 @@  discard block
 block discarded – undo
         if ($object->socid > 0)			$societeforaction->fetch($object->socid);
         elseif ($object->fk_soc > 0)	$societeforaction->fetch($object->fk_soc);
 
-        $projectid = isset($object->fk_project)?$object->fk_project:0;
+        $projectid = isset($object->fk_project) ? $object->fk_project : 0;
         if ($object->element == 'project') $projectid = $object->id;
 
         $elementid = $object->id;
@@ -846,22 +846,22 @@  discard block
 block discarded – undo
 		// Insertion action
 		require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 		$actioncomm = new ActionComm($this->db);
-		$actioncomm->type_code   = $object->actiontypecode;		// Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
+		$actioncomm->type_code   = $object->actiontypecode; // Type of event ('AC_OTH', 'AC_OTH_AUTO', 'AC_XXX'...)
 		$actioncomm->code        = 'AC_'.$action;
 		$actioncomm->label       = $object->actionmsg2;
-		$actioncomm->note        = $object->actionmsg;          // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
+		$actioncomm->note        = $object->actionmsg; // TODO Replace with ($actioncomm->email_msgid ? $object->email_content : $object->actionmsg)
 		$actioncomm->fk_project  = $projectid;
 		$actioncomm->datep       = $now;
 		$actioncomm->datef       = $now;
 		$actioncomm->durationp   = 0;
 		$actioncomm->punctual    = 1;
-		$actioncomm->percentage  = -1;   // Not applicable
+		$actioncomm->percentage  = -1; // Not applicable
 		$actioncomm->societe     = $societeforaction;
 		$actioncomm->contact     = $contactforaction;
 		$actioncomm->socid       = $societeforaction->id;
 		$actioncomm->contactid   = $contactforaction->id;
-		$actioncomm->authorid    = $user->id;   // User saving action
-		$actioncomm->userownerid = $user->id;	// Owner of action
+		$actioncomm->authorid    = $user->id; // User saving action
+		$actioncomm->userownerid = $user->id; // Owner of action
         // Fields defined when action is an email (content should be into object->actionmsg to be added into note, subject into object->actionms2 to be added into label)
 		$actioncomm->email_msgid   = $object->email_msgid;
 		$actioncomm->email_from    = $object->email_from;
@@ -874,28 +874,28 @@  discard block
 block discarded – undo
 
 		// Object linked (if link is for thirdparty, contact, project it is a recording error. We should not have links in link table
 		// for such objects because there is already a dedicated field into table llx_actioncomm.
-		if (! in_array($elementtype, array('societe','contact','project')))
+		if (!in_array($elementtype, array('societe', 'contact', 'project')))
 		{
 			$actioncomm->fk_element  = $elementid;
 			$actioncomm->elementtype = $elementtype;
 		}
 
-		if (property_exists($object,'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles)>0) {
-			$actioncomm->attachedfiles=$object->attachedfiles;
+		if (property_exists($object, 'attachedfiles') && is_array($object->attachedfiles) && count($object->attachedfiles) > 0) {
+			$actioncomm->attachedfiles = $object->attachedfiles;
 		}
-		if (property_exists($object,'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid)>0) {
-			$actioncomm->userassigned=$object->sendtouserid;
+		if (property_exists($object, 'sendtouserid') && is_array($object->sendtouserid) && count($object->sendtouserid) > 0) {
+			$actioncomm->userassigned = $object->sendtouserid;
 		}
 
-		$ret=$actioncomm->create($user);       // User creating action
+		$ret = $actioncomm->create($user); // User creating action
 
 		if ($ret > 0 && $conf->global->MAIN_COPY_FILE_IN_EVENT_AUTO)
 		{
-			if (is_array($object->attachedfiles) && array_key_exists('paths',$object->attachedfiles) && count($object->attachedfiles['paths'])>0) {
-				foreach($object->attachedfiles['paths'] as $key=>$filespath) {
+			if (is_array($object->attachedfiles) && array_key_exists('paths', $object->attachedfiles) && count($object->attachedfiles['paths']) > 0) {
+				foreach ($object->attachedfiles['paths'] as $key=>$filespath) {
 					$srcfile = $filespath;
-					$destdir = $conf->agenda->dir_output . '/' . $ret;
-					$destfile = $destdir . '/' . $object->attachedfiles['names'][$key];
+					$destdir = $conf->agenda->dir_output.'/'.$ret;
+					$destfile = $destdir.'/'.$object->attachedfiles['names'][$key];
 					if (dol_mkdir($destdir) >= 0) {
 						require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 						dol_copy($srcfile, $destfile);
@@ -904,7 +904,7 @@  discard block
 block discarded – undo
 			}
 		}
 
-		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode);	// When several action are called on same object, we must be sure to not reuse value of first action.
+		unset($object->actionmsg); unset($object->actionmsg2); unset($object->actiontypecode); // When several action are called on same object, we must be sure to not reuse value of first action.
 
 		if ($ret > 0)
 		{
@@ -913,9 +913,9 @@  discard block
 block discarded – undo
 		}
 		else
 		{
-            $error ="Failed to insert event : ".$actioncomm->error." ".join(',',$actioncomm->errors);
-            $this->error=$error;
-            $this->errors=$actioncomm->errors;
+            $error = "Failed to insert event : ".$actioncomm->error." ".join(',', $actioncomm->errors);
+            $this->error = $error;
+            $this->errors = $actioncomm->errors;
 
             dol_syslog("interface_modAgenda_ActionsAuto.class.php: ".$this->error, LOG_ERR);
             return -1;

Please login to merge, or discard this patch.

Helpers/triggers/interface_50_modBlockedlog_ActionsBlockedLog.class.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -56,19 +56,19 @@  discard block
 block discarded – undo
 	 */
 	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);
 
 		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
-		$b=new BlockedLog($this->db);
+		$b = new BlockedLog($this->db);
 
 		// Tracked events
-		if (! in_array($action, array_keys($b->trackedevents)))
+		if (!in_array($action, array_keys($b->trackedevents)))
 		{
 			return 0;
 		}
@@ -76,19 +76,19 @@  discard block
 block discarded – undo
 		// Event/record is qualified
 		$qualified = 0;
 		$amounts = 0;
-		if ($action==='BILL_VALIDATE' || $action==='BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
-			|| $action==='BILL_SUPPLIER_VALIDATE' || $action==='BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
-			|| $action==='MEMBER_SUBSCRIPTION_CREATE' || $action==='MEMBER_SUBSCRIPTION_MODIFY' || $action==='MEMBER_SUBSCRIPTION_DELETE'
-			|| $action==='DON_VALIDATE' || $action==='DON_MODIFY' || $action==='DON_DELETE'
-			|| $action==='CASHCONTROL_VALIDATE'
-			|| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
+		if ($action === 'BILL_VALIDATE' || $action === 'BILL_DELETE' || $action === 'BILL_SENTBYMAIL'
+			|| $action === 'BILL_SUPPLIER_VALIDATE' || $action === 'BILL_SUPPLIER_DELETE' || $action === 'BILL_SUPPLIER_SENTBYMAIL'
+			|| $action === 'MEMBER_SUBSCRIPTION_CREATE' || $action === 'MEMBER_SUBSCRIPTION_MODIFY' || $action === 'MEMBER_SUBSCRIPTION_DELETE'
+			|| $action === 'DON_VALIDATE' || $action === 'DON_MODIFY' || $action === 'DON_DELETE'
+			|| $action === 'CASHCONTROL_VALIDATE'
+			|| (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_DOWNLOAD') || (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_PREVIEW')
 		)
 		{
 			$qualified++;
 
 			if (in_array($action, array(
-				'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
-				'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
+				'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
+				'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) $amounts = (double) $object->amount;
 			elseif ($action == 'CASHCONTROL_VALIDATE')
 			{
 				$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
@@ -106,13 +106,13 @@  discard block
 block discarded – undo
 		{
 			$qualified++;
 			$amounts = 0;
-			if(!empty($object->amounts)) {
-				foreach($object->amounts as $amount) {
+			if (!empty($object->amounts)) {
+				foreach ($object->amounts as $amount) {
 					$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;
@@ -120,12 +120,12 @@  discard block
 block discarded – undo
 
 		// Another protection.
 		// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
-		if (! $qualified)
+		if (!$qualified)
 		{
 			return 0; // not implemented action log
 		}
 
-		$result = $b->setObjectData($object, $action, $amounts, $user);		// Set field date_object, ref_object, fk_object, element, object_data
+		$result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
 
 		if ($result < 0)
 		{

Please login to merge, or discard this patch.

Helpers/triggers/interface_50_modNotification_Notification.class.php 1 patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -45,7 +45,7 @@  discard block
 block discarded – undo
 	public $picto = 'email';
 
 	// @TODO Defined also into notify.class.php)
-	public $listofmanagedevents=array(
+	public $listofmanagedevents = array(
 		'BILL_VALIDATE',
 		'BILL_PAYED',
 		'ORDER_VALIDATE',
@@ -76,12 +76,12 @@  discard block
 block discarded – undo
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-		if (empty($conf->notification->enabled)) return 0;     // Module not active, we do nothing
+		if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing
 
-		require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
 		$notify = new Notify($this->db);
 
-		if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
+		if (!in_array($action, $notify->arrayofnotifsupported)) return 0;
 
 		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
@@ -100,42 +100,42 @@  discard block
 block discarded – undo
 	{
 		global $conf;
 
-		$ret=array();
+		$ret = array();
 
 		$sql = "SELECT rowid, code, label, description, elementtype";
-		$sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
-		$sql.= $this->db->order("rang, elementtype, code");
+		$sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
+		$sql .= $this->db->order("rang, elementtype, code");
 		dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
-		$resql=$this->db->query($sql);
+		$resql = $this->db->query($sql);
 		if ($resql)
 		{
-			$num=$this->db->num_rows($resql);
-			$i=0;
+			$num = $this->db->num_rows($resql);
+			$i = 0;
 			while ($i < $num)
 			{
-				$obj=$this->db->fetch_object($resql);
+				$obj = $this->db->fetch_object($resql);
 
-				$qualified=0;
+				$qualified = 0;
 				// Check is this event is supported by notification module
-				if (in_array($obj->code, $this->listofmanagedevents)) $qualified=1;
+				if (in_array($obj->code, $this->listofmanagedevents)) $qualified = 1;
 				// Check if module for this event is active
 				if ($qualified)
 				{
 					//print 'xx'.$obj->code;
-					$element=$obj->elementtype;
+					$element = $obj->elementtype;
 
 					// Exclude events if related module is disabled
-					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
-					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
-					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
-					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
-					elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member','expensereport')) && empty($conf->$element->enabled)) $qualified=0;
+					if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
+					elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
+					elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified = 0;
+					elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified = 0;
+					elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified = 0;
+					elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expensereport')) && empty($conf->$element->enabled)) $qualified = 0;
 				}
 
 				if ($qualified)
 				{
-					$ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
+					$ret[] = array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$obj->label, 'description'=>$obj->description, 'elementtype'=>$obj->elementtype);
 				}
 
 				$i++;

Please login to merge, or discard this patch.

Helpers/triggers/interface_50_modTicket_TicketEmail.class.php 1 patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

@@ -111,7 +111,7 @@  discard block
 block discarded – undo
 
     	switch ($action) {
     		case 'TICKET_ASSIGNED':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+	            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 	            if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
 	            {
@@ -127,25 +127,25 @@  discard block
 block discarded – undo
 	                		$mimetype = array();
 
 	                		// Send email to assigned user
-		                    $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
-		                    $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
-		                    $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
-		                    $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
-		                    $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
+		                    $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketAssignedToYou');
+		                    $message = '<p>'.$langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
+		                    $message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+		                    $message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+		                    $message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+		                    $message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
 		                    // Extrafields
 		                    if (is_array($object->array_options) && count($object->array_options) > 0) {
 		                        foreach ($object->array_options as $key => $value) {
-	                                $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
+	                                $message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 		                        }
 		                    }
 
 		                    $message .= '</ul>';
-		                    $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
-		                    $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
+		                    $message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+		                    $message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 		                    $sendto = $userstat->email;
-		                    $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
+		                    $from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
 
 	                        $message = dol_nl2br($message);
 
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
 	                            $old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
 	                            $conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
 	                        }
-	                        include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
+	                        include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
 		                    $mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
 		                    if ($mailfile->error) {
 	                            setEventMessages($mailfile->error, $mailfile->errors, 'errors');
@@ -176,11 +176,11 @@  discard block
 block discarded – undo
 	            break;
 
     		case 'TICKET_CREATE':
-	            dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+	            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 	            $langs->load('ticket');
 
-	            $object->fetch('', $object->track_id);	// Should be useless
+	            $object->fetch('', $object->track_id); // Should be useless
 
 
 	            // Send email to notification email
@@ -198,27 +198,27 @@  discard block
 block discarded – undo
 
 						/* Send email to admin */
 			            $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
-			            $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
-			            $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
-			            $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
+			            $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
+			            $message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+			            $message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
 			            // Extrafields
 			            if (is_array($object->array_options) && count($object->array_options) > 0) {
 			                foreach ($object->array_options as $key => $value) {
-			                      $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
+			                      $message_admin .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
 			                }
 			            }
-			            $message_admin.='</ul>';
+			            $message_admin .= '</ul>';
 
 			            if ($object->fk_soc > 0) {
 			                      $object->fetch_thirdparty();
-			                      $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
+			                      $message_admin .= '<p>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</p>';
 			            }
 
-			            $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
+			            $message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
 
 			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
 			            if ($mailfile->error) {
 		                    dol_syslog($mailfile->error, LOG_DEBUG);
 			            } else {
-			                     $result=$mailfile->sendfile();
+			                     $result = $mailfile->sendfile();
 			            }
 		                if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 		                    $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
@@ -261,11 +261,11 @@  discard block
 block discarded – undo
 		            	$mimetype = array();
 
 		            	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
-			            $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
-			            $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
-			            $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
+			            $message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
+			            $message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
+			            $message_customer .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
 
 			            // Extrafields
 			            foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
@@ -285,14 +285,14 @@  discard block
 block discarded – undo
 			            	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>';
-			            $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
-			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
-			            $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
-			            $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
+			            $message_customer .= '</ul>';
+			            $message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
+			            $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
+			            $message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
+			            $message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
 
 			            $from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
 			            $replyto = $from;
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
 			            if ($mailfile->error) {
 	                        dol_syslog($mailfile->error, LOG_DEBUG);
 			            } else {
-			                      $result=$mailfile->sendfile();
+			                      $result = $mailfile->sendfile();
 			            }
 	                    if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
 	                        $conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
@@ -319,19 +319,19 @@  discard block
 block discarded – undo
 	            break;
 
             case 'TICKET_DELETE':
-            	dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+            	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
             	break;
 
            	case 'TICKET_MODIFY':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
 
            	case 'TICKET_MARK_READ':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
 
            	case 'TICKET_CLOSE':
-           		dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+           		dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
            		break;
     	}
 

Please login to merge, or discard this patch.

Helpers/triggers/interface_50_modMailmanspip_Mailmanspipsynchro.class.php 1 patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -56,7 +56,7 @@  discard block
 block discarded – undo
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
 	{
-        if (empty($conf->mailmanspip->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
 
         require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
         require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
@@ -68,13 +68,13 @@  discard block
 block discarded – undo
         	// We add subscription if we change category (new category may means more mailing-list to subscribe)
         	if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0)
     		{
-    			$this->error=$object->context['linkto']->error;
-    			$this->errors=$object->context['linkto']->errors;
-    			$return=-1;
+    			$this->error = $object->context['linkto']->error;
+    			$this->errors = $object->context['linkto']->errors;
+    			$return = -1;
     		}
 			else
 			{
-				$return=1;
+				$return = 1;
 			}
 
         	return $return;
@@ -86,13 +86,13 @@  discard block
 block discarded – undo
         	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
         	if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0)
         	{
-        		$this->error=$object->context['unlinkoff']->error;
-        		$this->errors=$object->context['unlinkoff']->errors;
-        		$return=-1;
+        		$this->error = $object->context['unlinkoff']->error;
+        		$this->errors = $object->context['unlinkoff']->errors;
+        		$return = -1;
         	}
         	else
         	{
-        		$return=1;
+        		$return = 1;
         	}
 
         	return $return;
@@ -103,7 +103,7 @@  discard block
 block discarded – undo
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$return=0;
+			$return = 0;
             // Add user into some linked tools (mailman, spip, etc...)
 			if (($object->oldcopy->email != $object->email) || ($object->oldcopy->typeid != $object->typeid))	// TODO Do del/add also if type change
 			{
@@ -111,25 +111,25 @@  discard block
 block discarded – undo
 				{
 					if ($object->oldcopy->del_to_abo() < 0)
 					{
-						if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
-						$this->errors=$object->oldcopy->errors;
-						$return=-1;
+						if (!empty($object->oldcopy->error)) $this->error = $object->oldcopy->error;
+						$this->errors = $object->oldcopy->errors;
+						$return = -1;
 					}
 					else
 					{
-						$return=1;
+						$return = 1;
 					}
 				}
     			// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
     			if ($object->add_to_abo() < 0)
     			{
-    				 if (! empty($object->error)) $this->error=$object->error;
-    				 $this->errors=$object->errors;
-    				 $return=-1;
+    				 if (!empty($object->error)) $this->error = $object->error;
+    				 $this->errors = $object->errors;
+    				 $return = -1;
     			}
 				else
 				{
-					$return=1;
+					$return = 1;
 				}
 			}
 
@@ -139,17 +139,17 @@  discard block
 block discarded – undo
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            $return=0;
+            $return = 0;
             // Remove from external tools (mailman, spip, etc...)
         	if ($object->del_to_abo() < 0)
 			{
-				if (! empty($object->error)) $this->error=$object->error;
-				$this->errors=$object->errors;
-				$return=-1;
+				if (!empty($object->error)) $this->error = $object->error;
+				$this->errors = $object->errors;
+				$return = -1;
 			}
 			else
 			{
-				$return=1;
+				$return = 1;
 			}
 
 	        return $return;

Please login to merge, or discard this patch.

Helpers/triggers/interface_80_modStripe_Stripe.class.php 1 patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

@@ -119,7 +119,7 @@  discard block
 block discarded – undo
 		global $langs, $db, $conf;
 
 		// Load translation files required by the page
-        $langs->loadLangs(array("members","other","users","mails"));
+        $langs->loadLangs(array("members", "other", "users", "mails"));
 
 		require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
 		$stripe = new Stripe($db);
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
 
 		$service = 'StripeTest';
 		$servicestatus = 0;
-		if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha'))
+		if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
 		{
 			$service = 'StripeLive';
 			$servicestatus = 1;
@@ -138,12 +138,12 @@  discard block
 block discarded – undo
 
 		// If customer is linked to Stripe, we update/delete Stripe too
 		if ($action == 'COMPANY_MODIFY') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
+			$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 
 			if ($object->client != 0) {
-				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);	// This make a network request
+				$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus); // This make a network request
 				if ($customer)
 				{
 					$namecleaned = $object->name ? $object->name : null;
@@ -155,22 +155,22 @@  discard block
 block discarded – undo
 						$taxinfo["tax_id"] = $vatcleaned;
 					}
 					// We force data to "null" if not defined as expected by Stripe
-					if (empty($vatcleaned)) $taxinfo=null;
+					if (empty($vatcleaned)) $taxinfo = null;
 
 					// Detect if we change a Stripe info (email, description, vat id)
 					$changerequested = 0;
-					if (! empty($object->email) && $object->email != $customer->email) $changerequested++;
+					if (!empty($object->email) && $object->email != $customer->email) $changerequested++;
 					if ($namecleaned != $customer->description) $changerequested++;
-					if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
+					if (!isset($customer->tax_info['tax_id']) && !is_null($vatcleaned)) $changerequested++;
 					elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
-					elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
+					elseif (isset($customer->tax_info['tax_id']) && !is_null($vatcleaned))
 					{
 						if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
 					}
 
 					if ($changerequested)
 					{
-						if (! empty($object->email)) $customer->email = $object->email;
+						if (!empty($object->email)) $customer->email = $object->email;
 						$customer->description = $namecleaned;
 						if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
 						else $customer->tax_info = $taxinfo;
@@ -181,9 +181,9 @@  discard block
 block discarded – undo
 			}
 		}
 		if ($action == 'COMPANY_DELETE') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			$stripeacc = $stripe->getStripeAccount($service);	// No need of network access for this. May return '' if no Oauth defined.
+			$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
 
 			$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
 			if ($customer)
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
 			}
 
 			$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account";
-			$sql.= " WHERE site='stripe' AND fk_soc = " . $object->id;
+			$sql .= " WHERE site='stripe' AND fk_soc = ".$object->id;
 			$this->db->query($sql);
 		}
 
@@ -202,12 +202,12 @@  discard block
 block discarded – undo
 			// For creation of credit card, we do not create in Stripe automatically
 		}
 		if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (! empty($object->stripe_card_ref))
+			if (!empty($object->stripe_card_ref))
 			{
-				$stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
-				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
+				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
+				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
 
 				if ($stripecu)
 				{
@@ -222,11 +222,11 @@  discard block
 block discarded – undo
 					{
 						$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
 						if ($card) {
-							$card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
+							$card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
 							try {
 								$card->save($dataforcard);
 							}
-							catch(Exception $e)
+							catch (Exception $e)
 							{
 								$ok = -1;
 								$this->error = $e->getMessages();
@@ -237,12 +237,12 @@  discard block
 block discarded – undo
 			}
 		}
 		if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') {
-			dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+			dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-			if (! empty($object->stripe_card_ref))
+			if (!empty($object->stripe_card_ref))
 			{
-				$stripeacc = $stripe->getStripeAccount($service);				// No need of network access for this. May return '' if no Oauth defined.
-				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc);	// No need of network access for this
+				$stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
+				$stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
 
 				if ($stripecu)
 				{

Please login to merge, or discard this patch.

Helpers/triggers/interface_20_modWorkflow_WorkflowManager.class.php 1 patch

Spacing +97 added lines, -97 removed lines patch added patch discarded remove patch

@@ -59,13 +59,13 @@  discard block
 block discarded – undo
 	 */
 	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
     {
-        if (empty($conf->workflow->enabled)) return 0;     // Module not active, we do nothing
+        if (empty($conf->workflow->enabled)) return 0; // Module not active, we do nothing
 
         // Proposals to order
         if ($action == 'PROPAL_CLOSE_SIGNED')
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
+            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_PROPAL_AUTOCREATE_ORDER))
             {
                 include_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
                 $newobject = new Commande($this->db);
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
                 $newobject->context['origin'] = $object->element;
                 $newobject->context['origin_id'] = $object->id;
 
-                $ret=$newobject->createFromProposal($object, $user);
-                if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; }
+                $ret = $newobject->createFromProposal($object, $user);
+                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
                 return $ret;
             }
         }
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
         if ($action == 'ORDER_CLOSE')
         {
             dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
-            if (! empty($conf->facture->enabled) && ! empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE))
+            if (!empty($conf->facture->enabled) && !empty($conf->global->WORKFLOW_ORDER_AUTOCREATE_INVOICE))
             {
                 include_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
                 $newobject = new Facture($this->db);
@@ -93,8 +93,8 @@  discard block
 block discarded – undo
                 $newobject->context['origin'] = $object->element;
                 $newobject->context['origin_id'] = $object->id;
 
-                $ret=$newobject->createFromOrder($object, $user);
-                if ($ret < 0) { $this->error=$newobject->error; $this->errors[]=$newobject->error; }
+                $ret = $newobject->createFromOrder($object, $user);
+                if ($ret < 0) { $this->error = $newobject->error; $this->errors[] = $newobject->error; }
                 return $ret;
             }
         }
@@ -102,23 +102,23 @@  discard block
 block discarded – undo
         // Order classify billed proposal
         if ($action == 'ORDER_CLASSIFY_BILLED')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
-        	if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
+        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_BILLED_PROPAL))
         	{
-        		$object->fetchObjectLinked('','propal',$object->id,$object->element);
-				if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+				if (!empty($object->linkedObjects))
 				{
-				    $totalonlinkedelements=0;
-					foreach($object->linkedObjects['propal'] as $element)
+				    $totalonlinkedelements = 0;
+					foreach ($object->linkedObjects['propal'] as $element)
 					{
 					    if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
 					}
-					dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-					if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+					dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of order = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+					if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
 					{
-    					foreach($object->linkedObjects['propal'] as $element)
+    					foreach ($object->linkedObjects['propal'] as $element)
     					{
-    					    $ret=$element->classifyBilled($user);
+    					    $ret = $element->classifyBilled($user);
     					}
 					}
 				}
@@ -129,25 +129,25 @@  discard block
 block discarded – undo
         // classify billed order & billed propososal
         if ($action == 'BILL_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
 			// First classify billed the order to allow the proposal classify process
-			if (! empty($conf->commande->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
+			if (!empty($conf->commande->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_ORDER))
         	{
-        		$object->fetchObjectLinked('','commande',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['commande'] as $element)
+        		    $totalonlinkedelements = 0;
+        		    foreach ($object->linkedObjects['commande'] as $element)
         		    {
         		        if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
         		    }
-        		    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        		    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        		    if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         		    {
-        		        foreach($object->linkedObjects['commande'] as $element)
+        		        foreach ($object->linkedObjects['commande'] as $element)
         		        {
-        		            $ret=$element->classifyBilled($user);
+        		            $ret = $element->classifyBilled($user);
         		        }
         		    }
         		}
@@ -155,22 +155,22 @@  discard block
 block discarded – undo
         	}
 
 			// Second classify billed the proposal.
-        	if (! empty($conf->propal->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
+        	if (!empty($conf->propal->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_PROPAL))
         	{
-        		$object->fetchObjectLinked('','propal',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'propal', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['propal'] as $element)
+        		    $totalonlinkedelements = 0;
+        		    foreach ($object->linkedObjects['propal'] as $element)
         		    {
         		        if ($element->statut == Propal::STATUS_SIGNED || $element->statut == Propal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
         		    }
-        		    dol_syslog( "Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        		    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        		    if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         		    {
-        		        foreach($object->linkedObjects['propal'] as $element)
+        		        foreach ($object->linkedObjects['propal'] as $element)
         		        {
-        		            $ret=$element->classifyBilled($user);
+        		            $ret = $element->classifyBilled($user);
         		        }
         		    }
         		}
@@ -181,25 +181,25 @@  discard block
 block discarded – undo
         // classify billed order & billed propososal
         if ($action == 'BILL_SUPPLIER_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
         	// First classify billed the order to allow the proposal classify process
-        	if (! empty($conf->fournisseur->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
+        	if (!empty($conf->fournisseur->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_AMOUNT_CLASSIFY_BILLED_SUPPLIER_ORDER))
         	{
-        		$object->fetchObjectLinked('','order_supplier',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'order_supplier', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        			$totalonlinkedelements=0;
-        			foreach($object->linkedObjects['order_supplier'] as $element)
+        			$totalonlinkedelements = 0;
+        			foreach ($object->linkedObjects['order_supplier'] as $element)
         			{
         				if ($element->statut == CommandeFournisseur::STATUS_ACCEPTED || $element->statut == CommandeFournisseur::STATUS_ORDERSENT || $element->statut == CommandeFournisseur::STATUS_RECEIVED_PARTIALLY || $element->statut == CommandeFournisseur::STATUS_RECEIVED_COMPLETELY) $totalonlinkedelements += $element->total_ht;
         			}
-        			dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        			dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        			if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         			{
-        				foreach($object->linkedObjects['order_supplier'] as $element)
+        				foreach ($object->linkedObjects['order_supplier'] as $element)
         				{
-        					$ret=$element->classifyBilled($user);
+        					$ret = $element->classifyBilled($user);
         				}
         			}
         		}
@@ -207,22 +207,22 @@  discard block
 block discarded – undo
         	}
 
         	// Second classify billed the proposal.
-        	if (! empty($conf->supplier_proposal->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
+        	if (!empty($conf->supplier_proposal->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_SUPPLIER_PROPOSAL))
         	{
-        		$object->fetchObjectLinked('','supplier_proposal',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'supplier_proposal', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        			$totalonlinkedelements=0;
-        			foreach($object->linkedObjects['supplier_proposal'] as $element)
+        			$totalonlinkedelements = 0;
+        			foreach ($object->linkedObjects['supplier_proposal'] as $element)
         			{
         				if ($element->statut == SupplierProposal::STATUS_SIGNED || $element->statut == SupplierProposal::STATUS_BILLED) $totalonlinkedelements += $element->total_ht;
         			}
-        			dol_syslog( "Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-        			if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+        			dol_syslog("Amount of linked supplier proposals = ".$totalonlinkedelements.", of supplier invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+        			if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
         			{
-        				foreach($object->linkedObjects['supplier_proposal'] as $element)
+        				foreach ($object->linkedObjects['supplier_proposal'] as $element)
         				{
-        					$ret=$element->classifyBilled($user);
+        					$ret = $element->classifyBilled($user);
         				}
         			}
         		}
@@ -233,24 +233,24 @@  discard block
 block discarded – undo
         // Invoice classify billed order
         if ($action == 'BILL_PAYED')
         {
-            dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+            dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-            if (! empty($conf->commande->enabled) && ! empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER))
+            if (!empty($conf->commande->enabled) && !empty($conf->global->WORKFLOW_INVOICE_CLASSIFY_BILLED_ORDER))
             {
-                $object->fetchObjectLinked('','commande',$object->id,$object->element);
-                if (! empty($object->linkedObjects))
+                $object->fetchObjectLinked('', 'commande', $object->id, $object->element);
+                if (!empty($object->linkedObjects))
                 {
-                    $totalonlinkedelements=0;
-                    foreach($object->linkedObjects['commande'] as $element)
+                    $totalonlinkedelements = 0;
+                    foreach ($object->linkedObjects['commande'] as $element)
                     {
                         if ($element->statut == Commande::STATUS_VALIDATED || $element->statut == Commande::STATUS_SHIPMENTONPROCESS || $element->statut == Commande::STATUS_CLOSED) $totalonlinkedelements += $element->total_ht;
                     }
-                    dol_syslog( "Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht) );
-                    if ( ($totalonlinkedelements == $object->total_ht) || (! empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)) )
+                    dol_syslog("Amount of linked orders = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht));
+                    if (($totalonlinkedelements == $object->total_ht) || (!empty($conf->global->WORKFLOW_CLASSIFY_IF_AMOUNTS_ARE_DIFFERENTS)))
                     {
-                        foreach($object->linkedObjects['commande'] as $element)
+                        foreach ($object->linkedObjects['commande'] as $element)
                         {
-                            $ret=$element->classifyBilled($user);
+                            $ret = $element->classifyBilled($user);
                         }
                     }
                 }
@@ -258,36 +258,36 @@  discard block
 block discarded – undo
             }
         }
 
-        if ($action=='SHIPPING_VALIDATE')
+        if ($action == 'SHIPPING_VALIDATE')
         {
-        	dol_syslog( "Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id );
+        	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 
-        	if (! empty($conf->commande->enabled) && ! empty($conf->expedition->enabled) && ! empty($conf->workflow->enabled) && ! empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
+        	if (!empty($conf->commande->enabled) && !empty($conf->expedition->enabled) && !empty($conf->workflow->enabled) && !empty($conf->global->WORKFLOW_ORDER_CLASSIFY_SHIPPED_SHIPPING))
         	{
-        		$qtyshipped=array();
-        		$qtyordred=array();
+        		$qtyshipped = array();
+        		$qtyordred = array();
         		require_once DOL_DOCUMENT_ROOT.'/commande/class/commande.class.php';
 
         		//find all shippement on order origin
         		$order = new Commande($this->db);
-        		$ret=$order->fetch($object->origin_id);
-        		if ($ret<0) {
-        			$this->error=$order->error; $this->errors=$order->errors;
+        		$ret = $order->fetch($object->origin_id);
+        		if ($ret < 0) {
+        			$this->error = $order->error; $this->errors = $order->errors;
         			return $ret;
         		}
-        		$ret=$order->fetchObjectLinked($order->id,'commande',null,'shipping');
-        		if ($ret<0) {
-        			$this->error=$order->error; $this->errors=$order->errors;
+        		$ret = $order->fetchObjectLinked($order->id, 'commande', null, 'shipping');
+        		if ($ret < 0) {
+        			$this->error = $order->error; $this->errors = $order->errors;
         			return $ret;
         		}
         		//Build array of quantity shipped by product for an order
-        		if (is_array($order->linkedObjects) && count($order->linkedObjects)>0) {
-        			foreach($order->linkedObjects as $type=>$shipping_array) {
-        				if ($type=='shipping' && is_array($shipping_array) && count($shipping_array)>0) {
+        		if (is_array($order->linkedObjects) && count($order->linkedObjects) > 0) {
+        			foreach ($order->linkedObjects as $type=>$shipping_array) {
+        				if ($type == 'shipping' && is_array($shipping_array) && count($shipping_array) > 0) {
         					foreach ($shipping_array as $shipping) {
-		        				if (is_array($shipping->lines) && count($shipping->lines)>0) {
-		        					foreach($shipping->lines as $shippingline) {
-		        						$qtyshipped[$shippingline->fk_product]+=$shippingline->qty;
+		        				if (is_array($shipping->lines) && count($shipping->lines) > 0) {
+		        					foreach ($shipping->lines as $shippingline) {
+		        						$qtyshipped[$shippingline->fk_product] += $shippingline->qty;
 		        					}
 		        				}
 	        				}
@@ -296,20 +296,20 @@  discard block
 block discarded – undo
         		}
 
         		//Build array of quantity ordered by product
-        		if (is_array($order->lines) && count($order->lines)>0) {
-        			foreach($order->lines as $orderline) {
-        				$qtyordred[$orderline->fk_product]+=$orderline->qty;
+        		if (is_array($order->lines) && count($order->lines) > 0) {
+        			foreach ($order->lines as $orderline) {
+        				$qtyordred[$orderline->fk_product] += $orderline->qty;
         			}
         		}
         		//dol_syslog(var_export($qtyordred,true),LOG_DEBUG);
         		//dol_syslog(var_export($qtyshipped,true),LOG_DEBUG);
         		//Compare array
-        		$diff_array=array_diff_assoc($qtyordred,$qtyshipped);
-        		if (count($diff_array)==0) {
+        		$diff_array = array_diff_assoc($qtyordred, $qtyshipped);
+        		if (count($diff_array) == 0) {
         			//No diff => mean everythings is shipped
-        			$ret=$object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin);
-        			if ($ret<0) {
-        				$this->error=$object->error; $this->errors=$object->errors;
+        			$ret = $object->setStatut(Commande::STATUS_CLOSED, $object->origin_id, $object->origin);
+        			if ($ret < 0) {
+        				$this->error = $object->error; $this->errors = $object->errors;
         				return $ret;
         			}
         		}
@@ -320,22 +320,22 @@  discard block
 block discarded – undo
         {
         	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id, LOG_DEBUG);
 
-        	if (! empty($conf->reception->enabled) && ! empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
+        	if (!empty($conf->reception->enabled) && !empty($conf->global->WORKFLOW_BILL_ON_RECEPTION))
         	{
-        		$object->fetchObjectLinked('','reception',$object->id,$object->element);
-        		if (! empty($object->linkedObjects))
+        		$object->fetchObjectLinked('', 'reception', $object->id, $object->element);
+        		if (!empty($object->linkedObjects))
         		{
-        		    $totalonlinkedelements=0;
-        		    foreach($object->linkedObjects['reception'] as $element)
+        		    $totalonlinkedelements = 0;
+        		    foreach ($object->linkedObjects['reception'] as $element)
         		    {
         		        if ($element->statut == Reception::STATUS_VALIDATED) $totalonlinkedelements += $element->total_ht;
         		    }
         		    dol_syslog("Amount of linked proposals = ".$totalonlinkedelements.", of invoice = ".$object->total_ht.", egality is ".($totalonlinkedelements == $object->total_ht), LOG_DEBUG);
         		    if ($totalonlinkedelements == $object->total_ht)
         		    {
-        		        foreach($object->linkedObjects['reception'] as $element)
+        		        foreach ($object->linkedObjects['reception'] as $element)
         		        {
-        		            $ret=$element->set_billed();
+        		            $ret = $element->set_billed();
         		        }
         		    }
         		}

Please login to merge, or discard this patch.

Base/HookManager.php 1 patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -74,7 +74,7 @@  discard block
 block discarded – undo
             $arraycontext = array($arraycontext);
         }
 
-        $this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray));    // All contexts are concatenated
+        $this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
 
         foreach (Globals::$conf->modules_parts['hooks'] as $module => $hooks) { // Loop on each module that brings hooks
             if (empty(Globals::$conf->$module->enabled)) {
@@ -84,20 +84,20 @@  discard block
 block discarded – undo
             //dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
             foreach ($arraycontext as $context) {
                 if (is_array($hooks)) {
-                    $arrayhooks = $hooks;    // New system
+                    $arrayhooks = $hooks; // New system
                 } else {
-                    $arrayhooks = explode(':', $hooks);        // Old system (for backward compatibility)
+                    $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
                 }
                 if (in_array($context, $arrayhooks) || in_array('all', $arrayhooks)) {    // We instantiate action class only if initialized hook is handled by module
                     // Include actions class overwriting hooks
                     if (!is_object($this->hooks[$context][$module])) { // If set, class was already loaded
-                        $path = '/' . $module . '/class/';
-                        $actionfile = 'actions_' . $module . '.class.php';
+                        $path = '/'.$module.'/class/';
+                        $actionfile = 'actions_'.$module.'.class.php';
 
-                        dol_syslog(get_class($this) . '::initHooks Loading hook class for context ' . $context . ": " . $actionfile, LOG_INFO);
-                        $resaction = dol_include_once($path . $actionfile);
+                        dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
+                        $resaction = dol_include_once($path.$actionfile);
                         if ($resaction) {
-                            $controlclassname = 'Actions' . ucfirst($module);
+                            $controlclassname = 'Actions'.ucfirst($module);
                             $actionInstance = new $controlclassname($this->db);
                             $this->hooks[$context][$module] = $actionInstance;
                         }
@@ -220,7 +220,7 @@  discard block
 block discarded – undo
                     $actionclassinstance->error = 0;
                     $actionclassinstance->errors = array();
 
-                    dol_syslog(get_class($this) . "::executeHooks Qualified hook found (hooktype=" . $hooktype . "). We call method " . $method . " of class " . get_class($actionclassinstance) . ", module=" . $module . ", action=" . $action . " context=" . $context, LOG_DEBUG);
+                    dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
 
                     // Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
                     $parameters['currentcontext'] = $context;
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
                             $error++;
                             $this->error = $actionclassinstance->error;
                             $this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
-                            dol_syslog("Error on hook module=" . $module . ", method " . $method . ", class " . get_class($actionclassinstance) . ", hooktype=" . $hooktype . (empty($this->error) ? '' : " " . $this->error) . (empty($this->errors) ? '' : " " . join(",", $this->errors)), LOG_ERR);
+                            dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
                         }
 
                         if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
                             $this->resPrint .= $actionclassinstance->resprints;
                         // TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
                         if (!is_array($resaction) && !is_numeric($resaction)) {
-                            dol_syslog('Error: Bug into hook ' . $method . ' of module class ' . get_class($actionclassinstance) . '. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
+                            dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
                             if (empty($actionclassinstance->resprints)) {
                                 $this->resPrint .= $resaction;
                                 $resaction = 0;

Please login to merge, or discard this patch.

Base/ExtraFields.php 1 patch

Spacing +204 added lines, -204 removed lines patch added patch discarded remove patch

@@ -227,7 +227,7 @@  discard block
 block discarded – undo
         if ($elementtype == 'contact')
             $elementtype = 'socpeople';
 
-        $table = $elementtype . '_extrafields';
+        $table = $elementtype.'_extrafields';
         if ($elementtype == 'categorie')
             $table = 'categories_extrafields';
 
@@ -272,10 +272,10 @@  discard block
 block discarded – undo
                 'default' => $default_value
             );
 
-            $result = Config::$dbEngine->DDLAddField(MAIN_DB_PREFIX . $table, $attrname, $field_desc);
+            $result = Config::$dbEngine->DDLAddField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
             if ($result > 0) {
                 if ($unique) {
-                    $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " ADD UNIQUE INDEX uk_" . $table . "_" . $attrname . " (" . $attrname . ")";
+                    $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
                     $resql = Config::$dbEngine->query($sql, 1, 'dml');
                 }
                 return 1;
@@ -344,7 +344,7 @@  discard block
 block discarded – undo
                 $params = '';
             }
 
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "extrafields(";
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
             $sql .= " name,";
             $sql .= " label,";
             $sql .= " type,";
@@ -367,30 +367,30 @@  discard block
 block discarded – undo
             $sql .= " enabled,";
             $sql .= " help";
             $sql .= " )";
-            $sql .= " VALUES('" . $attrname . "',";
-            $sql .= " '" . Config::$dbEngine->escape($label) . "',";
-            $sql .= " '" . Config::$dbEngine->escape($type) . "',";
-            $sql .= " " . $pos . ",";
-            $sql .= " '" . Config::$dbEngine->escape($size) . "',";
-            $sql .= " " . ($entity === '' ? Globals::$conf->entity : $entity) . ",";
-            $sql .= " '" . Config::$dbEngine->escape($elementtype) . "',";
-            $sql .= " " . $unique . ",";
-            $sql .= " " . $required . ",";
-            $sql .= " '" . Config::$dbEngine->escape($params) . "',";
-            $sql .= " " . $alwayseditable . ",";
-            $sql .= " " . ($perms ? "'" . Config::$dbEngine->escape($perms) . "'" : "null") . ",";
-            $sql .= " " . ($langfile ? "'" . Config::$dbEngine->escape($langfile) . "'" : "null") . ",";
-            $sql .= " '" . Config::$dbEngine->escape($list) . "',";
-            $sql .= " " . ($default ? "'" . Config::$dbEngine->escape($default) . "'" : "null") . ",";
-            $sql .= " " . ($computed ? "'" . Config::$dbEngine->escape($computed) . "'" : "null") . ",";
-            $sql .= " " . (is_object(Globals::$user) ? Globals::$user->id : 0) . ",";
-            $sql .= " " . (is_object(Globals::$user) ? Globals::$user->id : 0) . ",";
-            $sql .= "'" . Config::$dbEngine->idate(dol_now()) . "',";
-            $sql .= " " . ($enabled ? "'" . Config::$dbEngine->escape($enabled) . "'" : "1") . ",";
-            $sql .= " " . ($help ? "'" . Config::$dbEngine->escape($help) . "'" : "null");
+            $sql .= " VALUES('".$attrname."',";
+            $sql .= " '".Config::$dbEngine->escape($label)."',";
+            $sql .= " '".Config::$dbEngine->escape($type)."',";
+            $sql .= " ".$pos.",";
+            $sql .= " '".Config::$dbEngine->escape($size)."',";
+            $sql .= " ".($entity === '' ? Globals::$conf->entity : $entity).",";
+            $sql .= " '".Config::$dbEngine->escape($elementtype)."',";
+            $sql .= " ".$unique.",";
+            $sql .= " ".$required.",";
+            $sql .= " '".Config::$dbEngine->escape($params)."',";
+            $sql .= " ".$alwayseditable.",";
+            $sql .= " ".($perms ? "'".Config::$dbEngine->escape($perms)."'" : "null").",";
+            $sql .= " ".($langfile ? "'".Config::$dbEngine->escape($langfile)."'" : "null").",";
+            $sql .= " '".Config::$dbEngine->escape($list)."',";
+            $sql .= " ".($default ? "'".Config::$dbEngine->escape($default)."'" : "null").",";
+            $sql .= " ".($computed ? "'".Config::$dbEngine->escape($computed)."'" : "null").",";
+            $sql .= " ".(is_object(Globals::$user) ? Globals::$user->id : 0).",";
+            $sql .= " ".(is_object(Globals::$user) ? Globals::$user->id : 0).",";
+            $sql .= "'".Config::$dbEngine->idate(dol_now())."',";
+            $sql .= " ".($enabled ? "'".Config::$dbEngine->escape($enabled)."'" : "1").",";
+            $sql .= " ".($help ? "'".Config::$dbEngine->escape($help)."'" : "null");
             $sql .= ')';
 
-            DolUtils::dol_syslog(get_class($this) . "::create_label", LOG_DEBUG);
+            DolUtils::dol_syslog(get_class($this)."::create_label", LOG_DEBUG);
             if (Config::$dbEngine->query($sql)) {
                 return 1;
             } else {
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
         if ($elementtype == 'contact')
             $elementtype = 'socpeople';
 
-        $table = $elementtype . '_extrafields';
+        $table = $elementtype.'_extrafields';
         if ($elementtype == 'categorie')
             $table = 'categories_extrafields';
 
@@ -430,15 +430,15 @@  discard block
 block discarded – undo
 
             if (!$error) {
                 $sql = "SELECT COUNT(rowid) as nb";
-                $sql .= " FROM " . MAIN_DB_PREFIX . "extrafields";
-                $sql .= " WHERE elementtype = '" . $elementtype . "'";
-                $sql .= " AND name = '" . $attrname . "'";
+                $sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql .= " WHERE elementtype = '".$elementtype."'";
+                $sql .= " AND name = '".$attrname."'";
                 //$sql.= " AND entity IN (0,".Globals::$conf->entity.")";      Do not test on entity here. We want to see if there is still on field remaning in other entities before deleting field in table
                 $resql = Config::$dbEngine->query($sql);
                 if ($resql) {
                     $obj = Config::$dbEngine->fetch_object($resql);
                     if ($obj->nb <= 0) {
-                        $result = Config::$dbEngine->DDLDropField(MAIN_DB_PREFIX . $table, $attrname); // This also drop the unique key
+                        $result = Config::$dbEngine->DDLDropField(MAIN_DB_PREFIX.$table, $attrname); // This also drop the unique key
                         if ($result < 0) {
                             $this->error = Config::$dbEngine->lasterror();
                             $error++;
@@ -472,12 +472,12 @@  discard block
 block discarded – undo
             $elementtype = 'socpeople';
 
         if (isset($attrname) && $attrname != '' && preg_match("/^\w[a-zA-Z0-9-_]*$/", $attrname)) {
-            $sql = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";
-            $sql .= " WHERE name = '" . $attrname . "'";
-            $sql .= " AND entity IN  (0," . Globals::$conf->entity . ')';
-            $sql .= " AND elementtype = '" . $elementtype . "'";
+            $sql = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+            $sql .= " WHERE name = '".$attrname."'";
+            $sql .= " AND entity IN  (0,".Globals::$conf->entity.')';
+            $sql .= " AND elementtype = '".$elementtype."'";
 
-            DolUtils::dol_syslog(get_class($this) . "::delete_label", LOG_DEBUG);
+            DolUtils::dol_syslog(get_class($this)."::delete_label", LOG_DEBUG);
             $resql = Config::$dbEngine->query($sql);
             if ($resql) {
                 return 1;
@@ -521,7 +521,7 @@  discard block
 block discarded – undo
         if ($elementtype == 'contact')
             $elementtype = 'socpeople';
 
-        $table = $elementtype . '_extrafields';
+        $table = $elementtype.'_extrafields';
         if ($elementtype == 'categorie')
             $table = 'categories_extrafields';
 
@@ -559,7 +559,7 @@  discard block
 block discarded – undo
             $field_desc = array('type' => $typedb, 'value' => $lengthdb, 'null' => ($required ? 'NOT NULL' : 'NULL'), 'default' => $default);
 
             if ($type != 'separate') { // No table update when separate type
-                $result = Config::$dbEngine->DDLUpdateField(MAIN_DB_PREFIX . $table, $attrname, $field_desc);
+                $result = Config::$dbEngine->DDLUpdateField(MAIN_DB_PREFIX.$table, $attrname, $field_desc);
             }
             if ($result > 0 || $type == 'separate') {
                 if ($label) {
@@ -568,11 +568,11 @@  discard block
 block discarded – undo
                 if ($result > 0) {
                     $sql = '';
                     if ($unique) {
-                        $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " ADD UNIQUE INDEX uk_" . $table . "_" . $attrname . " (" . $attrname . ")";
+                        $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." ADD UNIQUE INDEX uk_".$table."_".$attrname." (".$attrname.")";
                     } else {
-                        $sql = "ALTER TABLE " . MAIN_DB_PREFIX . $table . " DROP INDEX uk_" . $table . "_" . $attrname;
+                        $sql = "ALTER TABLE ".MAIN_DB_PREFIX.$table." DROP INDEX uk_".$table."_".$attrname;
                     }
-                    DolUtils::dol_syslog(get_class($this) . '::update', LOG_DEBUG);
+                    DolUtils::dol_syslog(get_class($this).'::update', LOG_DEBUG);
                     $resql = Config::$dbEngine->query($sql, 1, 'dml');
                     return 1;
                 } else {
@@ -617,7 +617,7 @@  discard block
 block discarded – undo
     {
         // phpcs:enable
         // global $conf, $user;
-        DolUtils::dol_syslog(get_class($this) . "::update_label " . $attrname . ", " . $label . ", " . $type . ", " . $size . ", " . $elementtype . ", " . $unique . ", " . $required . ", " . $pos . ", " . $alwayseditable . ", " . $perms . ", " . $list . ", " . $default . ", " . $computed . ", " . $entity . ", " . $langfile . ", " . $enabled . ", " . $totalizable);
+        DolUtils::dol_syslog(get_class($this)."::update_label ".$attrname.", ".$label.", ".$type.", ".$size.", ".$elementtype.", ".$unique.", ".$required.", ".$pos.", ".$alwayseditable.", ".$perms.", ".$list.", ".$default.", ".$computed.", ".$entity.", ".$langfile.", ".$enabled.", ".$totalizable);
 
         // Clean parameters
         if ($elementtype == 'thirdparty')
@@ -652,21 +652,21 @@  discard block
 block discarded – undo
 
             if ($entity === '' || $entity != '0') {
                 // We dont want on all entities, we delete all and current
-                $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";
-                $sql_del .= " WHERE name = '" . $attrname . "'";
-                $sql_del .= " AND entity IN (0, " . ($entity === '' ? Globals::$conf->entity : $entity) . ")";
-                $sql_del .= " AND elementtype = '" . $elementtype . "'";
+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql_del .= " WHERE name = '".$attrname."'";
+                $sql_del .= " AND entity IN (0, ".($entity === '' ? Globals::$conf->entity : $entity).")";
+                $sql_del .= " AND elementtype = '".$elementtype."'";
             } else {
                 // We want on all entities ($entities = '0'), we delete on all only (we keep setup specific to each entity)
-                $sql_del = "DELETE FROM " . MAIN_DB_PREFIX . "extrafields";
-                $sql_del .= " WHERE name = '" . $attrname . "'";
+                $sql_del = "DELETE FROM ".MAIN_DB_PREFIX."extrafields";
+                $sql_del .= " WHERE name = '".$attrname."'";
                 $sql_del .= " AND entity = 0";
-                $sql_del .= " AND elementtype = '" . $elementtype . "'";
+                $sql_del .= " AND elementtype = '".$elementtype."'";
             }
             $resql1 = Config::$dbEngine->query($sql_del);
 
-            $sql = "INSERT INTO " . MAIN_DB_PREFIX . "extrafields(";
-            $sql .= " name,";  // This is code
+            $sql = "INSERT INTO ".MAIN_DB_PREFIX."extrafields(";
+            $sql .= " name,"; // This is code
             $sql .= " entity,";
             $sql .= " label,";
             $sql .= " type,";
@@ -689,28 +689,28 @@  discard block
 block discarded – undo
             $sql .= " enabled,";
             $sql .= " help";
             $sql .= ") VALUES (";
-            $sql .= "'" . $attrname . "',";
-            $sql .= " " . ($entity === '' ? Globals::$conf->entity : $entity) . ",";
-            $sql .= " '" . Config::$dbEngine->escape($label) . "',";
-            $sql .= " '" . Config::$dbEngine->escape($type) . "',";
-            $sql .= " '" . Config::$dbEngine->escape($size) . "',";
-            $sql .= " '" . Config::$dbEngine->escape($elementtype) . "',";
-            $sql .= " " . $unique . ",";
-            $sql .= " " . $required . ",";
-            $sql .= " " . ($perms ? "'" . Config::$dbEngine->escape($perms) . "'" : "null") . ",";
-            $sql .= " " . ($langfile ? "'" . Config::$dbEngine->escape($langfile) . "'" : "null") . ",";
-            $sql .= " " . $pos . ",";
-            $sql .= " '" . Config::$dbEngine->escape($alwayseditable) . "',";
-            $sql .= " '" . Config::$dbEngine->escape($params) . "',";
-            $sql .= " '" . Config::$dbEngine->escape($list) . "', ";
-            $sql .= " " . $totalizable . ",";
-            $sql .= " " . (($default != '') ? "'" . Config::$dbEngine->escape($default) . "'" : "null") . ",";
-            $sql .= " " . ($computed ? "'" . Config::$dbEngine->escape($computed) . "'" : "null") . ",";
-            $sql .= " " . Globals::$user->id . ",";
-            $sql .= " " . Globals::$user->id . ",";
-            $sql .= "'" . Config::$dbEngine->idate(dol_now()) . "',";
-            $sql .= "'" . Config::$dbEngine->escape($enabled) . "',";
-            $sql .= " " . ($help ? "'" . Config::$dbEngine->escape($help) . "'" : "null");
+            $sql .= "'".$attrname."',";
+            $sql .= " ".($entity === '' ? Globals::$conf->entity : $entity).",";
+            $sql .= " '".Config::$dbEngine->escape($label)."',";
+            $sql .= " '".Config::$dbEngine->escape($type)."',";
+            $sql .= " '".Config::$dbEngine->escape($size)."',";
+            $sql .= " '".Config::$dbEngine->escape($elementtype)."',";
+            $sql .= " ".$unique.",";
+            $sql .= " ".$required.",";
+            $sql .= " ".($perms ? "'".Config::$dbEngine->escape($perms)."'" : "null").",";
+            $sql .= " ".($langfile ? "'".Config::$dbEngine->escape($langfile)."'" : "null").",";
+            $sql .= " ".$pos.",";
+            $sql .= " '".Config::$dbEngine->escape($alwayseditable)."',";
+            $sql .= " '".Config::$dbEngine->escape($params)."',";
+            $sql .= " '".Config::$dbEngine->escape($list)."', ";
+            $sql .= " ".$totalizable.",";
+            $sql .= " ".(($default != '') ? "'".Config::$dbEngine->escape($default)."'" : "null").",";
+            $sql .= " ".($computed ? "'".Config::$dbEngine->escape($computed)."'" : "null").",";
+            $sql .= " ".Globals::$user->id.",";
+            $sql .= " ".Globals::$user->id.",";
+            $sql .= "'".Config::$dbEngine->idate(dol_now())."',";
+            $sql .= "'".Config::$dbEngine->escape($enabled)."',";
+            $sql .= " ".($help ? "'".Config::$dbEngine->escape($help)."'" : "null");
             $sql .= ")";
 
             $resql2 = Config::$dbEngine->query($sql);
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
         // TODO Remove completely loading of label. This should be done by presentation.
         $labelmulticompany = array();
         if (!empty(Globals::$conf->multicompany->enabled)) {
-            $sql_entity_name = 'SELECT rowid, label FROM ' . MAIN_DB_PREFIX . 'entity WHERE rowid in (0,' . Globals::$conf->entity . ')';
+            $sql_entity_name = 'SELECT rowid, label FROM '.MAIN_DB_PREFIX.'entity WHERE rowid in (0,'.Globals::$conf->entity.')';
             $resql_entity_name = Config::$dbEngine->query($sql_entity_name);
             if ($resql_entity_name) {
                 while ($obj = Config::$dbEngine->fetch_object($resql_entity_name)) {
@@ -771,13 +771,13 @@  discard block
 block discarded – undo
         }
 
         // We should not have several time this log. If we have, there is some optimization to do by calling a simple $object->fetch_optionals() that include cache management.
-        DolUtils::dol_syslog("fetch_name_optionals_label elementtype=" . $elementtype);
+        DolUtils::dol_syslog("fetch_name_optionals_label elementtype=".$elementtype);
 
         $sql = "SELECT rowid,name,label,type,size,elementtype,fieldunique,fieldrequired,param,pos,alwayseditable,perms,langs,list,totalizable,fielddefault,fieldcomputed,entity,enabled,help";
-        $sql .= " FROM " . MAIN_DB_PREFIX . "extrafields";
-        $sql .= " WHERE entity IN (0," . Globals::$conf->entity . ")";
+        $sql .= " FROM ".MAIN_DB_PREFIX."extrafields";
+        $sql .= " WHERE entity IN (0,".Globals::$conf->entity.")";
         if ($elementtype)
-            $sql .= " AND elementtype = '" . $elementtype . "'"; // Filed with object->table_element
+            $sql .= " AND elementtype = '".$elementtype."'"; // Filed with object->table_element
         $sql .= " ORDER BY pos";
 
         $resql = Config::$dbEngine->select($sql);
@@ -809,7 +809,7 @@  discard block
 block discarded – undo
                 $this->attribute_list[$tab->name] = $tab->list;
                 $this->attribute_totalizable[$tab->name] = $tab->totalizable;
                 $this->attribute_entityid[$tab->name] = $tab->entity;
-                $this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity' . $tab->entity : $labelmulticompany[$tab->entity]);
+                $this->attribute_entitylabel[$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
 
                 // New usage
                 $this->attributes[$tab->elementtype]['type'][$tab->name] = $tab->type;
@@ -828,7 +828,7 @@  discard block
 block discarded – undo
                 $this->attributes[$tab->elementtype]['list'][$tab->name] = $tab->list;
                 $this->attributes[$tab->elementtype]['totalizable'][$tab->name] = $tab->totalizable;
                 $this->attributes[$tab->elementtype]['entityid'][$tab->name] = $tab->entity;
-                $this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity' . $tab->entity : $labelmulticompany[$tab->entity]);
+                $this->attributes[$tab->elementtype]['entitylabel'][$tab->name] = (empty($labelmulticompany[$tab->entity]) ? 'Entity'.$tab->entity : $labelmulticompany[$tab->entity]);
                 $this->attributes[$tab->elementtype]['enabled'][$tab->name] = $tab->enabled;
                 $this->attributes[$tab->elementtype]['help'][$tab->name] = $tab->help;
             }
@@ -861,13 +861,13 @@  discard block
 block discarded – undo
         // global $conf, $langs, $form;
 
         if (!is_object($form)) {
-            require_once DOL_DOCUMENT_ROOT . '/core/class/html.form.class.php';
+            require_once DOL_DOCUMENT_ROOT.'/core/class/html.form.class.php';
             $form = new Form(Config::$dbEngine);
         }
 
         $out = '';
 
-        $keyprefix = $keyprefix . 'options_';  // Because we work on extrafields
+        $keyprefix = $keyprefix.'options_'; // Because we work on extrafields
 
         if (!empty($extrafieldsobjectkey)) {
             $label = $this->attributes[$extrafieldsobjectkey]['label'][$key];
@@ -883,7 +883,7 @@  discard block
 block discarded – undo
             $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
             $totalizable = $this->attributes[$extrafieldsobjectkey]['totalizable'][$key];
             $help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
-            $hidden = (empty($list) ? 1 : 0);  // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+            $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
         } else { // Old usage
             $label = $this->attribute_label[$key];
             $type = $this->attribute_type[$key];
@@ -897,12 +897,12 @@  discard block
 block discarded – undo
             $langfile = $this->attribute_langfile[$key];
             $list = $this->attribute_list[$key];
             $totalizable = $this->attribute_totalizable[$key];
-            $hidden = (empty($list) ? 1 : 0);  // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+            $hidden = (empty($list) ? 1 : 0); // If empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
         }
 
         if ($computed) {
             if (!preg_match('/^search_/', $keyprefix))
-                return '<span class="opacitymedium">' . Globals::$langs->trans("AutomaticallyCalculated") . '</span>';
+                return '<span class="opacitymedium">'.Globals::$langs->trans("AutomaticallyCalculated").'</span>';
             else
                 return '';
         }
@@ -942,31 +942,31 @@  discard block
 block discarded – undo
                 $value = '-1';
 
             // TODO Must also support $moreparam
-            $out = $form->selectDate($value, $keyprefix . $key . $keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
+            $out = $form->selectDate($value, $keyprefix.$key.$keysuffix, $showtime, $showtime, $required, '', 1, (($keyprefix != 'search_' && $keyprefix != 'search_options_') ? 1 : 0), 0, 1);
         }
         elseif (in_array($type, array('int', 'integer'))) {
             $tmp = explode(',', $size);
             $newsize = $tmp[0];
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $newsize . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$newsize.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
         } elseif (preg_match('/varchar/', $type)) {
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" maxlength="' . $size . '" value="' . dol_escape_htmltag($value) . '"' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" maxlength="'.$size.'" value="'.dol_escape_htmltag($value).'"'.($moreparam ? $moreparam : '').'>';
         } elseif (in_array($type, array('mail', 'phone', 'url'))) {
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
         } elseif ($type == 'text') {
             if (!preg_match('/search_/', $keyprefix)) {  // If keyprefix is search_ or search_options_, we must just use a simple text field
-                require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, false, ROWS_5, '90%');
                 $out = $doleditor->Create(1);
             } else {
-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
             }
         } elseif ($type == 'html') {
             if (!preg_match('/search_/', $keyprefix)) {  // If keyprefix is search_ or search_options_, we must just use a simple text field
-                require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
-                $doleditor = new DolEditor($keyprefix . $key . $keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
+                require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
+                $doleditor = new DolEditor($keyprefix.$key.$keysuffix, $value, '', 200, 'dolibarr_notes', 'In', false, false, !empty(Globals::$conf->fckeditor->enabled) && Globals::$conf->global->FCKEDITOR_ENABLE_SOCIETE, ROWS_5, '90%');
                 $out = $doleditor->Create(1);
             } else {
-                $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . dol_escape_htmltag($value) . '" ' . ($moreparam ? $moreparam : '') . '>';
+                $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.dol_escape_htmltag($value).'" '.($moreparam ? $moreparam : '').'>';
             }
         } elseif ($type == 'boolean') {
             $checked = '';
@@ -975,33 +975,33 @@  discard block
 block discarded – undo
             } else {
                 $checked = ' value="1" ';
             }
-            $out = '<input type="checkbox" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . '>';
+            $out = '<input type="checkbox" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.$checked.' '.($moreparam ? $moreparam : '').'>';
         } elseif ($type == 'price') {
             if (!empty($value)) {  // $value in memory is a php numeric, we format it into user number format.
                 $value = price($value);
             }
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ' . Globals::$langs->getCurrencySymbol(Globals::$conf->currency);
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> '.Globals::$langs->getCurrencySymbol(Globals::$conf->currency);
         } elseif ($type == 'double') {
             if (!empty($value)) {  // $value in memory is a php numeric, we format it into user number format.
                 $value = price($value);
             }
-            $out = '<input type="text" class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '> ';
+            $out = '<input type="text" class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'> ';
         } elseif ($type == 'select') {
             $out = '';
             if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
             }
 
-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
             $out .= '<option value="0">&nbsp;</option>';
             foreach ($param['options'] as $key => $val) {
                 if ((string) $key == '')
                     continue;
                 list($val, $parent) = explode('|', $val);
-                $out .= '<option value="' . $key . '"';
+                $out .= '<option value="'.$key.'"';
                 $out .= (((string) $value == (string) $key) ? ' selected' : '');
-                $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');
+                $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
                 $out .= '>';
                 if ($langfile && $val)
                     $out .= Globals::$langs->trans($val);
@@ -1014,11 +1014,11 @@  discard block
 block discarded – undo
         elseif ($type == 'sellist') {
             $out = '';
             if (!empty(Globals::$conf->use_javascript_ajax) && !empty(Globals::$conf->global->MAIN_EXTRAFIELDS_USE_SELECT2)) {
-                include_once DOL_DOCUMENT_ROOT . '/core/lib/ajax.lib.php';
-                $out .= ajax_combobox($keyprefix . $key . $keysuffix, array(), 0);
+                include_once DOL_DOCUMENT_ROOT.'/core/lib/ajax.lib.php';
+                $out .= ajax_combobox($keyprefix.$key.$keysuffix, array(), 0);
             }
 
-            $out .= '<select class="flat ' . $morecss . ' maxwidthonsmartphone" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out .= '<select class="flat '.$morecss.' maxwidthonsmartphone" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '').'>';
             if (is_array($param['options'])) {
                 $param_list = array_keys($param['options']);
                 $InfoFieldList = explode(":", $param_list[0]);
@@ -1029,19 +1029,19 @@  discard block
 block discarded – undo
                 // 2 : key fields name (if differ of rowid)
                 // 3 : key field parent (for dependent lists)
                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
 
                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
                     if (strpos($InfoFieldList[4], 'extra.') !== false) {
-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';
                     } else {
-                        $keyList = $InfoFieldList[2] . ' as rowid';
+                        $keyList = $InfoFieldList[2].' as rowid';
                     }
                 }
                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
                     list($parentName, $parentField) = explode('|', $InfoFieldList[3]);
-                    $keyList .= ', ' . $parentField;
+                    $keyList .= ', '.$parentField;
                 }
 
                 $fields_label = explode('|', $InfoFieldList[1]);
@@ -1051,8 +1051,8 @@  discard block
 block discarded – undo
                 }
 
                 $sqlwhere = '';
-                $sql = 'SELECT ' . $keyList;
-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+                $sql = 'SELECT '.$keyList;
+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
                 if (!empty($InfoFieldList[4])) {
                     // can use curent entity filter
                     if (strpos($InfoFieldList[4], '$ENTITY$') !== false) {
@@ -1071,24 +1071,24 @@  discard block
 block discarded – undo
                     }
                     //We have to join on extrafield table
                     if (strpos($InfoFieldList[4], 'extra') !== false) {
-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
                     } else {
-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];
                     }
                 } else {
                     $sqlwhere .= ' WHERE 1=1';
                 }
                 // Some tables may have field, some other not. For the moment we disable it.
                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;
+                    $sqlwhere .= ' AND entity = '.Globals::$conf->entity;
                 }
                 $sql .= $sqlwhere;
                 //print $sql;
 
-                $sql .= ' ORDER BY ' . implode(', ', $fields_label);
+                $sql .= ' ORDER BY '.implode(', ', $fields_label);
 
-                DolUtils::dol_syslog(get_class($this) . '::showInputField type=sellist', LOG_DEBUG);
+                DolUtils::dol_syslog(get_class($this).'::showInputField type=sellist', LOG_DEBUG);
                 $resql = Config::$dbEngine->query($sql);
                 if ($resql) {
                     $out .= '<option value="0">&nbsp;</option>';
@@ -1104,7 +1104,7 @@  discard block
 block discarded – undo
                         if (is_array($fields_label)) {
                             $notrans = true;
                             foreach ($fields_label as $field_toshow) {
-                                $labeltoshow .= $obj->$field_toshow . ' ';
+                                $labeltoshow .= $obj->$field_toshow.' ';
                             }
                         } else {
                             $labeltoshow = $obj->{$InfoFieldList[1]};
@@ -1115,12 +1115,12 @@  discard block
 block discarded – undo
                             foreach ($fields_label as $field_toshow) {
                                 $translabel = Globals::$langs->trans($obj->$field_toshow);
                                 if ($translabel != $obj->$field_toshow) {
-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';
+                                    $labeltoshow = dol_trunc($translabel, 18).' ';
                                 } else {
-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
                                 }
                             }
-                            $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';
+                            $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
                         } else {
                             if (!$notrans) {
                                 $translabel = Globals::$langs->trans($obj->{$InfoFieldList[1]});
@@ -1133,38 +1133,38 @@  discard block
 block discarded – undo
                             if (empty($labeltoshow))
                                 $labeltoshow = '(not defined)';
                             if ($value == $obj->rowid) {
-                                $out .= '<option value="' . $obj->rowid . '" selected>' . $labeltoshow . '</option>';
+                                $out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
                             }
 
                             if (!empty($InfoFieldList[3]) && $parentField) {
-                                $parent = $parentName . ':' . $obj->{$parentField};
+                                $parent = $parentName.':'.$obj->{$parentField};
                             }
 
-                            $out .= '<option value="' . $obj->rowid . '"';
+                            $out .= '<option value="'.$obj->rowid.'"';
                             $out .= ($value == $obj->rowid ? ' selected' : '');
-                            $out .= (!empty($parent) ? ' parent="' . $parent . '"' : '');
-                            $out .= '>' . $labeltoshow . '</option>';
+                            $out .= (!empty($parent) ? ' parent="'.$parent.'"' : '');
+                            $out .= '>'.$labeltoshow.'</option>';
                         }
 
                         $i++;
                     }
                     Config::$dbEngine->free($resql);
                 } else {
-                    print 'Error in request ' . $sql . ' ' . Config::$dbEngine->lasterror() . '. Check setup of extra parameters.<br>';
+                    print 'Error in request '.$sql.' '.Config::$dbEngine->lasterror().'. Check setup of extra parameters.<br>';
                 }
             }
             $out .= '</select>';
         } elseif ($type == 'checkbox') {
             $value_arr = explode(',', $value);
-            $out = $form->multiselectarray($keyprefix . $key . $keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');
+            $out = $form->multiselectarray($keyprefix.$key.$keysuffix, (empty($param['options']) ? null : $param['options']), $value_arr, '', 0, '', 0, '100%');
         } elseif ($type == 'radio') {
             $out = '';
             foreach ($param['options'] as $keyopt => $val) {
-                $out .= '<input class="flat ' . $morecss . '" type="radio" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" ' . ($moreparam ? $moreparam : '');
-                $out .= ' value="' . $keyopt . '"';
-                $out .= ' id="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '"';
+                $out .= '<input class="flat '.$morecss.'" type="radio" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" '.($moreparam ? $moreparam : '');
+                $out .= ' value="'.$keyopt.'"';
+                $out .= ' id="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'"';
                 $out .= ($value == $keyopt ? 'checked' : '');
-                $out .= '/><label for="' . $keyprefix . $key . $keysuffix . '_' . $keyopt . '">' . $val . '</label><br>';
+                $out .= '/><label for="'.$keyprefix.$key.$keysuffix.'_'.$keyopt.'">'.$val.'</label><br>';
             }
         } elseif ($type == 'chkbxlst') {
             if (is_array($value)) {
@@ -1183,17 +1183,17 @@  discard block
 block discarded – undo
                 // 2 : key fields name (if differ of rowid)
                 // 3 : key field parent (for dependent lists)
                 // 4 : where clause filter on column or table extrafield, syntax field='value' or extra.field=value
-                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2] . ' as rowid');
+                $keyList = (empty($InfoFieldList[2]) ? 'rowid' : $InfoFieldList[2].' as rowid');
 
                 if (count($InfoFieldList) > 3 && !empty($InfoFieldList[3])) {
-                    list ( $parentName, $parentField ) = explode('|', $InfoFieldList[3]);
-                    $keyList .= ', ' . $parentField;
+                    list ($parentName, $parentField) = explode('|', $InfoFieldList[3]);
+                    $keyList .= ', '.$parentField;
                 }
                 if (count($InfoFieldList) > 4 && !empty($InfoFieldList[4])) {
                     if (strpos($InfoFieldList[4], 'extra.') !== false) {
-                        $keyList = 'main.' . $InfoFieldList[2] . ' as rowid';
+                        $keyList = 'main.'.$InfoFieldList[2].' as rowid';
                     } else {
-                        $keyList = $InfoFieldList[2] . ' as rowid';
+                        $keyList = $InfoFieldList[2].' as rowid';
                     }
                 }
 
@@ -1204,8 +1204,8 @@  discard block
 block discarded – undo
                 }
 
                 $sqlwhere = '';
-                $sql = 'SELECT ' . $keyList;
-                $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+                $sql = 'SELECT '.$keyList;
+                $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
                 if (!empty($InfoFieldList[4])) {
 
                     // can use SELECT request
@@ -1229,11 +1229,11 @@  discard block
 block discarded – undo
                             // Init des compteurs
                             $nbPregRepl = $nbPregSel = 0;
                             // On retire toutes les parenthèses sans = avant
-                            $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*(' . $word . ')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
+                            $InfoFieldList[4] = preg_replace('#([^=])(\([^)^(]*('.$word.')[^)^(]*\))#', '$1 $3 ', $InfoFieldList[4], -1, $nbPregRepl);
                             // On retire les espaces autour des = et parenthèses
                             $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
                             // On retire toutes les parenthèses avec = avant
-                            $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*(' . $word . ')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
+                            $InfoFieldList[4] = preg_replace('#\b[a-zA-Z0-9-\.-_]+\b=\([^)^(]*('.$word.')[^)^(]*\)#', '$1 ', $InfoFieldList[4], -1, $nbPregSel);
                             // On retire les espaces autour des = et parenthèses
                             $InfoFieldList[4] = preg_replace('# *(=|\(|\)) *#', '$1', $InfoFieldList[4]);
 
@@ -1242,7 +1242,7 @@  discard block
 block discarded – undo
                         }
 
                         // Si l'on a un AND ou un OR, avant ou après
-                        preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+                        preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
                         while (!empty($matchCondition[0])) {
                             // If the two sides differ but are not empty
                             if (!empty($matchCondition[1]) && !empty($matchCondition[3]) && $matchCondition[1] != $matchCondition[3]) {
@@ -1250,10 +1250,10 @@  discard block
 block discarded – undo
                                 $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
                             } else {
                                 if (!empty($matchCondition[1])) {
-                                    $boolCond = (( $matchCondition[1] == "AND" ) ? ' AND 1 ' : ' OR 0 ');
-                                    $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond . $matchCondition[3], $InfoFieldList[4]);
+                                    $boolCond = (($matchCondition[1] == "AND") ? ' AND 1 ' : ' OR 0 ');
+                                    $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond.$matchCondition[3], $InfoFieldList[4]);
                                 } else if (!empty($matchCondition[3])) {
-                                    $boolCond = (( $matchCondition[3] == "AND" ) ? ' 1 AND ' : ' 0 OR');
+                                    $boolCond = (($matchCondition[3] == "AND") ? ' 1 AND ' : ' 0 OR');
                                     $InfoFieldList[4] = str_replace($matchCondition[0], $boolCond, $InfoFieldList[4]);
                                 } else {
                                     $InfoFieldList[4] = 1;
@@ -1261,7 +1261,7 @@  discard block
 block discarded – undo
                             }
 
                             // Si l'on a un AND ou un OR, avant ou après
-                            preg_match('#(AND|OR|) *(' . $word . ') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
+                            preg_match('#(AND|OR|) *('.$word.') *(AND|OR|)#', $InfoFieldList[4], $matchCondition);
                         }
                     } else {
                         $InfoFieldList[4] = str_replace('$ID$', '0', $InfoFieldList[4]);
@@ -1269,23 +1269,23 @@  discard block
 block discarded – undo
 
                     // We have to join on extrafield table
                     if (strpos($InfoFieldList[4], 'extra') !== false) {
-                        $sql .= ' as main, ' . MAIN_DB_PREFIX . $InfoFieldList[0] . '_extrafields as extra';
-                        $sqlwhere .= ' WHERE extra.fk_object=main.' . $InfoFieldList[2] . ' AND ' . $InfoFieldList[4];
+                        $sql .= ' as main, '.MAIN_DB_PREFIX.$InfoFieldList[0].'_extrafields as extra';
+                        $sqlwhere .= ' WHERE extra.fk_object=main.'.$InfoFieldList[2].' AND '.$InfoFieldList[4];
                     } else {
-                        $sqlwhere .= ' WHERE ' . $InfoFieldList[4];
+                        $sqlwhere .= ' WHERE '.$InfoFieldList[4];
                     }
                 } else {
                     $sqlwhere .= ' WHERE 1=1';
                 }
                 // Some tables may have field, some other not. For the moment we disable it.
                 if (in_array($InfoFieldList[0], array('tablewithentity'))) {
-                    $sqlwhere .= ' AND entity = ' . Globals::$conf->entity;
+                    $sqlwhere .= ' AND entity = '.Globals::$conf->entity;
                 }
                 // $sql.=preg_replace('/^ AND /','',$sqlwhere);
                 // print $sql;
 
                 $sql .= $sqlwhere;
-                DolUtils::dol_syslog(get_class($this) . '::showInputField type=chkbxlst', LOG_DEBUG);
+                DolUtils::dol_syslog(get_class($this).'::showInputField type=chkbxlst', LOG_DEBUG);
                 $resql = Config::$dbEngine->query($sql);
                 if ($resql) {
                     $num = Config::$dbEngine->num_rows($resql);
@@ -1303,7 +1303,7 @@  discard block
 block discarded – undo
                         if (is_array($fields_label)) {
                             $notrans = true;
                             foreach ($fields_label as $field_toshow) {
-                                $labeltoshow .= $obj->$field_toshow . ' ';
+                                $labeltoshow .= $obj->$field_toshow.' ';
                             }
                         } else {
                             $labeltoshow = $obj->{$InfoFieldList[1]};
@@ -1314,9 +1314,9 @@  discard block
 block discarded – undo
                             foreach ($fields_label as $field_toshow) {
                                 $translabel = Globals::$langs->trans($obj->$field_toshow);
                                 if ($translabel != $obj->$field_toshow) {
-                                    $labeltoshow = dol_trunc($translabel, 18) . ' ';
+                                    $labeltoshow = dol_trunc($translabel, 18).' ';
                                 } else {
-                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18) . ' ';
+                                    $labeltoshow = dol_trunc($obj->$field_toshow, 18).' ';
                                 }
                             }
 
@@ -1338,32 +1338,32 @@  discard block
 block discarded – undo
                             }
 
                             if (!empty($InfoFieldList[3]) && $parentField) {
-                                $parent = $parentName . ':' . $obj->{$parentField};
+                                $parent = $parentName.':'.$obj->{$parentField};
                             }
 
                             $data[$obj->rowid] = $labeltoshow;
                         }
 
-                        $i ++;
+                        $i++;
                     }
                     Config::$dbEngine->free($resql);
 
-                    $out = $form->multiselectarray($keyprefix . $key . $keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
+                    $out = $form->multiselectarray($keyprefix.$key.$keysuffix, $data, $value_arr, '', 0, '', 0, '100%');
                 } else {
-                    print 'Error in request ' . $sql . ' ' . Config::$dbEngine->lasterror() . '. Check setup of extra parameters.<br>';
+                    print 'Error in request '.$sql.' '.Config::$dbEngine->lasterror().'. Check setup of extra parameters.<br>';
                 }
             }
         } elseif ($type == 'link') {
-            $param_list = array_keys($param['options']);    // $param_list='ObjectName:classPath'
+            $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
             $showempty = (($required && $default != '') ? 0 : 1);
-            $out = $form->selectForForms($param_list[0], $keyprefix . $key . $keysuffix, $value, $showempty);
+            $out = $form->selectForForms($param_list[0], $keyprefix.$key.$keysuffix, $value, $showempty);
         } elseif ($type == 'password') {
             // If prefix is 'search_', field is used as a filter, we use a common text field.
             $out = '<input style="display:none" type="text" name="fakeusernameremembered">'; // Hidden field to reduce impact of evil Google Chrome autopopulate bug.
-            $out .= '<input autocomplete="new-password" type="' . ($keyprefix == 'search_' ? 'text' : 'password') . '" class="flat ' . $morecss . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '" value="' . $value . '" ' . ($moreparam ? $moreparam : '') . '>';
+            $out .= '<input autocomplete="new-password" type="'.($keyprefix == 'search_' ? 'text' : 'password').'" class="flat '.$morecss.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'" value="'.$value.'" '.($moreparam ? $moreparam : '').'>';
         }
         if (!empty($hidden)) {
-            $out = '<input type="hidden" value="' . $value . '" name="' . $keyprefix . $key . $keysuffix . '" id="' . $keyprefix . $key . $keysuffix . '"/>';
+            $out = '<input type="hidden" value="'.$value.'" name="'.$keyprefix.$key.$keysuffix.'" id="'.$keyprefix.$key.$keysuffix.'"/>';
         }
         /* Add comments
           if ($type == 'date') $out.=' (YYYY-MM-DD)';
@@ -1398,7 +1398,7 @@  discard block
 block discarded – undo
             $langfile = $this->attributes[$extrafieldsobjectkey]['langfile'][$key];
             $list = dol_eval($this->attributes[$extrafieldsobjectkey]['list'][$key], 1);
             $help = $this->attributes[$extrafieldsobjectkey]['help'][$key];
-            $hidden = (empty($list) ? 1 : 0);  // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+            $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
         } else { // Old usage
             $label = $this->attribute_label[$key];
             $type = $this->attribute_type[$key];
@@ -1412,11 +1412,11 @@  discard block
 block discarded – undo
             $langfile = $this->attribute_langfile[$key];
             $list = dol_eval($this->attribute_list[$key], 1);
             $help = ''; // Not supported with old syntax
-            $hidden = (empty($list) ? 1 : 0);  // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
+            $hidden = (empty($list) ? 1 : 0); // If $list empty, we are sure it is hidden, otherwise we show. If it depends on mode (view/create/edit form or list, this must be filtered by caller)
         }
 
         if ($hidden)
-            return '';  // This is a protection. If field is hidden, we should just not call this method.
+            return ''; // This is a protection. If field is hidden, we should just not call this method.
 
 
 
@@ -1447,7 +1447,7 @@  discard block
 block discarded – undo
             if (!empty($value)) {
                 $checked = ' checked ';
             }
-            $value = '<input type="checkbox" ' . $checked . ' ' . ($moreparam ? $moreparam : '') . ' readonly disabled>';
+            $value = '<input type="checkbox" '.$checked.' '.($moreparam ? $moreparam : '').' readonly disabled>';
         } elseif ($type == 'mail') {
             $value = dol_print_email($value, 0, 0, 0, 64, 1, 1);
         } elseif ($type == 'url') {
@@ -1471,7 +1471,7 @@  discard block
 block discarded – undo
 
             if (count($InfoFieldList) >= 3) {
                 $selectkey = $InfoFieldList[2];
-                $keyList = $InfoFieldList[2] . ' as rowid';
+                $keyList = $InfoFieldList[2].' as rowid';
             }
 
             $fields_label = explode('|', $InfoFieldList[1]);
@@ -1480,22 +1480,22 @@  discard block
 block discarded – undo
                 $keyList .= implode(', ', $fields_label);
             }
 
-            $sql = 'SELECT ' . $keyList;
-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+            $sql = 'SELECT '.$keyList;
+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
             if (strpos($InfoFieldList[4], 'extra') !== false) {
                 $sql .= ' as main';
             }
             if ($selectkey == 'rowid' && empty($value)) {
-                $sql .= " WHERE " . $selectkey . "=0";
+                $sql .= " WHERE ".$selectkey."=0";
             } elseif ($selectkey == 'rowid') {
-                $sql .= " WHERE " . $selectkey . "=" . Config::$dbEngine->escape($value);
+                $sql .= " WHERE ".$selectkey."=".Config::$dbEngine->escape($value);
             } else {
-                $sql .= " WHERE " . $selectkey . "='" . Config::$dbEngine->escape($value) . "'";
+                $sql .= " WHERE ".$selectkey."='".Config::$dbEngine->escape($value)."'";
             }
 
             //$sql.= ' AND entity = '.Globals::$conf->entity;
 
-            DolUtils::dol_syslog(get_class($this) . ':showOutputField:$type=sellist', LOG_DEBUG);
+            DolUtils::dol_syslog(get_class($this).':showOutputField:$type=sellist', LOG_DEBUG);
             $resql = Config::$dbEngine->query($sql);
             if ($resql) {
                 $value = ''; // value was used, so now we reste it to use it to build final output
@@ -1512,9 +1512,9 @@  discard block
 block discarded – undo
                             $translabel = Globals::$langs->trans($obj->$field_toshow);
                         }
                         if ($translabel != $field_toshow) {
-                            $value .= dol_trunc($translabel, 18) . ' ';
+                            $value .= dol_trunc($translabel, 18).' ';
                         } else {
-                            $value .= $obj->$field_toshow . ' ';
+                            $value .= $obj->$field_toshow.' ';
                         }
                     }
                 } else {
@@ -1529,7 +1529,7 @@  discard block
 block discarded – undo
                     }
                 }
             } else
-                DolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);
+                DolUtils::dol_syslog(get_class($this).'::showOutputField error '.Config::$dbEngine->lasterror(), LOG_WARNING);
         }
         elseif ($type == 'radio') {
             $value = $param['options'][$value];
@@ -1539,10 +1539,10 @@  discard block
 block discarded – undo
             $toprint = array();
             if (is_array($value_arr)) {
                 foreach ($value_arr as $keyval => $valueval) {
-                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $param['options'][$valueval] . '</li>';
+                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$param['options'][$valueval].'</li>';
                 }
             }
-            $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+            $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
         } elseif ($type == 'chkbxlst') {
             $value_arr = explode(',', $value);
 
@@ -1554,7 +1554,7 @@  discard block
 block discarded – undo
 
             if (count($InfoFieldList) >= 3) {
                 $selectkey = $InfoFieldList[2];
-                $keyList = $InfoFieldList[2] . ' as rowid';
+                $keyList = $InfoFieldList[2].' as rowid';
             }
 
             $fields_label = explode('|', $InfoFieldList[1]);
@@ -1563,15 +1563,15 @@  discard block
 block discarded – undo
                 $keyList .= implode(', ', $fields_label);
             }
 
-            $sql = 'SELECT ' . $keyList;
-            $sql .= ' FROM ' . MAIN_DB_PREFIX . $InfoFieldList[0];
+            $sql = 'SELECT '.$keyList;
+            $sql .= ' FROM '.MAIN_DB_PREFIX.$InfoFieldList[0];
             if (strpos($InfoFieldList[4], 'extra') !== false) {
                 $sql .= ' as main';
             }
             // $sql.= " WHERE ".$selectkey."='".Config::$dbEngine->escape($value)."'";
             // $sql.= ' AND entity = '.Globals::$conf->entity;
 
-            DolUtils::dol_syslog(get_class($this) . ':showOutputField:$type=chkbxlst', LOG_DEBUG);
+            DolUtils::dol_syslog(get_class($this).':showOutputField:$type=chkbxlst', LOG_DEBUG);
             $resql = Config::$dbEngine->query($sql);
             if ($resql) {
                 $value = ''; // value was used, so now we reste it to use it to build final output
@@ -1588,9 +1588,9 @@  discard block
 block discarded – undo
                                     $translabel = Globals::$langs->trans($obj->$field_toshow);
                                 }
                                 if ($translabel != $field_toshow) {
-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';
+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
                                 } else {
-                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->$field_toshow . '</li>';
+                                    $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->$field_toshow.'</li>';
                                 }
                             }
                         } else {
@@ -1599,23 +1599,23 @@  discard block
 block discarded – undo
                                 $translabel = Globals::$langs->trans($obj->{$InfoFieldList[1]});
                             }
                             if ($translabel != $obj->{$InfoFieldList[1]}) {
-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . dol_trunc($translabel, 18) . '</li>';
+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.dol_trunc($translabel, 18).'</li>';
                             } else {
-                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">' . $obj->{$InfoFieldList[1]} . '</li>';
+                                $toprint[] = '<li class="select2-search-choice-dolibarr noborderoncategories" style="background: #aaa">'.$obj->{$InfoFieldList[1]}.'</li>';
                             }
                         }
                     }
                 }
-                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">' . implode(' ', $toprint) . '</ul></div>';
+                $value = '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
             } else {
-                DolUtils::dol_syslog(get_class($this) . '::showOutputField error ' . Config::$dbEngine->lasterror(), LOG_WARNING);
+                DolUtils::dol_syslog(get_class($this).'::showOutputField error '.Config::$dbEngine->lasterror(), LOG_WARNING);
             }
         } elseif ($type == 'link') {
             $out = '';
 
             // Only if something to display (perf)
             if ($value) {  // If we have -1 here, pb is into sert, not into ouptu
-                $param_list = array_keys($param['options']);    // $param_list='ObjectName:classPath'
+                $param_list = array_keys($param['options']); // $param_list='ObjectName:classPath'
 
                 $InfoFieldList = explode(":", $param_list[0]);
                 $classname = $InfoFieldList[0];
@@ -1700,7 +1700,7 @@  discard block
 block discarded – undo
     {
         // global $langs;
 
-        $out = '<tr class="trextrafieldseparator trextrafieldseparator' . $key . '"><td colspan="2"><strong>';
+        $out = '<tr class="trextrafieldseparator trextrafieldseparator'.$key.'"><td colspan="2"><strong>';
         $out .= Globals::$langs->trans($this->attributes[$object->table_element]['label'][$key]);
         $out .= '</strong></td></tr>';
         return $out;
@@ -1748,7 +1748,7 @@  discard block
 block discarded – undo
 
                 if ($this->attributes[$object->table_element]['required'][$key]) { // Value is required
                     // Check if empty without using GETPOST, value can be alpha, int, array, etc...
-                    if ((!is_array($_POST["options_" . $key]) && empty($_POST["options_" . $key]) && $_POST["options_" . $key] != '0') || (is_array($_POST["options_" . $key]) && empty($_POST["options_" . $key]))) {
+                    if ((!is_array($_POST["options_".$key]) && empty($_POST["options_".$key]) && $_POST["options_".$key] != '0') || (is_array($_POST["options_".$key]) && empty($_POST["options_".$key]))) {
                         //print 'ccc'.$value.'-'.$this->attributes[$object->table_element]['required'][$key];
                         $nofillrequired++;
                         $error_field_required[] = Globals::$langs->transnoentitiesnoconv($value);
@@ -1758,31 +1758,31 @@  discard block
 block discarded – undo
                 if (in_array($key_type, array('date'))) {
                     // Clean parameters
                     // TODO GMT date in memory must be GMT so we should add gm=true in parameters
-                    $value_key = dol_mktime(0, 0, 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]);
+                    $value_key = dol_mktime(0, 0, 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
                 } elseif (in_array($key_type, array('datetime'))) {
                     // Clean parameters
                     // TODO GMT date in memory must be GMT so we should add gm=true in parameters
-                    $value_key = dol_mktime($_POST["options_" . $key . "hour"], $_POST["options_" . $key . "min"], 0, $_POST["options_" . $key . "month"], $_POST["options_" . $key . "day"], $_POST["options_" . $key . "year"]);
+                    $value_key = dol_mktime($_POST["options_".$key."hour"], $_POST["options_".$key."min"], 0, $_POST["options_".$key."month"], $_POST["options_".$key."day"], $_POST["options_".$key."year"]);
                 } else if (in_array($key_type, array('checkbox', 'chkbxlst'))) {
-                    $value_arr = GETPOST("options_" . $key, 'array'); // check if an array
+                    $value_arr = GETPOST("options_".$key, 'array'); // check if an array
                     if (!empty($value_arr)) {
                         $value_key = implode($value_arr, ',');
                     } else {
                         $value_key = '';
                     }
                 } else if (in_array($key_type, array('price', 'double'))) {
-                    $value_arr = GETPOST("options_" . $key, 'alpha');
+                    $value_arr = GETPOST("options_".$key, 'alpha');
                     $value_key = price2num($value_arr);
                 } else {
-                    $value_key = GETPOST("options_" . $key);
+                    $value_key = GETPOST("options_".$key);
                 }
 
-                $object->array_options["options_" . $key] = $value_key;
+                $object->array_options["options_".$key] = $value_key;
             }
 
             if ($nofillrequired) {
                 Globals::$langs->load('errors');
-                setEventMessages(Globals::$langs->trans('ErrorFieldsRequired') . ' : ' . implode(', ', $error_field_required), null, 'errors');
+                setEventMessages(Globals::$langs->trans('ErrorFieldsRequired').' : '.implode(', ', $error_field_required), null, 'errors');
                 return -1;
             } else {
                 return 1;
@@ -1822,20 +1822,20 @@  discard block
 block discarded – undo
 
                 if (in_array($key_type, array('date', 'datetime'))) {
                     // Clean parameters
-                    $value_key = dol_mktime($_POST[$keysuffix . "options_" . $key . $keyprefix . "hour"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "min"], 0, $_POST[$keysuffix . "options_" . $key . $keyprefix . "month"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "day"], $_POST[$keysuffix . "options_" . $key . $keyprefix . "year"]);
+                    $value_key = dol_mktime($_POST[$keysuffix."options_".$key.$keyprefix."hour"], $_POST[$keysuffix."options_".$key.$keyprefix."min"], 0, $_POST[$keysuffix."options_".$key.$keyprefix."month"], $_POST[$keysuffix."options_".$key.$keyprefix."day"], $_POST[$keysuffix."options_".$key.$keyprefix."year"]);
                 } else if (in_array($key_type, array('checkbox', 'chkbxlst'))) {
-                    $value_arr = GETPOST($keysuffix . "options_" . $key . $keyprefix);
+                    $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
                     // Make sure we get an array even if there's only one checkbox
                     $value_arr = (array) $value_arr;
                     $value_key = implode(',', $value_arr);
                 } else if (in_array($key_type, array('price', 'double'))) {
-                    $value_arr = GETPOST($keysuffix . "options_" . $key . $keyprefix);
+                    $value_arr = GETPOST($keysuffix."options_".$key.$keyprefix);
                     $value_key = price2num($value_arr);
                 } else {
-                    $value_key = GETPOST($keysuffix . "options_" . $key . $keyprefix);
+                    $value_key = GETPOST($keysuffix."options_".$key.$keyprefix);
                 }
 
-                $array_options[$keysuffix . "options_" . $key] = $value_key; // No keyprefix here. keyprefix is used only for read.
+                $array_options[$keysuffix."options_".$key] = $value_key; // No keyprefix here. keyprefix is used only for read.
             }
 
             return $array_options;

Please login to merge, or discard this patch.

		@@ -56,19 +56,19 @@ discard block
		block discarded – undo
56	56	*/
57	57	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
58	58	{
59		- if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
	59	+ if (empty($conf->blockedlog->enabled)) return 0; // Module not active, we do nothing
60	60
61	61	// Test if event/record is qualified
62	62	$listofqualifiedelement = array('facture', 'don', 'payment', 'payment_donation', 'subscription', 'payment_various', 'cashcontrol');
63		- if (! in_array($object->element, $listofqualifiedelement)) return 1;
	63	+ if (!in_array($object->element, $listofqualifiedelement)) return 1;
64	64
65	65	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
66	66
67	67	require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
68		- $b=new BlockedLog($this->db);
	68	+ $b = new BlockedLog($this->db);
69	69
70	70	// Tracked events
71		- if (! in_array($action, array_keys($b->trackedevents)))
	71	+ if (!in_array($action, array_keys($b->trackedevents)))
72	72	{
73	73	return 0;
74	74	}
		@@ -76,19 +76,19 @@ discard block
		block discarded – undo
76	76	// Event/record is qualified
77	77	$qualified = 0;
78	78	$amounts = 0;
79		- if ($action==='BILL_VALIDATE' \|\| $action==='BILL_DELETE' \|\| $action === 'BILL_SENTBYMAIL'
80		- \|\| $action==='BILL_SUPPLIER_VALIDATE' \|\| $action==='BILL_SUPPLIER_DELETE' \|\| $action === 'BILL_SUPPLIER_SENTBYMAIL'
81		- \|\| $action==='MEMBER_SUBSCRIPTION_CREATE' \|\| $action==='MEMBER_SUBSCRIPTION_MODIFY' \|\| $action==='MEMBER_SUBSCRIPTION_DELETE'
82		- \|\| $action==='DON_VALIDATE' \|\| $action==='DON_MODIFY' \|\| $action==='DON_DELETE'
83		- \|\| $action==='CASHCONTROL_VALIDATE'
84		- \|\| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_DOWNLOAD') \|\| (in_array($object->element, array('facture','suplier_invoice')) && $action === 'DOC_PREVIEW')
	79	+ if ($action === 'BILL_VALIDATE' \|\| $action === 'BILL_DELETE' \|\| $action === 'BILL_SENTBYMAIL'
	80	+ \|\| $action === 'BILL_SUPPLIER_VALIDATE' \|\| $action === 'BILL_SUPPLIER_DELETE' \|\| $action === 'BILL_SUPPLIER_SENTBYMAIL'
	81	+ \|\| $action === 'MEMBER_SUBSCRIPTION_CREATE' \|\| $action === 'MEMBER_SUBSCRIPTION_MODIFY' \|\| $action === 'MEMBER_SUBSCRIPTION_DELETE'
	82	+ \|\| $action === 'DON_VALIDATE' \|\| $action === 'DON_MODIFY' \|\| $action === 'DON_DELETE'
	83	+ \|\| $action === 'CASHCONTROL_VALIDATE'
	84	+ \|\| (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_DOWNLOAD') \|\| (in_array($object->element, array('facture', 'suplier_invoice')) && $action === 'DOC_PREVIEW')
85	85	)
86	86	{
87	87	$qualified++;
88	88
89	89	if (in_array($action, array(
90		- 'MEMBER_SUBSCRIPTION_CREATE','MEMBER_SUBSCRIPTION_MODIFY','MEMBER_SUBSCRIPTION_DELETE',
91		- 'DON_VALIDATE','DON_MODIFY','DON_DELETE'))) $amounts = (double) $object->amount;
	90	+ 'MEMBER_SUBSCRIPTION_CREATE', 'MEMBER_SUBSCRIPTION_MODIFY', 'MEMBER_SUBSCRIPTION_DELETE',
	91	+ 'DON_VALIDATE', 'DON_MODIFY', 'DON_DELETE'))) $amounts = (double) $object->amount;
92	92	elseif ($action == 'CASHCONTROL_VALIDATE')
93	93	{
94	94	$amounts = (double) $object->cash + (double) $object->cheque + (double) $object->card;
		@@ -106,13 +106,13 @@ discard block
		block discarded – undo
106	106	{
107	107	$qualified++;
108	108	$amounts = 0;
109		- if(!empty($object->amounts)) {
110		- foreach($object->amounts as $amount) {
	109	+ if (!empty($object->amounts)) {
	110	+ foreach ($object->amounts as $amount) {
111	111	$amounts += price2num($amount);
112	112	}
113	113	}
114	114	}
115		- elseif (strpos($action,'PAYMENT')!==false && ! in_array($action, array('PAYMENT_ADD_TO_BANK')))
	115	+ elseif (strpos($action, 'PAYMENT') !== false && !in_array($action, array('PAYMENT_ADD_TO_BANK')))
116	116	{
117	117	$qualified++;
118	118	$amounts = (double) $object->amount;
		@@ -120,12 +120,12 @@ discard block
		block discarded – undo
120	120
121	121	// Another protection.
122	122	// May be used when event is DOC_DOWNLOAD or DOC_PREVIEW and element is not an invoice
123		- if (! $qualified)
	123	+ if (!$qualified)
124	124	{
125	125	return 0; // not implemented action log
126	126	}
127	127
128		- $result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
	128	+ $result = $b->setObjectData($object, $action, $amounts, $user); // Set field date_object, ref_object, fk_object, element, object_data
129	129
130	130	if ($result < 0)
131	131	{

		@@ -45,7 +45,7 @@ discard block
		block discarded – undo
45	45	public $picto = 'email';
46	46
47	47	// @TODO Defined also into notify.class.php)
48		- public $listofmanagedevents=array(
	48	+ public $listofmanagedevents = array(
49	49	'BILL_VALIDATE',
50	50	'BILL_PAYED',
51	51	'ORDER_VALIDATE',
		@@ -76,12 +76,12 @@ discard block
		block discarded – undo
76	76	*/
77	77	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
78	78	{
79		- if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing
	79	+ if (empty($conf->notification->enabled)) return 0; // Module not active, we do nothing
80	80
81		- require_once DOL_DOCUMENT_ROOT .'/core/class/notify.class.php';
	81	+ require_once DOL_DOCUMENT_ROOT.'/core/class/notify.class.php';
82	82	$notify = new Notify($this->db);
83	83
84		- if (! in_array($action, $notify->arrayofnotifsupported)) return 0;
	84	+ if (!in_array($action, $notify->arrayofnotifsupported)) return 0;
85	85
86	86	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
87	87
		@@ -100,42 +100,42 @@ discard block
		block discarded – undo
100	100	{
101	101	global $conf;
102	102
103		- $ret=array();
	103	+ $ret = array();
104	104
105	105	$sql = "SELECT rowid, code, label, description, elementtype";
106		- $sql.= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
107		- $sql.= $this->db->order("rang, elementtype, code");
	106	+ $sql .= " FROM ".MAIN_DB_PREFIX."c_action_trigger";
	107	+ $sql .= $this->db->order("rang, elementtype, code");
108	108	dol_syslog("getListOfManagedEvents Get list of notifications", LOG_DEBUG);
109		- $resql=$this->db->query($sql);
	109	+ $resql = $this->db->query($sql);
110	110	if ($resql)
111	111	{
112		- $num=$this->db->num_rows($resql);
113		- $i=0;
	112	+ $num = $this->db->num_rows($resql);
	113	+ $i = 0;
114	114	while ($i < $num)
115	115	{
116		- $obj=$this->db->fetch_object($resql);
	116	+ $obj = $this->db->fetch_object($resql);
117	117
118		- $qualified=0;
	118	+ $qualified = 0;
119	119	// Check is this event is supported by notification module
120		- if (in_array($obj->code, $this->listofmanagedevents)) $qualified=1;
	120	+ if (in_array($obj->code, $this->listofmanagedevents)) $qualified = 1;
121	121	// Check if module for this event is active
122	122	if ($qualified)
123	123	{
124	124	//print 'xx'.$obj->code;
125		- $element=$obj->elementtype;
	125	+ $element = $obj->elementtype;
126	126
127	127	// Exclude events if related module is disabled
128		- if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
129		- elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified=0;
130		- elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified=0;
131		- elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified=0;
132		- elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified=0;
133		- elseif (! in_array($element,array('order_supplier','invoice_supplier','withdraw','shipping','member','expensereport')) && empty($conf->$element->enabled)) $qualified=0;
	128	+ if ($element == 'order_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
	129	+ elseif ($element == 'invoice_supplier' && empty($conf->fournisseur->enabled)) $qualified = 0;
	130	+ elseif ($element == 'withdraw' && empty($conf->prelevement->enabled)) $qualified = 0;
	131	+ elseif ($element == 'shipping' && empty($conf->expedition->enabled)) $qualified = 0;
	132	+ elseif ($element == 'member' && empty($conf->adherent->enabled)) $qualified = 0;
	133	+ elseif (!in_array($element, array('order_supplier', 'invoice_supplier', 'withdraw', 'shipping', 'member', 'expensereport')) && empty($conf->$element->enabled)) $qualified = 0;
134	134	}
135	135
136	136	if ($qualified)
137	137	{
138		- $ret[]=array('rowid'=>$obj->rowid,'code'=>$obj->code,'label'=>$obj->label,'description'=>$obj->description,'elementtype'=>$obj->elementtype);
	138	+ $ret[] = array('rowid'=>$obj->rowid, 'code'=>$obj->code, 'label'=>$obj->label, 'description'=>$obj->description, 'elementtype'=>$obj->elementtype);
139	139	}
140	140
141	141	$i++;

		@@ -111,7 +111,7 @@ discard block
		block discarded – undo
111	111
112	112	switch ($action) {
113	113	case 'TICKET_ASSIGNED':
114		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	114	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
115	115
116	116	if ($object->fk_user_assign > 0 && $object->fk_user_assign != $user->id)
117	117	{
		@@ -127,25 +127,25 @@ discard block
		block discarded – undo
127	127	$mimetype = array();
128	128
129	129	// Send email to assigned user
130		- $subject = '[' . $conf->global->MAIN_INFO_SOCIETE_NOM . '] ' . $langs->transnoentities('TicketAssignedToYou');
131		- $message = '<p>' . $langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname)) . "</p>";
132		- $message .= '<ul><li>' . $langs->trans('Title') . ' : ' . $object->subject . '</li>';
133		- $message .= '<li>' . $langs->trans('Type') . ' : ' . $object->type_label . '</li>';
134		- $message .= '<li>' . $langs->trans('Category') . ' : ' . $object->category_label . '</li>';
135		- $message .= '<li>' . $langs->trans('Severity') . ' : ' . $object->severity_label . '</li>';
	130	+ $subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketAssignedToYou');
	131	+ $message = '<p>'.$langs->transnoentities('TicketAssignedEmailBody', $object->track_id, dolGetFirstLastname($user->firstname, $user->lastname))."</p>";
	132	+ $message .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
	133	+ $message .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
	134	+ $message .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
	135	+ $message .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
136	136	// Extrafields
137	137	if (is_array($object->array_options) && count($object->array_options) > 0) {
138	138	foreach ($object->array_options as $key => $value) {
139		- $message .= '<li>' . $langs->trans($key) . ' : ' . $value . '</li>';
	139	+ $message .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
140	140	}
141	141	}
142	142
143	143	$message .= '</ul>';
144		- $message .= '<p>' . $langs->trans('Message') . ' : <br>' . $object->message . '</p>';
145		- $message .= '<p><a href="' . dol_buildpath('/ticket/card.php', 2) . '?track_id=' . $object->track_id . '">' . $langs->trans('SeeThisTicketIntomanagementInterface') . '</a></p>';
	144	+ $message .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
	145	+ $message .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
146	146
147	147	$sendto = $userstat->email;
148		- $from = dolGetFirstLastname($user->firstname, $user->lastname) . '<' . $user->email . '>';
	148	+ $from = dolGetFirstLastname($user->firstname, $user->lastname).'<'.$user->email.'>';
149	149
150	150	$message = dol_nl2br($message);
151	151
		@@ -153,7 +153,7 @@ discard block
		block discarded – undo
153	153	$old_MAIN_MAIL_AUTOCOPY_TO = $conf->global->MAIN_MAIL_AUTOCOPY_TO;
154	154	$conf->global->MAIN_MAIL_AUTOCOPY_TO = '';
155	155	}
156		- include_once DOL_DOCUMENT_ROOT . '/core/class/CMailFile.class.php';
	156	+ include_once DOL_DOCUMENT_ROOT.'/core/class/CMailFile.class.php';
157	157	$mailfile = new CMailFile($subject, $sendto, $from, $message, $filepath, $mimetype, $filename, '', '', 0, -1);
158	158	if ($mailfile->error) {
159	159	setEventMessages($mailfile->error, $mailfile->errors, 'errors');
		@@ -176,11 +176,11 @@ discard block
		block discarded – undo
176	176	break;
177	177
178	178	case 'TICKET_CREATE':
179		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	179	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
180	180
181	181	$langs->load('ticket');
182	182
183		- $object->fetch('', $object->track_id); // Should be useless
	183	+ $object->fetch('', $object->track_id); // Should be useless
184	184
185	185
186	186	// Send email to notification email
		@@ -198,27 +198,27 @@ discard block
		block discarded – undo
198	198
199	199	/* Send email to admin */
200	200	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectAdmin');
201		- $message_admin= $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
202		- $message_admin.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
203		- $message_admin.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
204		- $message_admin.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
205		- $message_admin.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
206		- $message_admin.='<li>'.$langs->trans('From').' : '.( $object->email_from ? $object->email_from : ( $object->fk_user_create > 0 ? $langs->trans('Internal') : '') ).'</li>';
	201	+ $message_admin = $langs->transnoentities('TicketNewEmailBodyAdmin', $object->track_id)."\n\n";
	202	+ $message_admin .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
	203	+ $message_admin .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
	204	+ $message_admin .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
	205	+ $message_admin .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
	206	+ $message_admin .= '<li>'.$langs->trans('From').' : '.($object->email_from ? $object->email_from : ($object->fk_user_create > 0 ? $langs->trans('Internal') : '')).'</li>';
207	207	// Extrafields
208	208	if (is_array($object->array_options) && count($object->array_options) > 0) {
209	209	foreach ($object->array_options as $key => $value) {
210		- $message_admin.='<li>'.$langs->trans($key).' : '.$value.'</li>';
	210	+ $message_admin .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
211	211	}
212	212	}
213		- $message_admin.='</ul>';
	213	+ $message_admin .= '</ul>';
214	214
215	215	if ($object->fk_soc > 0) {
216	216	$object->fetch_thirdparty();
217		- $message_admin.='<p>'.$langs->trans('Company'). ' : '.$object->thirdparty->name.'</p>';
	217	+ $message_admin .= '<p>'.$langs->trans('Company').' : '.$object->thirdparty->name.'</p>';
218	218	}
219	219
220		- $message_admin.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
221		- $message_admin.='<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
	220	+ $message_admin .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
	221	+ $message_admin .= '<p><a href="'.dol_buildpath('/ticket/card.php', 2).'?track_id='.$object->track_id.'">'.$langs->trans('SeeThisTicketIntomanagementInterface').'</a></p>';
222	222
223	223	$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
224	224	$replyto = $from;
		@@ -234,7 +234,7 @@ discard block
		block discarded – undo
234	234	if ($mailfile->error) {
235	235	dol_syslog($mailfile->error, LOG_DEBUG);
236	236	} else {
237		- $result=$mailfile->sendfile();
	237	+ $result = $mailfile->sendfile();
238	238	}
239	239	if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
240	240	$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
		@@ -261,11 +261,11 @@ discard block
		block discarded – undo
261	261	$mimetype = array();
262	262
263	263	$subject = '['.$conf->global->MAIN_INFO_SOCIETE_NOM.'] '.$langs->transnoentities('TicketNewEmailSubjectCustomer');
264		- $message_customer= $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
265		- $message_customer.='<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
266		- $message_customer.='<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
267		- $message_customer.='<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
268		- $message_customer.='<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
	264	+ $message_customer = $langs->transnoentities('TicketNewEmailBodyCustomer', $object->track_id)."\n\n";
	265	+ $message_customer .= '<ul><li>'.$langs->trans('Title').' : '.$object->subject.'</li>';
	266	+ $message_customer .= '<li>'.$langs->trans('Type').' : '.$object->type_label.'</li>';
	267	+ $message_customer .= '<li>'.$langs->trans('Category').' : '.$object->category_label.'</li>';
	268	+ $message_customer .= '<li>'.$langs->trans('Severity').' : '.$object->severity_label.'</li>';
269	269
270	270	// Extrafields
271	271	foreach ($this->attributes[$object->table_element]['label'] as $key => $value)
		@@ -285,14 +285,14 @@ discard block
		block discarded – undo
285	285	if (empty($enabled)) $qualified = false;
286	286	if (empty($perms)) $qualified = false;
287	287
288		- if ($qualified) $message_customer.='<li>'.$langs->trans($key).' : '.$value.'</li>';
	288	+ if ($qualified) $message_customer .= '<li>'.$langs->trans($key).' : '.$value.'</li>';
289	289	}
290	290
291		- $message_customer.='</ul>';
292		- $message_customer.='<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
293		- $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE?$conf->global->TICKET_URL_PUBLIC_INTERFACE.'/':dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
294		- $message_customer.='<p>' . $langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer') . ' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
295		- $message_customer.='<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
	291	+ $message_customer .= '</ul>';
	292	+ $message_customer .= '<p>'.$langs->trans('Message').' : <br>'.$object->message.'</p>';
	293	+ $url_public_ticket = ($conf->global->TICKET_URL_PUBLIC_INTERFACE ? $conf->global->TICKET_URL_PUBLIC_INTERFACE.'/' : dol_buildpath('/public/ticket/view.php', 2)).'?track_id='.$object->track_id;
	294	+ $message_customer .= '<p>'.$langs->trans('TicketNewEmailBodyInfosTrackUrlCustomer').' : <a href="'.$url_public_ticket.'">'.$url_public_ticket.'</a></p>';
	295	+ $message_customer .= '<p>'.$langs->trans('TicketEmailPleaseDoNotReplyToThisEmail').'</p>';
296	296
297	297	$from = $conf->global->MAIN_INFO_SOCIETE_NOM.'<'.$conf->global->TICKET_NOTIFICATION_EMAIL_FROM.'>';
298	298	$replyto = $from;
		@@ -308,7 +308,7 @@ discard block
		block discarded – undo
308	308	if ($mailfile->error) {
309	309	dol_syslog($mailfile->error, LOG_DEBUG);
310	310	} else {
311		- $result=$mailfile->sendfile();
	311	+ $result = $mailfile->sendfile();
312	312	}
313	313	if (!empty($conf->global->TICKET_DISABLE_MAIL_AUTOCOPY_TO)) {
314	314	$conf->global->MAIN_MAIL_AUTOCOPY_TO = $old_MAIN_MAIL_AUTOCOPY_TO;
		@@ -319,19 +319,19 @@ discard block
		block discarded – undo
319	319	break;
320	320
321	321	case 'TICKET_DELETE':
322		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	322	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
323	323	break;
324	324
325	325	case 'TICKET_MODIFY':
326		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	326	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
327	327	break;
328	328
329	329	case 'TICKET_MARK_READ':
330		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	330	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
331	331	break;
332	332
333	333	case 'TICKET_CLOSE':
334		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	334	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
335	335	break;
336	336	}
337	337

		@@ -56,7 +56,7 @@ discard block
		block discarded – undo
56	56	*/
57	57	public function runTrigger($action, $object, User $user, Translate $langs, Conf $conf)
58	58	{
59		- if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
	59	+ if (empty($conf->mailmanspip->enabled)) return 0; // Module not active, we do nothing
60	60
61	61	require_once DOL_DOCUMENT_ROOT."/mailmanspip/class/mailmanspip.class.php";
62	62	require_once DOL_DOCUMENT_ROOT."/user/class/usergroup.class.php";
		@@ -68,13 +68,13 @@ discard block
		block discarded – undo
68	68	// We add subscription if we change category (new category may means more mailing-list to subscribe)
69	69	if (is_object($object->context['linkto']) && method_exists($object->context['linkto'], 'add_to_abo') && $object->context['linkto']->add_to_abo() < 0)
70	70	{
71		- $this->error=$object->context['linkto']->error;
72		- $this->errors=$object->context['linkto']->errors;
73		- $return=-1;
	71	+ $this->error = $object->context['linkto']->error;
	72	+ $this->errors = $object->context['linkto']->errors;
	73	+ $return = -1;
74	74	}
75	75	else
76	76	{
77		- $return=1;
	77	+ $return = 1;
78	78	}
79	79
80	80	return $return;
		@@ -86,13 +86,13 @@ discard block
		block discarded – undo
86	86	// We remove subscription if we change category (lessw category may means less mailing-list to subscribe)
87	87	if (is_object($object->context['unlinkoff']) && method_exists($object->context['unlinkoff'], 'del_to_abo') && $object->context['unlinkoff']->del_to_abo() < 0)
88	88	{
89		- $this->error=$object->context['unlinkoff']->error;
90		- $this->errors=$object->context['unlinkoff']->errors;
91		- $return=-1;
	89	+ $this->error = $object->context['unlinkoff']->error;
	90	+ $this->errors = $object->context['unlinkoff']->errors;
	91	+ $return = -1;
92	92	}
93	93	else
94	94	{
95		- $return=1;
	95	+ $return = 1;
96	96	}
97	97
98	98	return $return;
		@@ -103,7 +103,7 @@ discard block
		block discarded – undo
103	103	{
104	104	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
105	105
106		- $return=0;
	106	+ $return = 0;
107	107	// Add user into some linked tools (mailman, spip, etc...)
108	108	if (($object->oldcopy->email != $object->email) \|\| ($object->oldcopy->typeid != $object->typeid)) // TODO Do del/add also if type change
109	109	{
		@@ -111,25 +111,25 @@ discard block
		block discarded – undo
111	111	{
112	112	if ($object->oldcopy->del_to_abo() < 0)
113	113	{
114		- if (! empty($object->oldcopy->error)) $this->error=$object->oldcopy->error;
115		- $this->errors=$object->oldcopy->errors;
116		- $return=-1;
	114	+ if (!empty($object->oldcopy->error)) $this->error = $object->oldcopy->error;
	115	+ $this->errors = $object->oldcopy->errors;
	116	+ $return = -1;
117	117	}
118	118	else
119	119	{
120		- $return=1;
	120	+ $return = 1;
121	121	}
122	122	}
123	123	// We add subscription if new email or new type (new type may means more mailing-list to subscribe)
124	124	if ($object->add_to_abo() < 0)
125	125	{
126		- if (! empty($object->error)) $this->error=$object->error;
127		- $this->errors=$object->errors;
128		- $return=-1;
	126	+ if (!empty($object->error)) $this->error = $object->error;
	127	+ $this->errors = $object->errors;
	128	+ $return = -1;
129	129	}
130	130	else
131	131	{
132		- $return=1;
	132	+ $return = 1;
133	133	}
134	134	}
135	135
		@@ -139,17 +139,17 @@ discard block
		block discarded – undo
139	139	{
140	140	dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
141	141
142		- $return=0;
	142	+ $return = 0;
143	143	// Remove from external tools (mailman, spip, etc...)
144	144	if ($object->del_to_abo() < 0)
145	145	{
146		- if (! empty($object->error)) $this->error=$object->error;
147		- $this->errors=$object->errors;
148		- $return=-1;
	146	+ if (!empty($object->error)) $this->error = $object->error;
	147	+ $this->errors = $object->errors;
	148	+ $return = -1;
149	149	}
150	150	else
151	151	{
152		- $return=1;
	152	+ $return = 1;
153	153	}
154	154
155	155	return $return;

		@@ -119,7 +119,7 @@ discard block
		block discarded – undo
119	119	global $langs, $db, $conf;
120	120
121	121	// Load translation files required by the page
122		- $langs->loadLangs(array("members","other","users","mails"));
	122	+ $langs->loadLangs(array("members", "other", "users", "mails"));
123	123
124	124	require_once DOL_DOCUMENT_ROOT.'/stripe/class/stripe.class.php';
125	125	$stripe = new Stripe($db);
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130
131	131	$service = 'StripeTest';
132	132	$servicestatus = 0;
133		- if (! empty($conf->global->STRIPE_LIVE) && ! GETPOST('forcesandbox', 'alpha'))
	133	+ if (!empty($conf->global->STRIPE_LIVE) && !GETPOST('forcesandbox', 'alpha'))
134	134	{
135	135	$service = 'StripeLive';
136	136	$servicestatus = 1;
		@@ -138,12 +138,12 @@ discard block
		block discarded – undo
138	138
139	139	// If customer is linked to Stripe, we update/delete Stripe too
140	140	if ($action == 'COMPANY_MODIFY') {
141		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	141	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
142	142
143		- $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
	143	+ $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
144	144
145	145	if ($object->client != 0) {
146		- $customer = $stripe->customerStripe($object, $stripeacc, $servicestatus); // This make a network request
	146	+ $customer = $stripe->customerStripe($object, $stripeacc, $servicestatus); // This make a network request
147	147	if ($customer)
148	148	{
149	149	$namecleaned = $object->name ? $object->name : null;
		@@ -155,22 +155,22 @@ discard block
		block discarded – undo
155	155	$taxinfo["tax_id"] = $vatcleaned;
156	156	}
157	157	// We force data to "null" if not defined as expected by Stripe
158		- if (empty($vatcleaned)) $taxinfo=null;
	158	+ if (empty($vatcleaned)) $taxinfo = null;
159	159
160	160	// Detect if we change a Stripe info (email, description, vat id)
161	161	$changerequested = 0;
162		- if (! empty($object->email) && $object->email != $customer->email) $changerequested++;
	162	+ if (!empty($object->email) && $object->email != $customer->email) $changerequested++;
163	163	if ($namecleaned != $customer->description) $changerequested++;
164		- if (! isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned)) $changerequested++;
	164	+ if (!isset($customer->tax_info['tax_id']) && !is_null($vatcleaned)) $changerequested++;
165	165	elseif (isset($customer->tax_info['tax_id']) && is_null($vatcleaned)) $changerequested++;
166		- elseif (isset($customer->tax_info['tax_id']) && ! is_null($vatcleaned))
	166	+ elseif (isset($customer->tax_info['tax_id']) && !is_null($vatcleaned))
167	167	{
168	168	if ($vatcleaned != $customer->tax_info['tax_id']) $changerequested++;
169	169	}
170	170
171	171	if ($changerequested)
172	172	{
173		- if (! empty($object->email)) $customer->email = $object->email;
	173	+ if (!empty($object->email)) $customer->email = $object->email;
174	174	$customer->description = $namecleaned;
175	175	if (empty($taxinfo)) $customer->tax_info = array('type'=>'vat', 'tax_id'=>null);
176	176	else $customer->tax_info = $taxinfo;
		@@ -181,9 +181,9 @@ discard block
		block discarded – undo
181	181	}
182	182	}
183	183	if ($action == 'COMPANY_DELETE') {
184		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	184	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
185	185
186		- $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
	186	+ $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
187	187
188	188	$customer = $stripe->customerStripe($object, $stripeacc, $servicestatus);
189	189	if ($customer)
		@@ -192,7 +192,7 @@ discard block
		block discarded – undo
192	192	}
193	193
194	194	$sql = "DELETE FROM ".MAIN_DB_PREFIX."societe_account";
195		- $sql.= " WHERE site='stripe' AND fk_soc = " . $object->id;
	195	+ $sql .= " WHERE site='stripe' AND fk_soc = ".$object->id;
196	196	$this->db->query($sql);
197	197	}
198	198
		@@ -202,12 +202,12 @@ discard block
		block discarded – undo
202	202	// For creation of credit card, we do not create in Stripe automatically
203	203	}
204	204	if ($action == 'COMPANYPAYMENTMODE_MODIFY' && $object->type == 'card') {
205		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	205	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
206	206
207		- if (! empty($object->stripe_card_ref))
	207	+ if (!empty($object->stripe_card_ref))
208	208	{
209		- $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
210		- $stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
	209	+ $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
	210	+ $stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
211	211
212	212	if ($stripecu)
213	213	{
		@@ -222,11 +222,11 @@ discard block
		block discarded – undo
222	222	{
223	223	$card = $stripe->cardStripe($customer, $object, $stripeacc, $servicestatus);
224	224	if ($card) {
225		- $card->metadata=array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR'])?'':$_SERVER['REMOTE_ADDR']));
	225	+ $card->metadata = array('dol_id'=>$object->id, 'dol_version'=>DOL_VERSION, 'dol_entity'=>$conf->entity, 'ipaddress'=>(empty($_SERVER['REMOTE_ADDR']) ? '' : $_SERVER['REMOTE_ADDR']));
226	226	try {
227	227	$card->save($dataforcard);
228	228	}
229		- catch(Exception $e)
	229	+ catch (Exception $e)
230	230	{
231	231	$ok = -1;
232	232	$this->error = $e->getMessages();
		@@ -237,12 +237,12 @@ discard block
		block discarded – undo
237	237	}
238	238	}
239	239	if ($action == 'COMPANYPAYMENTMODE_DELETE' && $object->type == 'card') {
240		- dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
	240	+ dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
241	241
242		- if (! empty($object->stripe_card_ref))
	242	+ if (!empty($object->stripe_card_ref))
243	243	{
244		- $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
245		- $stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
	244	+ $stripeacc = $stripe->getStripeAccount($service); // No need of network access for this. May return '' if no Oauth defined.
	245	+ $stripecu = $stripe->getStripeCustomerAccount($object->fk_soc); // No need of network access for this
246	246
247	247	if ($stripecu)
248	248	{

		@@ -74,7 +74,7 @@ discard block
		block discarded – undo
74	74	$arraycontext = array($arraycontext);
75	75	}
76	76
77		- $this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
	77	+ $this->contextarray = array_unique(array_merge($arraycontext, $this->contextarray)); // All contexts are concatenated
78	78
79	79	foreach (Globals::$conf->modules_parts['hooks'] as $module => $hooks) { // Loop on each module that brings hooks
80	80	if (empty(Globals::$conf->$module->enabled)) {
		@@ -84,20 +84,20 @@ discard block
		block discarded – undo
84	84	//dol_syslog(get_class($this).'::initHooks module='.$module.' arraycontext='.join(',',$arraycontext));
85	85	foreach ($arraycontext as $context) {
86	86	if (is_array($hooks)) {
87		- $arrayhooks = $hooks; // New system
	87	+ $arrayhooks = $hooks; // New system
88	88	} else {
89		- $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
	89	+ $arrayhooks = explode(':', $hooks); // Old system (for backward compatibility)
90	90	}
91	91	if (in_array($context, $arrayhooks) \|\| in_array('all', $arrayhooks)) { // We instantiate action class only if initialized hook is handled by module
92	92	// Include actions class overwriting hooks
93	93	if (!is_object($this->hooks[$context][$module])) { // If set, class was already loaded
94		- $path = '/' . $module . '/class/';
95		- $actionfile = 'actions_' . $module . '.class.php';
	94	+ $path = '/'.$module.'/class/';
	95	+ $actionfile = 'actions_'.$module.'.class.php';
96	96
97		- dol_syslog(get_class($this) . '::initHooks Loading hook class for context ' . $context . ": " . $actionfile, LOG_INFO);
98		- $resaction = dol_include_once($path . $actionfile);
	97	+ dol_syslog(get_class($this).'::initHooks Loading hook class for context '.$context.": ".$actionfile, LOG_INFO);
	98	+ $resaction = dol_include_once($path.$actionfile);
99	99	if ($resaction) {
100		- $controlclassname = 'Actions' . ucfirst($module);
	100	+ $controlclassname = 'Actions'.ucfirst($module);
101	101	$actionInstance = new $controlclassname($this->db);
102	102	$this->hooks[$context][$module] = $actionInstance;
103	103	}
		@@ -220,7 +220,7 @@ discard block
		block discarded – undo
220	220	$actionclassinstance->error = 0;
221	221	$actionclassinstance->errors = array();
222	222
223		- dol_syslog(get_class($this) . "::executeHooks Qualified hook found (hooktype=" . $hooktype . "). We call method " . $method . " of class " . get_class($actionclassinstance) . ", module=" . $module . ", action=" . $action . " context=" . $context, LOG_DEBUG);
	223	+ dol_syslog(get_class($this)."::executeHooks Qualified hook found (hooktype=".$hooktype."). We call method ".$method." of class ".get_class($actionclassinstance).", module=".$module.", action=".$action." context=".$context, LOG_DEBUG);
224	224
225	225	// Add current context to avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
226	226	$parameters['currentcontext'] = $context;
		@@ -231,7 +231,7 @@ discard block
		block discarded – undo
231	231	$error++;
232	232	$this->error = $actionclassinstance->error;
233	233	$this->errors = array_merge($this->errors, (array) $actionclassinstance->errors);
234		- dol_syslog("Error on hook module=" . $module . ", method " . $method . ", class " . get_class($actionclassinstance) . ", hooktype=" . $hooktype . (empty($this->error) ? '' : " " . $this->error) . (empty($this->errors) ? '' : " " . join(",", $this->errors)), LOG_ERR);
	234	+ dol_syslog("Error on hook module=".$module.", method ".$method.", class ".get_class($actionclassinstance).", hooktype=".$hooktype.(empty($this->error) ? '' : " ".$this->error).(empty($this->errors) ? '' : " ".join(",", $this->errors)), LOG_ERR);
235	235	}
236	236
237	237	if (isset($actionclassinstance->results) && is_array($actionclassinstance->results))
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254	$this->resPrint .= $actionclassinstance->resprints;
255	255	// TODO dead code to remove (do not enable this, but fix hook instead): result must not be a string but an int. you must use $actionclassinstance->resprints to return a string
256	256	if (!is_array($resaction) && !is_numeric($resaction)) {
257		- dol_syslog('Error: Bug into hook ' . $method . ' of module class ' . get_class($actionclassinstance) . '. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
	257	+ dol_syslog('Error: Bug into hook '.$method.' of module class '.get_class($actionclassinstance).'. Method must not return a string but an int (0=OK, 1=Replace, -1=KO) and set string into ->resprints', LOG_ERR);
258	258	if (empty($actionclassinstance->resprints)) {
259	259	$this->resPrint .= $resaction;
260	260	$resaction = 0;

alxarafe / alixar

Push — master ( 65bdac...4e88da )

Status

Category

Spacing +299 added lines, -299 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +42 added lines, -42 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +23 added lines, -23 removed lines patch added patch discarded remove patch

Spacing +97 added lines, -97 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +204 added lines, -204 removed lines patch added patch discarded remove patch