Dolibarr / dolibarr

htdocs/ticket/agenda.php

Braces +3 added lines, -1 removed lines

@@ -61,7 +61,9 @@
 
 // Security check
 $id = GETPOST("id", 'int');
-if ($user->socid > 0) $socid = $user->socid;
+if ($user->socid > 0) {
+	$socid = $user->socid;
+}
 $result = restrictedArea($user, 'ticket', $object->id, '');
 
 // restrict access for externals users

Spacing +1 added lines, -1 removed lines

@@ -269,7 +269,7 @@
 	$cachekey = 'count_events_ticket_'.$object->id;
 	$nbEvent = dol_getcache($cachekey);
 
-	$titlelist = $langs->trans("ActionsOnTicket").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>': '');
+	$titlelist = $langs->trans("ActionsOnTicket").(is_numeric($nbEvent) ? '<span class="opacitymedium colorblack paddingleft">('.$nbEvent.')</span>' : '');
 
 	print_barre_liste($titlelist, 0, $_SERVER["PHP_SELF"], '', $sortfield, $sortorder, '', 0, -1, '', 0, $morehtmlright, '', 0, 1, 0);
 

htdocs/comm/remx.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
  *		\brief      Page to edit absolute discounts for a customer
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 require '../main.inc.php';
@@ -330,7 +330,7 @@ 
 	print '</table>';
 	print '</div>';
 
-	print '</div>';	// close fichecenter
+	print '</div>'; // close fichecenter
 
 	print dol_get_fiche_end();
 

Braces +4 added lines, -1 removed lines

@@ -24,7 +24,10 @@
  *		\brief      Page to edit absolute discounts for a customer
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (! defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1');
+}
+// Force use of CSRF protection with tokens even for GET
 
 // Load Dolibarr environment
 require '../main.inc.php';

htdocs/comm/action/class/actioncomm.class.php

Braces +15 added lines, -5 removed lines

@@ -1237,7 +1237,9 @@ 
 					if (!is_array($val)) {	// For backward compatibility when val=id
 						$val = array('id'=>$val);
 					}
-					if (!empty($already_inserted[$val['id']])) continue;
+					if (!empty($already_inserted[$val['id']])) {
+						continue;
+					}
 
 					$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 					$sql .= " VALUES(".((int) $this->id).", 'user', ".((int) $val['id']).", ".(empty($val['mandatory']) ? '0' : ((int) $val['mandatory'])).", ".(empty($val['transparency']) ? '0' : ((int) $val['transparency'])).", ".(empty($val['answer_status']) ? '0' : ((int) $val['answer_status'])).")";
@@ -1263,7 +1265,9 @@ 
 						if (!is_array($val)) {	// For backward compatibility when val=id
 							$val = array('id'=>$val);
 						}
-						if (!empty($already_inserted[$val['id']])) continue;
+						if (!empty($already_inserted[$val['id']])) {
+							continue;
+						}
 
 						$sql = "INSERT INTO ".MAIN_DB_PREFIX."actioncomm_resources(fk_actioncomm, element_type, fk_element, mandatory, transparency, answer_status)";
 						$sql .= " VALUES(".((int) $this->id).", 'socpeople', ".((int) $val['id']).", 0, 0, 0)";
