Passed
Branch develop (3f4b05)
by Laurent
95:01
created
htdocs/core/get_menudiv.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@
 block discarded – undo
84 84
 $title = $langs->trans("Menu");
85 85
 
86 86
 // URL http://mydolibarr/core/get_menudiv.php?dol_use_jmobile=1 can be used for tests
87
-$head = '<!-- Menu -->'."\n";	// This is used by DoliDroid to know page is a menu page
87
+$head = '<!-- Menu -->'."\n"; // This is used by DoliDroid to know page is a menu page
88 88
 $arrayofjs = array();
89 89
 $arrayofcss = array();
90 90
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
Please login to merge, or discard this patch.
htdocs/core/search_page.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -58,7 +58,7 @@
 block discarded – undo
58 58
 $title = $langs->trans("Search");
59 59
 
60 60
 // URL http://mydolibarr/core/search_page?dol_use_jmobile=1 can be used for tests
61
-$head = '<!-- Quick access -->'."\n";	// This is used by DoliDroid to know page is a search page
61
+$head = '<!-- Quick access -->'."\n"; // This is used by DoliDroid to know page is a search page
62 62
 $arrayofjs = array();
63 63
 $arrayofcss = array();
64 64
 top_htmlhead($head, $title, 0, 0, $arrayofjs, $arrayofcss);
Please login to merge, or discard this patch.
htdocs/accountancy/closure/index.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
 	// Specify as export : update field date_validated on selected month/year
88 88
 	$sql = " UPDATE ".MAIN_DB_PREFIX."accounting_bookkeeping";
89 89
 	$sql .= " SET date_validated = '".$db->idate($now)."'";
90
-	$sql .= " WHERE entity = " . ((int) $conf->entity);
91
-	$sql .= " AND doc_date >= '" . $db->idate($date_start) . "'";
92
-	$sql .= " AND doc_date <= '" . $db->idate($date_end) . "'";
90
+	$sql .= " WHERE entity = ".((int) $conf->entity);
91
+	$sql .= " AND doc_date >= '".$db->idate($date_start)."'";
92
+	$sql .= " AND doc_date <= '".$db->idate($date_end)."'";
93 93
 	$sql .= " AND date_validated IS NULL";
94 94
 
95 95
 	dol_syslog("/accountancy/closure/index.php action=validate_movement_confirm -> Set movements as validated", LOG_DEBUG);
@@ -122,7 +122,7 @@  discard block
 block discarded – undo
122 122
 
123 123
 $title = $langs->trans('Closure');
124 124
 
125
-$help_url ='EN:Module_Double_Entry_Accounting';
125
+$help_url = 'EN:Module_Double_Entry_Accounting';
126 126
 
127 127
 llxHeader('', $title, $help_url);
128 128
 
Please login to merge, or discard this patch.
htdocs/accountancy/bookkeeping/balance.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 
72 72
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
73 73
 $object = new BookKeeping($db);
74
-$hookmanager->initHooks(array('balancelist'));  // Note that conf->hooks_modules contains array
74
+$hookmanager->initHooks(array('balancelist')); // Note that conf->hooks_modules contains array
75 75
 
76 76
 $formaccounting = new FormAccounting($db);
77 77
 $formother = new FormOther($db);
@@ -343,9 +343,9 @@  discard block
 block discarded – undo
343 343
 	// without time and class limits (Class 6 and 7 accounts ???) and does not take into account the "a-nouveau" journal.
344 344
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
345 345
 		$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
346
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
347
-		$sql .= " WHERE t.entity = " . $conf->entity;        // Never do sharing into accounting features
348
-		$sql .= " AND t.doc_date < '" . $db->idate($search_date_start) . "'";
346
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
347
+		$sql .= " WHERE t.entity = ".$conf->entity; // Never do sharing into accounting features
348
+		$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."'";
349 349
 		$sql .= " GROUP BY t.numero_compte";
350 350
 
351 351
 		$resql = $db->query($sql);
@@ -353,7 +353,7 @@  discard block
 block discarded – undo
353 353
 		$opening_balances = array();
354 354
 		for ($i = 0; $i < $nrows; $i++) {
355 355
 			$arr = $resql->fetch_array();
356
-			$opening_balances["'" . $arr['numero_compte'] . "'"] = $arr['opening_balance'];
356
+			$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
357 357
 		}
