Passed
Branch develop (fc1365)
by Laurent
84:32
created
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   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -48,15 +48,15 @@  discard block
 block discarded – undo
48 48
 $langs->loadLangs(array("eventorganization", "other", "projects"));
49 49
 
50 50
 // Get Paramters
51
-$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view';   // The action 'add', 'create', 'edit', 'update', 'view', ...
52
-$massaction  = GETPOST('massaction', 'alpha');   // The bulk action (combo box choice into lists)
53
-$show_files  = GETPOST('show_files', 'int');   // Show files area generated by bulk actions ?
54
-$confirm     = GETPOST('confirm', 'alpha');   // Result of a confirmation
55
-$cancel      = GETPOST('cancel', 'alpha');   // We click on a Cancel button
56
-$toselect    = GETPOST('toselect', 'array');   // Array of ids of elements selected into a list
57
-$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeelist';   // To manage different context of search
58
-$backtopage  = GETPOST('backtopage', 'alpha');   // Go back to a dedicated page
59
-$optioncss   = GETPOST('optioncss', 'aZ');   // Option for the css output (always '' except when 'print')
51
+$action      = GETPOST('action', 'aZ09') ?GETPOST('action', 'aZ09') : 'view'; // The action 'add', 'create', 'edit', 'update', 'view', ...
52
+$massaction  = GETPOST('massaction', 'alpha'); // The bulk action (combo box choice into lists)
53
+$show_files  = GETPOST('show_files', 'int'); // Show files area generated by bulk actions ?
54
+$confirm     = GETPOST('confirm', 'alpha'); // Result of a confirmation
55
+$cancel      = GETPOST('cancel', 'alpha'); // We click on a Cancel button
56
+$toselect    = GETPOST('toselect', 'array'); // Array of ids of elements selected into a list
57
+$contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'conferenceorboothattendeelist'; // To manage different context of search
58
+$backtopage  = GETPOST('backtopage', 'alpha'); // Go back to a dedicated page
59
+$optioncss   = GETPOST('optioncss', 'aZ'); // Option for the css output (always '' except when 'print')
60 60
 
61 61
 $id = GETPOST('id', 'int');
62 62
 $conf_or_booth_id = GETPOST('conforboothid', 'int');
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 $fk_project = GETPOST('fk_project', 'int') ? GETPOST('fk_project', 'int') : GETPOST('projectid', 'int');
66 66
 $projectid = $fk_project;
67 67
 
68
-$withProjectUrl='';
68
+$withProjectUrl = '';
69 69
 
70 70
 // Load variable for pagination
71 71
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 
95 95
 // Default sort order (if not yet defined by previous GETPOST)
96 96
 if (!$sortfield) {
97
-	reset($object->fields);					// Reset is required to avoid key() to return null.
97
+	reset($object->fields); // Reset is required to avoid key() to return null.
98 98
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
99 99
 }
100 100
 if (!$sortorder) {
@@ -168,14 +168,14 @@  discard block
 block discarded – undo
168 168
 if (preg_match('/^set/', $action) && $projectid > 0 && !empty($user->rights->eventorganization->write)) {
169 169
 	$project = new Project($db);
170 170
 	//If "set" fields keys is in projects fields
171
-	$project_attr=preg_replace('/^set/', '', $action);
171
+	$project_attr = preg_replace('/^set/', '', $action);
172 172
 	if (array_key_exists($project_attr, $project->fields)) {
173 173
 		$result = $project->fetch($projectid);
174 174
 		if ($result < 0) {
175 175
 			setEventMessages(null, $project->errors, 'errors');
176 176
 		} else {
177
-			$project->{$project_attr}=GETPOST($project_attr);
178
-			$result=$project->update($user);
177
+			$project->{$project_attr} = GETPOST($project_attr);
178
+			$result = $project->update($user);
179 179
 			if ($result < 0) {
180 180
 				setEventMessages(null, $project->errors, 'errors');
181 181
 			}
@@ -322,7 +322,7 @@  discard block
 block discarded – undo
322 322
 					$sql .= " AND t.".$columnName." >= '".$db->idate($search[$key])."'";
323 323
 				}
324 324
 				if (preg_match('/_dtend$/', $key)) {
325
-					$sql .= " AND t." . $columnName . " <= '" . $db->idate($search[$key]) . "'";
325
+					$sql .= " AND t.".$columnName." <= '".$db->idate($search[$key])."'";
326 326
 				}
327 327
 			}
328 328
 		}
@@ -391,7 +391,7 @@  discard block
 block discarded – undo
391 391
 		$projectstatic->fetch_thirdparty();
392 392
 	}