@@ -1334,7 +1338,9 @@ 
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
 		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 		if (!empty($socid)) {
 			$sql .= " AND a.fk_soc = ".((int) $socid);
@@ -1356,7 +1362,9 @@ 
 		// Fields where hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
 		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		if (!empty($hookmanager->resPrint)) {
+			$sql.= $hookmanager->resPrint;
+		}
 		if ($sortorder && $sortfield) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
@@ -2553,7 +2561,9 @@ 
 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
 		$sql .= " SET percent = ".(int) $percent;
-		if ($usermodid > 0) $sql .= ", fk_user_mod = ".$usermodid;
+		if ($usermodid > 0) {
+			$sql .= ", fk_user_mod = ".$usermodid;
+		}
 		$sql .= " WHERE id = ".((int) $id);
 
 		if ($this->db->query($sql)) {

Spacing +26 added lines, -26 removed lines

@@ -377,9 +377,9 @@ 
 	/**
 	 * Properties to manage the recurring events
 	 */
-	public $recurid;		/* A string YYYYMMDDHHMMSS shared by allevent of same serie */
-	public $recurrule;		/* Rule of recurring */
-	public $recurdateend;	/* Repeat until this date */
+	public $recurid; /* A string YYYYMMDDHHMMSS shared by allevent of same serie */
+	public $recurrule; /* Rule of recurring */
+	public $recurdateend; /* Repeat until this date */
 
 	public $calling_duration;
 
@@ -559,8 +559,8 @@ 
 		$sql .= "ip";
 		$sql .= ") VALUES (";
 		$sql .= "'(PROV)', ";
-		$sql .= "'".$this->db->idate($now)."', ";	// date creation
-		$sql .= "'".$this->db->idate($this->datep)."', ";	// date start event
+		$sql .= "'".$this->db->idate($now)."', "; // date creation
+		$sql .= "'".$this->db->idate($this->datep)."', "; // date start event
 		$sql .= (strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : "null").", ";
 		$sql .= ((isset($this->durationp) && $this->durationp >= 0 && $this->durationp != '') ? "'".$this->db->escape($this->durationp)."'" : "null").", "; // deprecated
 		$sql .= (isset($this->type_id) ? $this->type_id : "null").",";
@@ -633,7 +633,7 @@ 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$error++;
-							dol_syslog('Error to process userassigned: ' . $this->db->lasterror(), LOG_ERR);
+							dol_syslog('Error to process userassigned: '.$this->db->lasterror(), LOG_ERR);
 							$this->errors[] = $this->db->lasterror();
 						} else {
 							$already_inserted[$val['id']] = true;
@@ -658,7 +658,7 @@ 
 						$resql = $this->db->query($sql);
 						if (!$resql) {
 							$error++;
-							dol_syslog('Error to process socpeopleassigned: ' . $this->db->lasterror(), LOG_ERR);
+							dol_syslog('Error to process socpeopleassigned: '.$this->db->lasterror(), LOG_ERR);
 							$this->errors[] = $this->db->lasterror();
 						} else {
 							$already_inserted[$id] = true;
@@ -893,14 +893,14 @@ 
 				$this->status = $obj->status;
 
 				//email information
-				$this->email_msgid=$obj->email_msgid;
-				$this->email_from=$obj->email_from;
-				$this->email_sender=$obj->email_sender;
-				$this->email_to=$obj->email_to;
-				$this->email_tocc=$obj->email_tocc;
-				$this->email_tobcc=$obj->email_tobcc;
-				$this->email_subject=$obj->email_subject;
-				$this->errors_to=$obj->errors_to;
+				$this->email_msgid = $obj->email_msgid;
+				$this->email_from = $obj->email_from;
+				$this->email_sender = $obj->email_sender;
+				$this->email_to = $obj->email_to;
+				$this->email_tocc = $obj->email_tocc;
+				$this->email_tobcc = $obj->email_tobcc;
+				$this->email_subject = $obj->email_subject;
+				$this->errors_to = $obj->errors_to;
 
 				$this->fetch_optionals();
 
@@ -1182,7 +1182,7 @@ 
 		$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm";
 		$sql .= " SET percent = '".$this->db->escape($this->percentage)."'";
 		$sql .= ", fk_action = ".(int) $this->type_id;
-		$sql .= ", code = " . ($code ? "'".$this->db->escape($code)."'" : "null");
+		$sql .= ", code = ".($code ? "'".$this->db->escape($code)."'" : "null");
 		$sql .= ", label = ".($this->label ? "'".$this->db->escape($this->label)."'" : "null");
 		$sql .= ", datep = ".(strval($this->datep) != '' ? "'".$this->db->idate($this->datep)."'" : 'null');
 		$sql .= ", datep2 = ".(strval($this->datef) != '' ? "'".$this->db->idate($this->datef)."'" : 'null');
@@ -1335,8 +1335,8 @@ 
 		$sql .= " FROM ".MAIN_DB_PREFIX."actioncomm as a";
 		// Fields from hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
-		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		$reshook = $hookmanager->executeHooks('getActionsListFrom', $parameters); // Note that $action and $object may have been modified by hook
+		if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
 		$sql .= " WHERE a.entity IN (".getEntity('agenda').")";
 		if (!empty($socid)) {
 			$sql .= " AND a.fk_soc = ".((int) $socid);
@@ -1357,8 +1357,8 @@ 
 		}
 		// Fields where hook
 		$parameters = array('sql' => &$sql, 'socid' => $socid, 'fk_element' => $fk_element, 'elementtype' => $elementtype);
-		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters);    // Note that $action and $object may have been modified by hook
-		if (!empty($hookmanager->resPrint)) $sql.= $hookmanager->resPrint;
+		$reshook = $hookmanager->executeHooks('getActionsListWhere', $parameters); // Note that $action and $object may have been modified by hook
+		if (!empty($hookmanager->resPrint)) $sql .= $hookmanager->resPrint;
 		if ($sortorder && $sortfield) {
 			$sql .= $this->db->order($sortfield, $sortorder);
 		}
@@ -1635,9 +1635,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (isModEnabled('categorie') && !$nofetch) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_ACTIONCOMM, 1);
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_ACTIONCOMM, 1);
 		}
 
 		return $datas;
@@ -1729,8 +1729,8 @@ 
 		}
 		if (!empty($this->note_private)) {
 			$tooltip .= '<br><br><b>'.$langs->trans('Description').':</b><br>';
-			$texttoshow = dolGetFirstLineOfText($this->note_private, 8);	// Try to limit length of content
-			$tooltip .= '<div class="tenlinesmax">';						// Restrict height of content into the tooltip
+			$texttoshow = dolGetFirstLineOfText($this->note_private, 8); // Try to limit length of content
+			$tooltip .= '<div class="tenlinesmax">'; // Restrict height of content into the tooltip
 			$tooltip .= (dol_textishtml($texttoshow) ? str_replace(array("\r", "\n"), "", $texttoshow) : str_replace(array("\r", "\n"), '<br>', $texttoshow));
 			$tooltip .= '</div>';
 		}