358 358
 	}
359 359
 
@@ -383,9 +383,9 @@  discard block
 block discarded – undo
383 383
 		//var_dump($accounting_account);
384 384
 		//var_dump($accountingaccountstatic);
385 385
 		if (empty($accountingaccountstatic->label) && $accountingaccountstatic->id > 0) {
386
-			$link = '<a class="editfielda reposition" href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=update&token=' . newToken() . '&id=' . $accountingaccountstatic->id . '">' . img_edit() . '</a>';
386
+			$link = '<a class="editfielda reposition" href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=update&token='.newToken().'&id='.$accountingaccountstatic->id.'">'.img_edit().'</a>';
387 387
 		} elseif ($accounting_account == 'NotDefined') {
388
-			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
388
+			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&token='.newToken().'&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
389 389
 		} elseif (empty($tmparrayforrootaccount['label'])) {
390 390
 			// $tmparrayforrootaccount['label'] not defined = the account has not parent with a parent.
391 391
 			// This is useless, we should not create a new account when an account has no parent, we must edit it to fix its parent.
@@ -417,7 +417,7 @@  discard block
 block discarded – undo
417 417
 
418 418
 				// Show first line of a break
419 419
 				print '<tr class="trforbreak">';
420
-				print '<td colspan="'.($colspan+1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
420
+				print '<td colspan="'.($colspan + 1).'" class="tdforbreak">'.$line->numero_compte.($root_account_description ? ' - '.$root_account_description : '').'</td>';
421 421
 				print '</tr>';
422 422
 
423 423
 				$displayed_account = $root_account_number;
@@ -472,9 +472,9 @@  discard block
 block discarded – undo
472 472
 		print '<td class="right nowraponall amount">'.price(price2num($sous_total_debit, 'MT')).'</td>';
473 473
 		print '<td class="right nowraponall amount">'.price(price2num($sous_total_credit, 'MT')).'</td>';
474 474
 		if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
475
-			print '<td class="right nowraponall amount">' . price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
475
+			print '<td class="right nowraponall amount">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
476 476
 		} else {
477
-			print '<td class="right nowraponall amount">' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
477
+			print '<td class="right nowraponall amount">'.price(price2num($sous_total_debit - $sous_total_credit, 'MT')).'</td>';
478 478
 		}
479 479
 		print "<td></td>\n";
480 480
 		print '</tr>';
@@ -487,9 +487,9 @@  discard block
 block discarded – undo
487 487
 	print '<td class="right nowraponall amount">'.price(price2num($total_debit, 'MT')).'</td>';
488 488
 	print '<td class="right nowraponall amount">'.price(price2num($total_credit, 'MT')).'</td>';
489 489
 	if (!empty($conf->global->ACCOUNTANCY_SHOW_OPENING_BALANCE)) {
490
-		print '<td class="right nowraponall amount">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
490
+		print '<td class="right nowraponall amount">'.price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')).'</td>';
491 491
 	} else {
492
-		print '<td class="right nowraponall amount">' . price(price2num($total_debit - $total_credit, 'MT')) . '</td>';
492
+		print '<td class="right nowraponall amount">'.price(price2num($total_debit - $total_credit, 'MT')).'</td>';
493 493
 	}
494 494
 	print "<td></td>\n";
495 495
 	print '</tr>';
Please login to merge, or discard this patch.
htdocs/holiday/month_report.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -149,7 +149,7 @@
 block discarded – undo
149 149
 $sql .= " AND cp.statut = ".Holiday::STATUS_APPROVED;
150 150
 $sql .= " AND (";
151 151
 $sql .= " (date_format(cp.date_debut, '%Y-%m') = '".$db->escape($year_month)."' OR date_format(cp.date_fin, '%Y-%m') = '".$db->escape($year_month)."')";
152
-$sql .= " OR";	// For leave over several months
152
+$sql .= " OR"; // For leave over several months
153 153
 $sql .= " (date_format(cp.date_debut, '%Y-%m') < '".$db->escape($year_month)."' AND date_format(cp.date_fin, '%Y-%m') > '".$db->escape($year_month)."') ";
154 154
 $sql .= " )";
155 155
 if (!empty($search_ref)) {
Please login to merge, or discard this patch.
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
244 244
 				if ($idbankfordirectdebit > 0) {
245 245
 					$tmpbankfordirectdebit = new Account($this->db);
246 246
 					$tmpbankfordirectdebit->fetch($idbankfordirectdebit);
247
-					$ics = $tmpbankfordirectdebit->ics;	// ICS for direct debit
247
+					$ics = $tmpbankfordirectdebit->ics; // ICS for direct debit
248 248
 				}
249 249
 				if (empty($ics) && !empty($conf->global->PRELEVEMENT_ICS)) {
250 250
 					$ics = $conf->global->PRELEVEMENT_ICS;
@@ -313,9 +313,9 @@  discard block
 block discarded – undo
313 313
 
314 314
 				$address = '______________________________________________';
315 315
 				if ($thirdparty->id > 0) {
316
-					$tmpaddresswithoutcountry = $thirdparty->getFullAddress();	// we test on address without country
316
+					$tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country
317 317
 					if ($tmpaddresswithoutcountry) {
318
-						$address = $thirdparty->getFullAddress(1);	// full address
318
+						$address = $thirdparty->getFullAddress(1); // full address
319 319
 					}
320 320
 				}
321 321
 				$posY = $pdf->GetY();
Please login to merge, or discard this patch.
htdocs/core/modules/product/doc/pdf_standard.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -294,20 +294,20 @@
 block discarded – undo
294 294
 					$nexY = $pdf->GetY();
295 295
 				}
296 296
 				if ($object->length) {
297
-					$texttoshow = $langs->trans("Length") . ' x ' . $langs->trans("Width") . ' x ' . $langs->trans("Height") . ': ' . ($object->length != '' ? $object->length : '?') . ' x ' . ($object->width != '' ? $object->width : '?') . ' x ' . ($object->height != '' ? $object->height : '?');
298
-					$texttoshow .= ' ' . measuringUnitString(0, "size", $object->length_units);
297
+					$texttoshow = $langs->trans("Length").' x '.$langs->trans("Width").' x '.$langs->trans("Height").': '.($object->length != '' ? $object->length : '?').' x '.($object->width != '' ? $object->width : '?').' x '.($object->height != '' ? $object->height : '?');
298
+					$texttoshow .= ' '.measuringUnitString(0, "size", $object->length_units);
299 299
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
300 300
 					$nexY = $pdf->GetY();
301 301
 				}
302 302
 				if ($object->surface) {
303
-					$texttoshow = $langs->trans("Surface") . ': ' . dol_htmlentitiesbr($object->surface);
304
-					$texttoshow .= ' ' . measuringUnitString(0, "surface", $object->surface_units);
303
+					$texttoshow = $langs->trans("Surface").': '.dol_htmlentitiesbr($object->surface);
304
+					$texttoshow .= ' '.measuringUnitString(0, "surface", $object->surface_units);
305 305
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
306 306
 					$nexY = $pdf->GetY();
307 307
 				}
308 308
 				if ($object->volume) {
309
-					$texttoshow = $langs->trans("Volume") . ': ' . dol_htmlentitiesbr($object->volume);
310
-					$texttoshow .= ' ' . measuringUnitString(0, "volume", $object->volume_units);
309
+					$texttoshow = $langs->trans("Volume").': '.dol_htmlentitiesbr($object->volume);
310
+					$texttoshow .= ' '.measuringUnitString(0, "volume", $object->volume_units);
311 311
 					$pdf->writeHTMLCell(190, 3, $this->marge_gauche, $nexY, $texttoshow, 0, 1);
312 312
 					$nexY = $pdf->GetY();
313 313
 				}
Please login to merge, or discard this patch.
htdocs/core/modules/security/generate/modGeneratePassPerso.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -192,7 +192,7 @@  discard block
 block discarded – undo
192 192
 			return $pass;
193 193
 		}
194 194
 
195
-		return $this->getNewGeneratedPassword();	// warning, may generate infinite loop if conditions are not possible
195
+		return $this->getNewGeneratedPassword(); // warning, may generate infinite loop if conditions are not possible
196 196
 	}