393 393
 
394
-	$withProjectUrl='';
394
+	$withProjectUrl = '';
395 395
 	$object->project = clone $projectstatic;
396 396
 
397 397
 	if (!empty($withproject)) {
@@ -630,12 +630,12 @@  discard block
 block discarded – undo
630 630
 		print '<div class="fichecenter">';
631 631
 		print '<div class="fichehalfleft">';
632 632
 		print '<div class="underbanner clearboth"></div>';
633
-		print '<table class="border centpercent tableforfield">' . "\n";
633
+		print '<table class="border centpercent tableforfield">'."\n";
634 634
 
635
-		include DOL_DOCUMENT_ROOT . '/core/tpl/commonfields_view.tpl.php';
635
+		include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
636 636
 
637 637
 		// Other attributes. Fields from hook formObjectOptions and Extrafields.
638
-		include DOL_DOCUMENT_ROOT . '/core/tpl/extrafields_view.tpl.php';
638
+		include DOL_DOCUMENT_ROOT.'/core/tpl/extrafields_view.tpl.php';
639 639
 		$object = $object_evt;
640 640
 		print '</table>';
641 641
 		print '</div>';
@@ -700,7 +700,7 @@  discard block
 block discarded – undo
700 700
 }
701 701
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
702 702
 
703
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($conf_or_booth_id)?'?conforboothid='.$conf_or_booth_id:'').'">'."\n";
703
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($conf_or_booth_id) ? '?conforboothid='.$conf_or_booth_id : '').'">'."\n";
704 704
 if ($optioncss != '') {
705 705
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
706 706
 }
@@ -715,7 +715,7 @@  discard block
 block discarded – undo
715 715
 print '<input type="hidden" name="page_y" value="">';
716 716
 
717 717
 $params = array('morecss'=>'reposition');
718
-$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', 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), '', $permissiontoadd, $params);
718
+$newcardbutton = dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', 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), '', $permissiontoadd, $params);
719 719
 
720 720
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
721 721
 
@@ -781,7 +781,7 @@  discard block
 block discarded – undo
781 781
 		print '<td class="liste_titre'.($cssforfield ? ' '.$cssforfield : '').'">';