@@ -1755,7 +1755,7 @@ 
 				$label = $langs->trans("ShowAction");
 				$linkclose .= ' alt="'.dol_escape_htmltag($tooltip, 1).'"';
 			}
-			$linkclose .= ($tooltip ? ' title="'.dol_escape_htmltag($tooltip, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($tooltip ? ' title="'.dol_escape_htmltag($tooltip, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classname.' '.$classfortooltip.'"';
 		} else {
 			$linkclose .= ' class="'.$classname.'"';
@@ -2372,7 +2372,7 @@ 
 	 */
 	public static function replaceProduct(DoliDB $dbs, $origin_id, $dest_id)
 	{
-		$sql = 'UPDATE ' . MAIN_DB_PREFIX . 'actioncomm SET fk_element = ' . ((int) $dest_id) . ' WHERE elementtype="product" AND fk_element = '.((int) $origin_id);
+		$sql = 'UPDATE '.MAIN_DB_PREFIX.'actioncomm SET fk_element = '.((int) $dest_id).' WHERE elementtype="product" AND fk_element = '.((int) $origin_id);
 		// using $dbs, not $this->db because function is static
 		if (!$dbs->query($sql)) {
 			//$this->errors = $dbs->lasterror();

htdocs/comm/action/class/cactioncomm.class.php

Spacing +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 							}
 						}
 						// For the case type is not 'system...' neither 'module', we just check module is on
-						if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
+						if (!in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
 							$tmpmodule = $obj->module;
 							//var_dump($tmpmodule);
 							if ($tmpmodule && isset($conf->$tmpmodule) && isModEnabled($tmpmodule)) {

htdocs/comm/mailing/class/advtargetemailing.class.php

Spacing +2 added lines, -2 removed lines

@@ -125,7 +125,7 @@ 
 		$customerStatic->loadCacheOfProspStatus();
 		if (!empty($customerStatic->cacheprospectstatus)) {
 			foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) {
-				$this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label'];
+				$this->type_statuscommprospect[$dataProspectSt['id']] = $dataProspectSt['label'];
 			}
 		} else {
 			$this->type_statuscommprospect = array(
@@ -628,7 +628,7 @@ 
 						}
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
 						if ($arrayquery['options_'.$key] > 0) {
-							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
+							$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
 						}
 					} else {
 						if (is_array($arrayquery['options_'.$key])) {

htdocs/intracommreport/class/intracommreport.class.php

Spacing +2 added lines, -2 removed lines

@@ -56,7 +56,7 @@ 
 	public $picto = 'intracommreport';
 
 
-	public $label; 		// ref ???
+	public $label; // ref ???
 
 	public $period;
 
@@ -67,7 +67,7 @@ 
 	 */
 	public $declaration_number;
 
-	public $type_declaration;		// deb or des
+	public $type_declaration; // deb or des
 
 
 	/**

htdocs/don/payment/payment.php

Spacing +1 added lines, -1 removed lines

@@ -95,7 +95,7 @@
 			// Create a line of payments
 			$payment = new PaymentDonation($db);
 			$payment->chid         = $chid;
-			$payment->datep     = $datepaid;
+			$payment->datep = $datepaid;
 			$payment->amounts      = $amounts; // Tableau de montant
 			$payment->paymenttype  = GETPOST("paymenttype", 'int');
 			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');

htdocs/don/document.php

Spacing +1 added lines, -1 removed lines

@@ -81,7 +81,7 @@
 }
 $result = restrictedArea($user, 'don', $object->id);
 
-$permissiontoadd = $user->rights->don->creer;	// Used by the include of actions_dellink.inc.php
+$permissiontoadd = $user->rights->don->creer; // Used by the include of actions_dellink.inc.php
 
 
 /*

htdocs/don/class/paymentdonation.class.php

Spacing +5 added lines, -5 removed lines

@@ -64,8 +64,8 @@ 
 
 	public $amounts = array(); // Array of amounts
 
-	public $fk_typepayment;	// Payment mode ID
-	public $paymenttype;	// Payment mode ID or Code. TODO Use only the code in this field.
+	public $fk_typepayment; // Payment mode ID
+	public $paymenttype; // Payment mode ID or Code. TODO Use only the code in this field.
 
 	public $num_payment;
 
@@ -269,8 +269,8 @@ 
 				$this->tms            = $this->db->jdate($obj->tms);
 				$this->datep		  = $this->db->jdate($obj->datep);
 				$this->amount         = $obj->amount;
-				$this->fk_typepayment = $obj->fk_typepayment;	// Id on type of payent
-				$this->paymenttype    = $obj->fk_typepayment;	// Id on type of payment. We should store the code into paymenttype.
+				$this->fk_typepayment = $obj->fk_typepayment; // Id on type of payent
+				$this->paymenttype    = $obj->fk_typepayment; // Id on type of payment. We should store the code into paymenttype.
 				$this->num_payment    = $obj->num_payment;
 				$this->note_public    = $obj->note_public;
 				$this->fk_bank        = $obj->fk_bank;
@@ -688,7 +688,7 @@ 
 		}
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {