Completed
Branch develop (3700b0)
by
unknown
19:07
created
htdocs/salaries/admin/salaries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@
 block discarded – undo
263 263
 echo '<div>';
264 264
 echo '<table class="noborder centpercent">';
265 265
 echo '<thead>';
266
-echo '<tr class="liste_titre"><th>' . $langs->trans('Parameter') . '</th><th>' . $langs->trans('Value') . '</th></tr>';
266
+echo '<tr class="liste_titre"><th>'.$langs->trans('Parameter').'</th><th>'.$langs->trans('Value').'</th></tr>';
267 267
 echo '</thead>';
268 268
 echo '<tbody>';
269 269
 
Please login to merge, or discard this patch.
htdocs/core/boxes/box_members_subscriptions_by_year.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  *	\brief      Module to show box of members
25 25
  */
26 26
 
27
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
27
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
28 28
 
29 29
 
30 30
 /**
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 
84 84
 		$this->max = $max;
85 85
 
86
-		include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
87
-		require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php';
86
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
87
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
88 88
 		$memberstatic = new Adherent($this->db);
89 89
 		$statictype = new AdherentType($this->db);
90 90
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 			$numb = 0;
101 101
 
102 102
 			$sql = "SELECT c.subscription, c.dateadh as dateh";
103
-			$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d, " . MAIN_DB_PREFIX . "subscription as c";
104
-			$sql .= " WHERE d.entity IN (" . getEntity('adherent') . ")";
103
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
104
+			$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
105 105
 			$sql .= " AND d.rowid = c.fk_adherent";
106 106
 
107 107
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 				$this->info_box_contents[0][0] = array(
217 217
 					'td' => '',
218 218
 					'maxlength' => 500,
219
-					'text' => ($this->db->error() . ' sql=' . $sql),
219
+					'text' => ($this->db->error().' sql='.$sql),
220 220
 				);
221 221
 			}
222 222
 		} else {
Please login to merge, or discard this patch.
htdocs/core/boxes/box_accountancy_last_manual_entries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 				while ($line < $num) {
101 101
 					$objp		= $this->db->fetch_object($result);
102 102
 					$date		= $this->db->jdate($objp->date_movement);
103
-					$journal	= $objp->code_journal;
103
+					$journal = $objp->code_journal;
104 104
 					$label = $objp->label_operation;
105 105
 					$amount = $objp->amount;
106 106
 
Please login to merge, or discard this patch.
htdocs/product/stock/productlot_list.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,9 @@
 block discarded – undo
110 110
 	accessforbidden();
111 111
 }
112 112
 //$result = restrictedArea($user, 'productbatch');
113
-if (!$permissiontoread) accessforbidden();
113
+if (!$permissiontoread) {
114
+	accessforbidden();
115
+}
114 116
 
115 117
 
116 118
 /*
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -507,7 +507,7 @@
 block discarded – undo
507 507
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
508 508
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
509 509
 	}
510
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
510
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
511 511
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
512 512
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
513 513
 		$totalarray['nbfield']++;
Please login to merge, or discard this patch.
htdocs/hrm/establishment/card.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 			$object->town = GETPOST('town', 'alpha');
85 85
 			$object->country_id = GETPOST("country_id", 'int');
86 86
 			$object->status = GETPOST('status', 'int');
87
-			$object->fk_user_author	= $user->id;
87
+			$object->fk_user_author = $user->id;
88 88
 			$object->datec = dol_now();
89 89
 			$object->entity = GETPOST('entity', 'int') > 0 ?GETPOST('entity', 'int') : $conf->entity;
90 90
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -2 removed lines patch added patch discarded remove patch
@@ -46,8 +46,12 @@
 block discarded – undo
46 46
 //if ($user->socid > 0) $socid = $user->socid;
47 47
 //$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
48 48
 //restrictedArea($user, $object->element, $object->id, '', '', 'fk_soc', 'rowid', 0);
49
-if (!isModEnabled('hrm')) accessforbidden();
50
-if (empty($permissiontoread)) accessforbidden();
49
+if (!isModEnabled('hrm')) {
50
+	accessforbidden();
51
+}
52
+if (empty($permissiontoread)) {
53
+	accessforbidden();
54
+}
51 55
 
52 56
 
53 57
 /*
Please login to merge, or discard this patch.
htdocs/product/class/productfournisseurprice.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -92,7 +92,7 @@
 block discarded – undo
92 92
 	/**
93 93
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
94 94
 	 */
95
-	public $fields=array(
95
+	public $fields = array(
96 96
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>10, 'notnull'=>1, 'visible'=>0,),
97 97
 		'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>'1', 'position'=>15, 'notnull'=>1, 'visible'=>-2, 'default'=>'1', 'index'=>1,),
98 98
 		'datec' => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>-1,),
Please login to merge, or discard this patch.
Braces   +53 added lines, -19 removed lines patch added patch discarded remove patch
@@ -177,8 +177,12 @@  discard block
 block discarded – undo
177 177
 
178 178
 		$this->db = $db;
179 179
 
180
-		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) $this->fields['rowid']['visible'] = 0;
181
-		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) $this->fields['entity']['enabled'] = 0;
180
+		if (empty($conf->global->MAIN_SHOW_TECHNICAL_ID) && isset($this->fields['rowid'])) {
181
+			$this->fields['rowid']['visible'] = 0;
182
+		}
183
+		if (!isModEnabled('multicompany') && isset($this->fields['entity'])) {
184
+			$this->fields['entity']['enabled'] = 0;
185
+		}
182 186
 
183 187
 		// Unset fields that are disabled
184 188
 		foreach ($this->fields as $key => $val) {
@@ -220,7 +224,9 @@  discard block
 block discarded – undo
220 224
 
221 225
 		// Load source object
222 226
 		$result = $object->fetchCommon($fromid);
223
-		if ($result > 0 && !empty($object->table_element_line)) $object->fetchLines();
227
+		if ($result > 0 && !empty($object->table_element_line)) {
228
+			$object->fetchLines();
229
+		}
224 230
 
225 231
 		// get lines so they will be clone
226 232
 		//foreach($this->lines as $line)
@@ -232,8 +238,12 @@  discard block
 block discarded – undo
232 238
 		unset($object->import_key);
233 239
 
234 240
 		// Clear fields
235
-		if (property_exists($object, 'ref')) $object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
236
-		if (property_exists($object, 'label')) $object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
241
+		if (property_exists($object, 'ref')) {
242
+			$object->ref = empty($this->fields['ref']['default']) ? "Copy_Of_".$object->ref : $this->fields['ref']['default'];
243
+		}
244
+		if (property_exists($object, 'label')) {
245
+			$object->label = empty($this->fields['label']['default']) ? $langs->trans("CopyOf")." ".$object->label : $this->fields['label']['default'];
246
+		}
237 247
 		if (property_exists($object, 'status')) { $object->status = self::STATUS_DRAFT; }
238 248
 		if (property_exists($object, 'date_creation')) { $object->date_creation = dol_now(); }
239 249
 		if (property_exists($object, 'date_modification')) { $object->date_modification = null; }
@@ -270,8 +280,9 @@  discard block
 block discarded – undo
270 280
 		if (!$error) {
271 281
 			// copy external contacts if same company
272 282
 			if (property_exists($this, 'socid') && $this->socid == $object->socid) {
273
-				if ($this->copy_linked_contact($object, 'external') < 0)
274
-					$error++;
283
+				if ($this->copy_linked_contact($object, 'external') < 0) {
284
+									$error++;
285
+				}
275 286
 			}
276 287
 		}
277 288
 
@@ -320,8 +331,11 @@  discard block
 block discarded – undo
320 331
 		$sql = "SELECT ";
321 332
 		$sql .= $this->getFieldList();
322 333
 		$sql .= " FROM ".$this->db->prefix().$this->table_element." as t";
323
-		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) $sql .= " WHERE t.entity IN (".getEntity($this->element).")";
324
-		else $sql .= " WHERE 1 = 1";
334
+		if (isset($this->ismultientitymanaged) && $this->ismultientitymanaged == 1) {
335
+			$sql .= " WHERE t.entity IN (".getEntity($this->element).")";
336
+		} else {
337
+			$sql .= " WHERE 1 = 1";
338
+		}
325 339
 		// Manage filter
326 340
 		$sqlwhere = array();
327 341
 		if (count($filter) > 0) {
@@ -437,8 +451,12 @@  discard block
 block discarded – undo
437 451
 			$sql = "UPDATE ".$this->db->prefix().$this->table_element;
438 452
 			$sql .= " SET ref = '".$this->db->escape($num)."',";
439 453
 			$sql .= " status = ".self::STATUS_VALIDATED;
440
-			if (!empty($this->fields['date_validation'])) $sql .= ", date_validation = '".$this->db->idate($now)."'";
441
-			if (!empty($this->fields['fk_user_valid'])) $sql .= ", fk_user_valid = ".$user->id;
454
+			if (!empty($this->fields['date_validation'])) {
455
+				$sql .= ", date_validation = '".$this->db->idate($now)."'";
456
+			}
457
+			if (!empty($this->fields['fk_user_valid'])) {
458
+				$sql .= ", fk_user_valid = ".$user->id;
459
+			}
442 460
 			$sql .= " WHERE rowid = ".((int) $this->id);
443 461
 
444 462
 			dol_syslog(get_class($this)."::validate()", LOG_DEBUG);
@@ -452,7 +470,9 @@  discard block
 block discarded – undo
452 470
 			if (!$error && !$notrigger) {
453 471
 				// Call trigger
454 472
 				$result = $this->call_trigger('PRODUCTFOURNISSEURPRICE_VALIDATE', $user);
455
-				if ($result < 0) $error++;
473
+				if ($result < 0) {
474
+					$error++;
475
+				}
456 476
 				// End call triggers
457 477
 			}
458 478
 		}
@@ -573,7 +593,10 @@  discard block
 block discarded – undo
573 593
 	{
574 594
 		global $conf, $langs, $hookmanager;
575 595
 
576
-		if (!empty($conf->dol_no_mouse_hover)) $notooltip = 1; // Force disable tooltips
596
+		if (!empty($conf->dol_no_mouse_hover)) {
597
+			$notooltip = 1;
598
+		}
599
+		// Force disable tooltips
577 600
 
578 601
 		$result = '';
579 602
 
@@ -605,7 +628,9 @@  discard block
 block discarded – undo
605 628
 			}
606 629
 			$linkclose .= ' title="'.dol_escape_htmltag($label, 1).'"';
607 630
 			$linkclose .= ' class="classfortooltip'.($morecss ? ' '.$morecss : '').'"';
608
-		} else $linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
631
+		} else {
632
+			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
633
+		}
609 634
 
610 635
 		$linkstart = '<a href="'.$url.'"';
611 636
 		$linkstart .= $linkclose.'>';
@@ -614,7 +639,9 @@  discard block
 block discarded – undo
614 639
 		$result .= $linkstart;
615 640
 
616 641
 		if (empty($this->showphoto_on_popup)) {
617
-			if ($withpicto) $result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
642
+			if ($withpicto) {
643
+				$result .= img_object(($notooltip ? '' : $label), ($this->picto ? $this->picto : 'generic'), ($notooltip ? (($withpicto != 2) ? 'class="paddingright"' : '') : 'class="'.(($withpicto != 2) ? 'paddingright ' : '').'classfortooltip"'), 0, 0, $notooltip ? 0 : 1);
644
+			}
618 645
 		} else {
619 646
 			if ($withpicto) {
620 647
 				require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
@@ -640,7 +667,9 @@  discard block
 block discarded – undo
640 667
 			}
641 668
 		}
642 669
 
643
-		if ($withpicto != 2) $result .= $this->ref;
670
+		if ($withpicto != 2) {
671
+			$result .= $this->ref;
672
+		}
644 673
 
645 674
 		$result .= $linkend;
646 675
 		//if ($withpicto != 2) $result.=(($addlabel && $this->label) ? $sep . dol_trunc($this->label, ($addlabel > 1 ? $addlabel : 0)) : '');
@@ -649,8 +678,11 @@  discard block
 block discarded – undo
649 678
 		$hookmanager->initHooks(array('productfournisseurpricedao'));
650 679
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
651 680
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
652
-		if ($reshook > 0) $result = $hookmanager->resPrint;
653
-		else $result .= $hookmanager->resPrint;
681
+		if ($reshook > 0) {
682
+			$result = $hookmanager->resPrint;
683
+		} else {
684
+			$result .= $hookmanager->resPrint;
685
+		}
654 686
 
655 687
 		return $result;
656 688
 	}
@@ -690,7 +722,9 @@  discard block
 block discarded – undo
690 722
 
691 723
 		$statusType = 'status'.$status;
692 724
 		//if ($status == self::STATUS_VALIDATED) $statusType = 'status1';
693
-		if ($status == self::STATUS_CANCELED) $statusType = 'status6';
725
+		if ($status == self::STATUS_CANCELED) {
726
+			$statusType = 'status6';
727
+		}
694 728
 
695 729
 		return dolGetStatus($this->labelStatus[$status], $this->labelStatusShort[$status], '', $statusType, $mode);
696 730
 	}
Please login to merge, or discard this patch.
htdocs/cron/info.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
  * View
44 44
  */
45 45
 
46
-$form = new Form($db);	// $form is required as global value into dol_banner_tab
46
+$form = new Form($db); // $form is required as global value into dol_banner_tab
47 47
 
48 48
 llxHeader('', $langs->trans("CronInfo"));
49 49
 
Please login to merge, or discard this patch.
htdocs/compta/stats/supplier_turnover_by_prodserv.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -97,8 +97,8 @@
 block discarded – undo
97 97
 	$month_current = dol_print_date(dol_now(), '%m');
98 98
 	$year_start = $year;
99 99
 }
100
-$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver');	// We use timezone of server so report is same from everywhere
101
-$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver');		// We use timezone of server so report is same from everywhere
100
+$date_start = dol_mktime(0, 0, 0, GETPOST("date_startmonth"), GETPOST("date_startday"), GETPOST("date_startyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
101
+$date_end = dol_mktime(23, 59, 59, GETPOST("date_endmonth"), GETPOST("date_endday"), GETPOST("date_endyear"), 'tzserver'); // We use timezone of server so report is same from everywhere
102 102
 // Quarter
103 103
 if (empty($date_start) || empty($date_end)) { // We define date_start and date_end
104 104
 	$q = GETPOST("q", "int");
Please login to merge, or discard this patch.
htdocs/eventorganization/conferenceorboothattendee_list.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,9 @@
 block discarded – undo
152 152
 	accessforbidden();
153 153
 }
154 154
 $result = restrictedArea($user, 'eventorganization');
155
-if (!$permissiontoread) accessforbidden();
155
+if (!$permissiontoread) {
156
+	accessforbidden();
157
+}
156 158
 
157 159
 
158 160
 /*
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 $langs->loadLangs(array("eventorganization", "other", "projects", "bills"));
46 46
 
47 47
 // Get Paramters
48
-$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';   // The action 'add', 'create', 'edit', 'update', 'view', ...
49
-$massaction  = GETPOST('massaction', 'alpha');   // The bulk action (combo box choice into lists)
50
-$show_files  = GETPOST('show_files', 'int');   // Show files area generated by bulk actions ?
51
-$confirm     = GETPOST('confirm', 'alpha');   // Result of a confirmation
52
-$cancel      = GETPOST('cancel', 'alpha');   // We click on a Cancel button
53
-$toselect    = GETPOST('toselect', 'array');   // Array of ids of elements selected into a list
48
+$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
49
+$massaction  = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
50
+$show_files  = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
51
+$confirm     = GETPOST('confirm', 'alpha'); // Result of a confirmation
52
+$cancel      = GETPOST('cancel', 'alpha'); // We click on a Cancel button
53
+$toselect    = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
54 54
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : str_replace('_', '', basename(dirname(__FILE__)).basename(__FILE__, '.php')); // To manage different context of search
55
-$backtopage  = GETPOST('backtopage', 'alpha');   // Go back to a dedicated page
56
-$optioncss   = GETPOST('optioncss', 'aZ');   // Option for the css output (always '' except when 'print')
55
+$backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
56
+$optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
57 57
 $mode        = GETPOST('mode', 'aZ');
58 58
 
59 59
 $id = GETPOST('id', 'int');
@@ -63,7 +63,7 @@  discard block
 block discarded – undo
63 63
 $fk_project = GETPOST('fk_project', 'int') ? GETPOST('fk_project', 'int') : GETPOST('projectid', 'int');
64 64
 $projectid = $fk_project;
65 65
 
66
-$withProjectUrl='';
66
+$withProjectUrl = '';
67 67
 
68 68
 // Load variable for pagination
69 69
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 
94 94
 // Default sort order (if not yet defined by previous GETPOST)
95 95
 if (!$sortfield) {
96
-	reset($object->fields);					// Reset is required to avoid key() to return null.
96
+	reset($object->fields); // Reset is required to avoid key() to return null.
97 97
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
98 98
 }
99 99
 if (!$sortorder) {
@@ -167,14 +167,14 @@  discard block
 block discarded – undo
167 167
 if (preg_match('/^set/', $action) && $projectid > 0 && !empty($user->rights->eventorganization->write)) {
168 168
 	$project = new Project($db);
169 169
 	//If "set" fields keys is in projects fields
170
-	$project_attr=preg_replace('/^set/', '', $action);
170
+	$project_attr = preg_replace('/^set/', '', $action);
171 171
 	if (array_key_exists($project_attr, $project->fields)) {
172 172
 		$result = $project->fetch($projectid);
173 173
 		if ($result < 0) {
174 174
 			setEventMessages(null, $project->errors, 'errors');
175 175
 		} else {
176
-			$project->{$project_attr}=GETPOST($project_attr);
177
-			$result=$project->update($user);
176
+			$project->{$project_attr} = GETPOST($project_attr);
177
+			$result = $project->update($user);
178 178
 			if ($result < 0) {
179 179
 				setEventMessages(null, $project->errors, 'errors');
180 180
 			}
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
 		$projectstatic->fetch_thirdparty();
401 401
 	}
402 402
 
403
-	$withProjectUrl='';
403
+	$withProjectUrl = '';
404 404
 	$object->project = clone $projectstatic;
405 405
 
406 406
 	if (!empty($withproject)) {
@@ -656,12 +656,12 @@  discard block
 block discarded – undo
656 656
 		print '<div class="fichecenter">';
657 657
 		print '<div class="fichehalfleft">';
658 658
 		print '<div class="underbanner clearboth"></div>';
659
-		print '<table class="border centpercent tableforfield">' . "\n";
659
+		print '<table class="border centpercent tableforfield">'."\n";
660 660
 
661
-		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
661
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
662 662
 
663 663
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
664
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
664
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
665 665
 		$object = $object_evt;
666 666
 		print '</table>';
667 667
 		print '</div>';
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
 }
734 734
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
735 735
 
736
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($conf_or_booth_id)?'?conforboothid='.$conf_or_booth_id:'').'">'."\n";
736
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($conf_or_booth_id) ? '?conforboothid='.$conf_or_booth_id : '').'">'."\n";
737 737
 if ($optioncss != '') {
738 738
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
739 739
 }
@@ -751,7 +751,7 @@  discard block
 block discarded – undo
751 751
 
752 752
 $params = array('morecss'=>'reposition');
753 753
 
754
-$urlnew = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?action=create'.(!empty($confOrBooth->id)?'&conforboothid='.$confOrBooth->id:'').(!empty($projectstatic->id)?'&fk_project='.$projectstatic->id:'').$withProjectUrl.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.(empty($confOrBooth->id) ? '' : '&conforboothid='.$confOrBooth->id).$withProjectUrl);
754
+$urlnew = DOL_URL_ROOT.'/eventorganization/conferenceorboothattendee_card.php?action=create'.(!empty($confOrBooth->id) ? '&conforboothid='.$confOrBooth->id : '').(!empty($projectstatic->id) ? '&fk_project='.$projectstatic->id : '').$withProjectUrl.'&backtopage='.urlencode($_SERVER['PHP_SELF'].'?projectid='.$projectstatic->id.(empty($confOrBooth->id) ? '' : '&conforboothid='.$confOrBooth->id).$withProjectUrl);
755 755
 
756 756
 $newcardbutton = '';
757 757
 $newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', $urlnew, '', $permissiontoadd, $params);
@@ -891,7 +891,7 @@  discard block
 block discarded – undo
891 891
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
892 892
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
893 893
 	}
894
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
894
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
895 895
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
896 896
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
897 897
 		$totalarray['nbfield']++;
@@ -1002,9 +1002,9 @@  discard block
 block discarded – undo
1002 1002
 				if ($key == 'status') {
1003 1003
 					print $object->getLibStatut(5);
1004 1004
 				} elseif ($key == 'ref') {
1005
-					$optionLink = (!empty($withproject)?'conforboothidproject':'conforboothid');
1005
+					$optionLink = (!empty($withproject) ? 'conforboothidproject' : 'conforboothid');
1006 1006
 					if (empty($confOrBooth->id)) {
1007
-						$optionLink='projectid';
1007
+						$optionLink = 'projectid';
1008 1008
 					}
1009 1009
 					print $object->getNomUrl(1, $optionLink);
1010 1010
 				} else {
Please login to merge, or discard this patch.