782 782
 		if (!empty($val['arrayofkeyval']) && is_array($val['arrayofkeyval'])) {
783 783
 			print $form->selectarray('search_'.$key, $val['arrayofkeyval'], $search[$key], $val['notnull'], 0, 0, '', 1, 0, 0, '', 'maxwidth100', 1);
784
-		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:')=== 0)) {
784
+		} elseif ((strpos($val['type'], 'integer:') === 0) || (strpos($val['type'], 'sellist:') === 0)) {
785 785
 			print $object->showInputField($val, $key, $search[$key], '', '', 'search_', 'maxwidth125', 1);
786 786
 		} elseif (!preg_match('/^(date|timestamp|datetime)/', $val['type'])) {
787 787
 			print '<input type="text" class="flat maxwidth75" name="search_'.$key.'" value="'.dol_escape_htmltag($search[$key]).'">';
@@ -890,9 +890,9 @@  discard block
 block discarded – undo
890 890
 			if ($key == 'status') {
891 891
 				print $object->getLibStatut(5);
892 892
 			} elseif ($key == 'ref') {
893
-				$optionLink = (!empty($withproject)?'conforboothidproject':'conforboothid');
893
+				$optionLink = (!empty($withproject) ? 'conforboothidproject' : 'conforboothid');
894 894
 				if (empty($confOrBooth->id)) {
895
-					$optionLink='projectid';
895
+					$optionLink = 'projectid';
896 896
 				}
897 897
 				print $object->getNomUrl(1, $optionLink);
898 898
 			} else {
Please login to merge, or discard this patch.
htdocs/salaries/payment_salary/card.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -47,7 +47,7 @@
 block discarded – undo
47 47
 	$result = $object->fetch($id);
48 48
 	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
49 49
 }
50
-restrictedArea($user, 'salaries', $object->fk_salary, 'salary', '');	// $object is payment of salary
50
+restrictedArea($user, 'salaries', $object->fk_salary, 'salary', ''); // $object is payment of salary
51 51
 
52 52
 
53 53
 /*
Please login to merge, or discard this patch.
Braces   +7 added lines, -3 removed lines patch added patch discarded remove patch
@@ -40,13 +40,17 @@
 block discarded – undo
40 40
 $id = GETPOST("id", 'int');
41 41
 $action = GETPOST('action', 'aZ09');
42 42
 $confirm = GETPOST('confirm');
43
-if ($user->socid) $socid = $user->socid;
43
+if ($user->socid) {
44
+	$socid = $user->socid;
45
+}
44 46
 
45 47
 $object = new PaymentSalary($db);
46 48
 if ($id > 0) {
47 49
 	$result = $object->fetch($id);
48
-	if (!$result) dol_print_error($db, 'Failed to get payment id '.$id);
49
-}
50
+	if (!$result) {
51
+		dol_print_error($db, 'Failed to get payment id '.$id);
52
+	}
53
+	}
50 54
 restrictedArea($user, 'salaries', $object->fk_salary, 'salary', '');	// $object is payment of salary
51 55
 
52 56
 
Please login to merge, or discard this patch.
htdocs/projet/class/project.class.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -126,8 +126,8 @@
 block discarded – undo
126 126
 	public $usage_bill_time; // Is the time spent on project must be invoiced or not
127 127
 
128 128
 	/**
129
-	   * @var integer		Event organization: Use Event Organization
130
-	   */
129
+	 * @var integer		Event organization: Use Event Organization
130
+	 */
131 131
 	public $usage_organize_event;
132 132
 
133 133
 	/**
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1691,7 +1691,7 @@  discard block
 block discarded – undo
1691 1691
 
1692 1692
 				foreach (array('internal', 'external') as $source) {
1693 1693
 					$tab = $origin_project->liste_contact(-1, $source);
1694
-					if (is_array($tab) && count($tab)>0) {
1694
+					if (is_array($tab) && count($tab) > 0) {
1695 1695
 						foreach ($tab as $contacttoadd) {
1696 1696
 							$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
1697 1697
 							if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -2311,6 +2311,6 @@  discard block
 block discarded – undo
2311 2311
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
2312 2312
 		$taskstatic = new Task($this->db);
2313 2313
 
2314
-		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0, '',  '-1', '', 0, 0, array(),  0,  array(),  0,  $loadRoleMode);
2314
+		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0, '', '-1', '', 0, 0, array(), 0, array(), 0, $loadRoleMode);
2315 2315
 	}
2316 2316
 }
Please login to merge, or discard this patch.
htdocs/admin/system/modules.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -286,19 +286,19 @@
 block discarded – undo
286 286
 
287 287
 // sort list
288 288
 if ($sortfield == "name" && $sortorder == "asc") {
289
-	usort($moduleList, function (stdClass $a, stdClass $b) {
289
+	usort($moduleList, function(stdClass $a, stdClass $b) {
290 290
 		return strcasecmp($a->name, $b->name);
291 291
 	});
292 292
 } elseif ($sortfield == "name" && $sortorder == "desc") {
293
-	usort($moduleList, function (stdClass $a, stdClass $b) {
293
+	usort($moduleList, function(stdClass $a, stdClass $b) {
294 294
 		return strcasecmp($b->name, $a->name);
295 295
 	});
296 296
 } elseif ($sortfield == "version" && $sortorder == "asc") {
297
-	usort($moduleList, function (stdClass $a, stdClass $b) {
297
+	usort($moduleList, function(stdClass $a, stdClass $b) {
298 298
 		return strcasecmp($a->version, $b->version);
299 299
 	});
300 300
 } elseif ($sortfield == "version" && $sortorder == "desc") {
301
-	usort($moduleList, function (stdClass $a, stdClass $b) {
301
+	usort($moduleList, function(stdClass $a, stdClass $b) {
302 302
 		return strcasecmp($b->version, $a->version);
303 303
 	});
304 304
 } elseif ($sortfield == "id" && $sortorder == "asc") {
Please login to merge, or discard this patch.
htdocs/compta/tva/class/tva.class.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
 		return $solde;
417 417
 	}
418 418
 
419
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
419
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
420 420
 	/**
421 421
 	 * 	Total of the VAT from invoices emitted by the thirdparty.
422 422
 	 *
@@ -425,7 +425,7 @@  discard block
 block discarded – undo
425 425
 	 */
426 426
 	public function tva_sum_collectee($year = 0)
427 427
 	{
428
-        // phpcs:enable
428
+		// phpcs:enable
429 429
 
430 430
 		$sql = "SELECT sum(f.total_tva) as amount";
431 431
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.paye = 1";
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
 		}
451 451
 	}