197 197
 
198 198
 	/**
@@ -206,11 +206,11 @@  discard block
 block discarded – undo
206 206
 	{
207 207
 		global $langs;
208 208
 
209
-		$this->initAll();	// For the case this method is called alone
209
+		$this->initAll(); // For the case this method is called alone
210 210
 
211 211
 		$password_a = preg_split('//u', $password, null, PREG_SPLIT_NO_EMPTY);
212 212
 		$maj = preg_split('//u', $this->Maj, null, PREG_SPLIT_NO_EMPTY);
213
-		$num = preg_split('//u', $this->Nb, null, PREG_SPLIT_NO_EMPTY);;
213
+		$num = preg_split('//u', $this->Nb, null, PREG_SPLIT_NO_EMPTY); ;
214 214
 		$spe = preg_split('//u', $this->Spe, null, PREG_SPLIT_NO_EMPTY);
215 215
 		/*
216 216
 		$password_a = str_split($password);
Please login to merge, or discard this patch.
htdocs/eventorganization/lib/eventorganization_conferenceorbooth.lib.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
37 37
 	$h = 0;
38 38
 	$head = array();
39 39
 
40
-	$withProjectUrl='';
41
-	if ($with_project>0) {
40
+	$withProjectUrl = '';
41
+	if ($with_project > 0) {
42 42
 		$withProjectUrl = "&withproject=1";
43 43
 	}
44 44
 
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	$head[$h][2] = 'conferenceorbooth';
132 132
 	// Enable caching of conf or booth count attendees
133 133
 	$nbAttendees = 0;
134
-	$nbConferenceOrBooth= 0;
134
+	$nbConferenceOrBooth = 0;
135 135
 	require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
136 136
 	$cachekey = 'count_conferenceorbooth_project_'.$object->id;
137 137
 	$dataretrieved = dol_getcache($cachekey);
@@ -139,14 +139,14 @@  discard block
 block discarded – undo
139 139
 		$nbAttendees = $dataretrieved;
140 140
 	} else {
141 141
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorbooth.class.php';
142
-		$conforbooth=new ConferenceOrBooth($db);
142
+		$conforbooth = new ConferenceOrBooth($db);
143 143
 		$result = $conforbooth->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
144
-		if (!is_array($result) && $result<0) {
144
+		if (!is_array($result) && $result < 0) {
145 145
 			setEventMessages($conforbooth->error, $conforbooth->errors, 'errors');
146 146
 		} else {
147 147
 			$nbConferenceOrBooth = count($result);
148 148
 		}
149
-		dol_setcache($cachekey, $nbConferenceOrBooth, 120);	// If setting cache fails, this is not a problem, so we do not test result.
149
+		dol_setcache($cachekey, $nbConferenceOrBooth, 120); // If setting cache fails, this is not a problem, so we do not test result.
150 150
 	}
151 151
 	if ($nbConferenceOrBooth > 0) {
152 152
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbConferenceOrBooth.'</span>';
@@ -165,14 +165,14 @@  discard block
 block discarded – undo
165 165
 		$nbAttendees = $dataretrieved;
166 166
 	} else {
167 167
 		require_once DOL_DOCUMENT_ROOT.'/eventorganization/class/conferenceorboothattendee.class.php';
168
-		$attendees=new ConferenceOrBoothAttendee($db);
168
+		$attendees = new ConferenceOrBoothAttendee($db);
169 169
 		$result = $attendees->fetchAll('', '', 0, 0, array('t.fk_project'=>$object->id));
170
-		if (!is_array($result) && $result<0) {
170
+		if (!is_array($result) && $result < 0) {
171 171
 			setEventMessages($attendees->error, $attendees->errors, 'errors');
172 172
 		} else {
173 173
 			$nbAttendees = count($result);
174 174
 		}
175
-		dol_setcache($cachekey, $nbAttendees, 120);	// If setting cache fails, this is not a problem, so we do not test result.
175
+		dol_setcache($cachekey, $nbAttendees, 120); // If setting cache fails, this is not a problem, so we do not test result.
176 176
 	}
177 177
 	if ($nbAttendees > 0) {
178 178
 		$head[$h][1] .= '<span class="badge marginleftonlyshort">'.$nbAttendees.'</span>';
Please login to merge, or discard this patch.