452 452
 
453
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
453
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
454 454
 	/**
455 455
 	 * 	VAT payed
456 456
 	 *
@@ -459,7 +459,7 @@  discard block
 block discarded – undo
459 459
 	 */
460 460
 	public function tva_sum_payee($year = 0)
461 461
 	{
462
-        // phpcs:enable
462
+		// phpcs:enable
463 463
 
464 464
 		$sql = "SELECT sum(f.total_tva) as total_tva";
465 465
 		$sql .= " FROM ".MAIN_DB_PREFIX."facture_fourn as f";
@@ -485,7 +485,7 @@  discard block
 block discarded – undo
485 485
 	}
486 486
 
487 487
 
488
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
488
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
489 489
 	/**
490 490
 	 * 	Total of the VAT payed
491 491
 	 *
@@ -494,7 +494,7 @@  discard block
 block discarded – undo
494 494
 	 */
495 495
 	public function tva_sum_reglee($year = 0)
496 496
 	{
497
-        // phpcs:enable
497
+		// phpcs:enable
498 498
 
499 499
 		$sql = "SELECT sum(f.amount) as amount";
500 500
 		$sql .= " FROM ".MAIN_DB_PREFIX."tva as f";
@@ -665,7 +665,7 @@  discard block
 block discarded – undo
665 665
 		}
666 666
 	}
667 667
 
668
-    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
668
+	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
669 669
 	/**
670 670
 	 *  Update link between payment tva and line generate into llx_bank
671 671
 	 *
@@ -674,7 +674,7 @@  discard block
 block discarded – undo
674 674
 	 */
675 675
 	public function update_fk_bank($id_bank)
676 676
 	{
677
-        // phpcs:enable
677
+		// phpcs:enable
678 678
 		$sql = 'UPDATE '.MAIN_DB_PREFIX.'tva SET fk_bank = '.(int) $id_bank;
679 679
 		$sql .= ' WHERE rowid = '.(int) $this->id;
680 680
 		$result = $this->db->query($sql);
Please login to merge, or discard this patch.
htdocs/societe/checkvat/checkVatPopup.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
  *		\brief      Popup screen to validate VAT
22 22
  */
23 23
 
24
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
24
+if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); // Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
25 25
 
26 26
 require "../../main.inc.php";
27 27
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
Please login to merge, or discard this patch.
Braces   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,10 @@
 block discarded – undo
21 21
  *		\brief      Popup screen to validate VAT
22 22
  */
23 23
 
24
-if (! defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1');		// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
24
+if (! defined('NOTOKENRENEWAL')) {
25
+	define('NOTOKENRENEWAL', '1');
26
+}
27
+// Do not roll the Anti CSRF token (used if MAIN_SECURITY_CSRF_WITH_TOKEN is on)
25 28
 
26 29
 require "../../main.inc.php";
27 30
 require_once DOL_DOCUMENT_ROOT.'/core/lib/company.lib.php';
Please login to merge, or discard this patch.
htdocs/expedition/shipment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@
 block discarded – undo
79 79
 	$socid = $user->socid;
80 80
 }
81 81
 
82
-$result = restrictedArea($user, 'expedition', 0, '');	// We use 0 for id, because there is no particular shipment on this tab, only id of order is known
82
+$result = restrictedArea($user, 'expedition', 0, ''); // We use 0 for id, because there is no particular shipment on this tab, only id of order is known
83 83
 
84 84
 
85 85
 
Please login to merge, or discard this patch.