Completed
Branch develop (caf636)
by
unknown
16:40
created
htdocs/core/class/html.formaccounting.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -615,15 +615,15 @@
 block discarded – undo
615 615
 
616 616
 		$out = '';
617 617
 		if ($htmlname != "none") {
618
-			$out .= '<form method="post" action="' . $page . '">';
618
+			$out .= '<form method="post" action="'.$page.'">';
619 619
 			$out .= '<input type="hidden" name="action" value="set'.$htmlname.'">';
620
-			$out .= '<input type="hidden" name="token" value="' . newToken() . '">';
620
+			$out .= '<input type="hidden" name="token" value="'.newToken().'">';
621 621
 			if ($option == 0) {
622 622
 				$out .= $this->select_account($selected, $htmlname, $useempty, array(), 1, 1, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'accounts', $filter);
623 623
 			} else {
624 624
 				$out .= $this->select_auxaccount($selected, $htmlname, $useempty, 'minwidth100 maxwidth300 maxwidthonsmartphone', 'subaccounts');
625 625
 			}
626
-			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" name="modify" value="' . $langs->trans("Modify") . '">';
626
+			$out .= '<input type="submit" class="button smallpaddingimp valignmiddle" name="modify" value="'.$langs->trans("Modify").'">';
627 627
 			//$out .= '<input type="submit" class="button smallpaddingimp valignmiddle button-cancel" name="cancel" value="' . $langs->trans("Cancel") . '">';
628 628
 			$out .= '</form>';
629 629
 		} else {
Please login to merge, or discard this patch.
htdocs/accountancy/admin/journals_list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@
 block discarded – undo
186 186
 
187 187
 	// Si verif ok et action add, on ajoute la ligne
188 188
 	if ($ok && GETPOST('actionadd', 'alpha')) {
189
-		$newid = 0;  // Initialise before if for static analysis
189
+		$newid = 0; // Initialise before if for static analysis
190 190
 		if ($tabrowid[$id]) {
191 191
 			// Get free id for insert
192 192
 			$sql = "SELECT MAX(".$db->sanitize($tabrowid[$id]).") newid FROM ".$db->sanitize($tabname[$id]);
Please login to merge, or discard this patch.
htdocs/accountancy/bookkeeping/balance.php 1 patch
Spacing   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -84,7 +84,7 @@  discard block
 block discarded – undo
84 84
 
85 85
 // Initialize technical object to manage hooks of page. Note that conf->hooks_modules contains array of hook context
86 86
 $object = new BookKeeping($db);
87
-$hookmanager->initHooks(array($contextpage));  // Note that conf->hooks_modules contains array
87
+$hookmanager->initHooks(array($contextpage)); // Note that conf->hooks_modules contains array
88 88
 
89 89
 $formaccounting = new FormAccounting($db);
90 90
 $formother = new FormOther($db);
@@ -162,15 +162,15 @@  discard block
 block discarded – undo
162 162
 
163 163
 	if (!empty($search_date_start)) {
164 164
 		$filter['t.doc_date>='] = $search_date_start;
165
-		$param .= '&date_startmonth=' . GETPOSTINT('date_startmonth') . '&date_startday=' . GETPOSTINT('date_startday') . '&date_startyear=' . GETPOSTINT('date_startyear');
165
+		$param .= '&date_startmonth='.GETPOSTINT('date_startmonth').'&date_startday='.GETPOSTINT('date_startday').'&date_startyear='.GETPOSTINT('date_startyear');
166 166
 	}
167 167
 	if (!empty($search_date_end)) {
168 168
 		$filter['t.doc_date<='] = $search_date_end;
169
-		$param .= '&date_endmonth=' . GETPOSTINT('date_endmonth') . '&date_endday=' . GETPOSTINT('date_endday') . '&date_endyear=' . GETPOSTINT('date_endyear');
169
+		$param .= '&date_endmonth='.GETPOSTINT('date_endmonth').'&date_endday='.GETPOSTINT('date_endday').'&date_endyear='.GETPOSTINT('date_endyear');
170 170
 	}
171 171
 	if (!empty($search_doc_date)) {
172 172
 		$filter['t.doc_date'] = $search_doc_date;
173
-		$param .= '&doc_datemonth=' . GETPOSTINT('doc_datemonth') . '&doc_dateday=' . GETPOSTINT('doc_dateday') . '&doc_dateyear=' . GETPOSTINT('doc_dateyear');
173
+		$param .= '&doc_datemonth='.GETPOSTINT('doc_datemonth').'&doc_dateday='.GETPOSTINT('doc_dateday').'&doc_dateyear='.GETPOSTINT('doc_dateyear');
174 174
 	}
175 175
 	if (!empty($search_accountancy_code_start)) {
176 176
 		if ($type == 'sub') {
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
 		} else {
179 179
 			$filter['t.numero_compte>='] = $search_accountancy_code_start;
180 180
 		}
181
-		$param .= '&search_accountancy_code_start=' . urlencode($search_accountancy_code_start);
181
+		$param .= '&search_accountancy_code_start='.urlencode($search_accountancy_code_start);
182 182
 	}
183 183
 	if (!empty($search_accountancy_code_end)) {
184 184
 		if ($type == 'sub') {
@@ -186,12 +186,12 @@  discard block
 block discarded – undo
186 186
 		} else {
187 187
 			$filter['t.numero_compte<='] = $search_accountancy_code_end;
188 188
 		}
189
-		$param .= '&search_accountancy_code_end=' . urlencode($search_accountancy_code_end);
189
+		$param .= '&search_accountancy_code_end='.urlencode($search_accountancy_code_end);
190 190
 	}
191 191
 	if (!empty($search_ledger_code)) {
192 192
 		$filter['t.code_journal'] = $search_ledger_code;
193 193
 		foreach ($search_ledger_code as $code) {
194
-			$param .= '&search_ledger_code[]=' . urlencode($code);
194
+			$param .= '&search_ledger_code[]='.urlencode($code);
195 195
 		}
196 196
 	}
197 197
 	if (!empty($search_not_reconciled)) {
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	// param with type of list
203 203
 	$url_param = substr($param, 1); // remove first "&"
204 204
 	if (!empty($type)) {
205
-		$param = '&type=' . $type . $param;
205
+		$param = '&type='.$type.$param;
206 206
 	}
207 207
 }
208 208
 
@@ -224,11 +224,11 @@  discard block
 block discarded – undo
224 224
 
225 225
 	foreach ($object->lines as $line) {
226 226
 		if ($type == 'sub') {
227
-			print '"' . length_accounta($line->subledger_account) . '"' . $sep;
228
-			print '"' . $line->subledger_label . '"' . $sep;
227
+			print '"'.length_accounta($line->subledger_account).'"'.$sep;
228
+			print '"'.$line->subledger_label.'"'.$sep;
229 229
 		} else {
230
-			print '"' . length_accountg($line->numero_compte) . '"' . $sep;
231
-			print '"' . $object->get_compte_desc($line->numero_compte) . '"' . $sep;
230
+			print '"'.length_accountg($line->numero_compte).'"'.$sep;
231
+			print '"'.$object->get_compte_desc($line->numero_compte).'"'.$sep;
232 232
 		}
233 233
 		print '"'.price($line->debit).'"'.$sep;
234 234
 		print '"'.price($line->credit).'"'.$sep;
@@ -304,7 +304,7 @@  discard block
 block discarded – undo
304 304
 	$newcardbutton = empty($hookmanager->resPrint) ? '' : $hookmanager->resPrint;
305 305
 
306 306
 	if (empty($reshook)) {
307
-		$newcardbutton = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' (' . getDolGlobalString('ACCOUNTING_EXPORT_FORMAT').')" />';
307
+		$newcardbutton = '<input type="button" id="exportcsvbutton" name="exportcsvbutton" class="butAction" value="'.$langs->trans("Export").' ('.getDolGlobalString('ACCOUNTING_EXPORT_FORMAT').')" />';
308 308
 
309 309
 		print '<script type="text/javascript">
310 310
 		jQuery(document).ready(function() {
@@ -319,11 +319,11 @@  discard block
 block discarded – undo
319 319
 		</script>';
320 320
 
321 321
 		if ($type == 'sub') {
322
-			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
323
-			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
322
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/balance.php?'.$url_param, '', 1, array('morecss' => 'marginleftonly'));
323
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/balance.php?type=sub&'.$url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
324 324
 		} else {
325
-			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?' . $url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
326
-			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT . '/accountancy/bookkeeping/balance.php?type=sub&' . $url_param, '', 1, array('morecss' => 'marginleftonly'));
325
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupByAccountAccounting'), '', 'fa fa-stream paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/balance.php?'.$url_param, '', 1, array('morecss' => 'marginleftonly btnTitleSelected'));
326
+			$newcardbutton .= dolGetButtonTitle($langs->trans('AccountBalance')." - ".$langs->trans('GroupBySubAccountAccounting'), '', 'fa fa-align-left vmirror paddingleft imgforviewmode', DOL_URL_ROOT.'/accountancy/bookkeeping/balance.php?type=sub&'.$url_param, '', 1, array('morecss' => 'marginleftonly'));
327 327
 		}
328 328
 		$newcardbutton .= dolGetButtonTitleSeparator();
329 329
 		$newcardbutton .= dolGetButtonTitle($langs->trans('NewAccountingMvt'), '', 'fa fa-plus-circle paddingleft', DOL_URL_ROOT.'/accountancy/bookkeeping/card.php?action=create');
@@ -467,9 +467,9 @@  discard block
 block discarded – undo
467 467
 	// without time and class limits (Class 6 and 7 accounts ???) and does not take into account the "a-nouveau" journal.
468 468
 	if (getDolGlobalString('ACCOUNTANCY_SHOW_OPENING_BALANCE')) {
469 469
 		$sql = "SELECT t.numero_compte, (SUM(t.debit) - SUM(t.credit)) as opening_balance";
470
-		$sql .= " FROM " . MAIN_DB_PREFIX . "accounting_bookkeeping as t";
471
-		$sql .= " WHERE t.entity = " . $conf->entity;        // Never do sharing into accounting features
472
-		$sql .= " AND t.doc_date < '" . $db->idate($search_date_start) . "'";
470
+		$sql .= " FROM ".MAIN_DB_PREFIX."accounting_bookkeeping as t";
471
+		$sql .= " WHERE t.entity = ".$conf->entity; // Never do sharing into accounting features
472
+		$sql .= " AND t.doc_date < '".$db->idate($search_date_start)."'";
473 473
 		$sql .= " GROUP BY t.numero_compte";
474 474
 
475 475
 		$resql = $db->query($sql);
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
 			$nrows = $db->num_rows($resql);
479 479
 			for ($i = 0; $i < $nrows; $i++) {
480 480
 				$arr = $db->fetch_array($resql);
481
-				$opening_balances["'" . $arr['numero_compte'] . "'"] = $arr['opening_balance'];
481
+				$opening_balances["'".$arr['numero_compte']."'"] = $arr['opening_balance'];
482 482
 			}
483 483
 		}
484 484
 	}
@@ -512,9 +512,9 @@  discard block
 block discarded – undo
512 512
 		//var_dump($accounting_account);
513 513
 		//var_dump($accountingaccountstatic);
514 514
 		if (empty($accountingaccountstatic->label) && $accountingaccountstatic->id > 0) {
515
-			$link = '<a class="editfielda reposition" href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=update&token=' . newToken() . '&id=' . $accountingaccountstatic->id . '">' . img_edit() . '</a>';
515
+			$link = '<a class="editfielda reposition" href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=update&token='.newToken().'&id='.$accountingaccountstatic->id.'">'.img_edit().'</a>';
516 516
 		} elseif ($accounting_account == 'NotDefined') {
517
-			$link = '<a href="' . DOL_URL_ROOT . '/accountancy/admin/card.php?action=create&token=' . newToken() . '&accountingaccount=' . length_accountg($line->numero_compte) . '">' . img_edit_add() . '</a>';
517
+			$link = '<a href="'.DOL_URL_ROOT.'/accountancy/admin/card.php?action=create&token='.newToken().'&accountingaccount='.length_accountg($line->numero_compte).'">'.img_edit_add().'</a>';
518 518
 		} /* elseif (empty($tmparrayforrootaccount['label'])) {
519 519
 			// $tmparrayforrootaccount['label'] not defined = the account has not parent with a parent.
520 520
 			// This is useless, we should not create a new account when an account has no parent, we must edit it to fix its parent.
@@ -590,22 +590,22 @@  discard block
 block discarded – undo
590 590
 		$urlzoom = '';
591 591
 		if ($type == 'sub') {
592 592
 			if ($line->subledger_account) {
593
-				$urlzoom = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?type=sub&search_accountancy_code_start=' . urlencode($line->subledger_account) . '&search_accountancy_code_end=' . urlencode($line->subledger_account);
593
+				$urlzoom = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?type=sub&search_accountancy_code_start='.urlencode($line->subledger_account).'&search_accountancy_code_end='.urlencode($line->subledger_account);
594 594
 				if (GETPOSTISSET('date_startmonth')) {
595
-					$urlzoom .= '&search_date_startmonth=' . GETPOSTINT('date_startmonth') . '&search_date_startday=' . GETPOSTINT('date_startday') . '&search_date_startyear=' . GETPOSTINT('date_startyear');
595
+					$urlzoom .= '&search_date_startmonth='.GETPOSTINT('date_startmonth').'&search_date_startday='.GETPOSTINT('date_startday').'&search_date_startyear='.GETPOSTINT('date_startyear');
596 596
 				}
597 597
 				if (GETPOSTISSET('date_endmonth')) {
598
-					$urlzoom .= '&search_date_endmonth=' . GETPOSTINT('date_endmonth') . '&search_date_endday=' . GETPOSTINT('date_endday') . '&search_date_endyear=' . GETPOSTINT('date_endyear');
598
+					$urlzoom .= '&search_date_endmonth='.GETPOSTINT('date_endmonth').'&search_date_endday='.GETPOSTINT('date_endday').'&search_date_endyear='.GETPOSTINT('date_endyear');
599 599
 				}
600 600
 			}
601 601
 		} else {
602 602
 			if ($line->numero_compte) {
603
-				$urlzoom = DOL_URL_ROOT . '/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start=' . urlencode($line->numero_compte) . '&search_accountancy_code_end=' . urlencode($line->numero_compte);
603
+				$urlzoom = DOL_URL_ROOT.'/accountancy/bookkeeping/listbyaccount.php?search_accountancy_code_start='.urlencode($line->numero_compte).'&search_accountancy_code_end='.urlencode($line->numero_compte);
604 604
 				if (GETPOSTISSET('date_startmonth')) {
605
-					$urlzoom .= '&search_date_startmonth=' . GETPOSTINT('date_startmonth') . '&search_date_startday=' . GETPOSTINT('date_startday') . '&search_date_startyear=' . GETPOSTINT('date_startyear');
605
+					$urlzoom .= '&search_date_startmonth='.GETPOSTINT('date_startmonth').'&search_date_startday='.GETPOSTINT('date_startday').'&search_date_startyear='.GETPOSTINT('date_startyear');
606 606
 				}
607 607
 				if (GETPOSTISSET('date_endmonth')) {
608
-					$urlzoom .= '&search_date_endmonth=' . GETPOSTINT('date_endmonth') . '&search_date_endday=' . GETPOSTINT('date_endday') . '&search_date_endyear=' . GETPOSTINT('date_endyear');
608
+					$urlzoom .= '&search_date_endmonth='.GETPOSTINT('date_endmonth').'&search_date_endday='.GETPOSTINT('date_endday').'&search_date_endyear='.GETPOSTINT('date_endyear');
609 609
 				}
610 610
 			}
611 611
 		}
@@ -648,9 +648,9 @@  discard block
 block discarded – undo
648 648
 		print '<td class="right nowraponall amount">'.price(price2num($sous_total_debit, 'MT')).'</td>';
649 649
 		print '<td class="right nowraponall amount">'.price(price2num($sous_total_credit, 'MT')).'</td>';
650 650
 		if (getDolGlobalString('ACCOUNTANCY_SHOW_OPENING_BALANCE')) {
651
-			print '<td class="right nowraponall amount">' . price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
651
+			print '<td class="right nowraponall amount">'.price(price2num($sous_total_opening_balance + $sous_total_debit - $sous_total_credit, 'MT')).'</td>';
652 652
 		} else {
653
-			print '<td class="right nowraponall amount">' . price(price2num($sous_total_debit - $sous_total_credit, 'MT')) . '</td>';
653
+			print '<td class="right nowraponall amount">'.price(price2num($sous_total_debit - $sous_total_credit, 'MT')).'</td>';
654 654
 		}
655 655
 		// Action column
656 656
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -671,9 +671,9 @@  discard block
 block discarded – undo
671 671
 	print '<td class="right nowraponall amount">'.price(price2num($total_debit, 'MT')).'</td>';
672 672
 	print '<td class="right nowraponall amount">'.price(price2num($total_credit, 'MT')).'</td>';
673 673
 	if (getDolGlobalString('ACCOUNTANCY_SHOW_OPENING_BALANCE')) {
674
-		print '<td class="right nowraponall amount">' . price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')) . '</td>';
674
+		print '<td class="right nowraponall amount">'.price(price2num($total_opening_balance + $total_debit - $total_credit, 'MT')).'</td>';
675 675
 	} else {
676
-		print '<td class="right nowraponall amount">' . price(price2num($total_debit - $total_credit, 'MT')) . '</td>';
676
+		print '<td class="right nowraponall amount">'.price(price2num($total_debit - $total_credit, 'MT')).'</td>';
677 677
 	}
678 678
 	// Action column
679 679
 	if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
@@ -687,7 +687,7 @@  discard block
 block discarded – undo
687 687
 		if (getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
688 688
 			print "<td></td>\n";
689 689
 		}
690
-		print '<td class="right">' . $langs->trans("AccountingResult") . ':</td>';
690
+		print '<td class="right">'.$langs->trans("AccountingResult").':</td>';
691 691
 		if (getDolGlobalString('ACCOUNTANCY_SHOW_OPENING_BALANCE')) {
692 692
 			print '<td></td>';
693 693
 		}
@@ -702,8 +702,8 @@  discard block
 block discarded – undo
702 702
 			$accountingResultCredit = price(price2num($accountingResult, 'MT'));
703 703
 			$accountingResultClassCSS = ' green';
704 704
 		}
705
-		print '<td class="right nowraponall amount' . $accountingResultClassCSS . '">' . $accountingResultDebit . '</td>';
706
-		print '<td class="right nowraponall amount' . $accountingResultClassCSS . '">' . $accountingResultCredit . '</td>';
705
+		print '<td class="right nowraponall amount'.$accountingResultClassCSS.'">'.$accountingResultDebit.'</td>';
706
+		print '<td class="right nowraponall amount'.$accountingResultClassCSS.'">'.$accountingResultCredit.'</td>';
707 707
 
708 708
 		print '<td></td>';
709 709
 		if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {
Please login to merge, or discard this patch.
htdocs/adherents/list.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -42,47 +42,47 @@  discard block
 block discarded – undo
42 42
 
43 43
 
44 44
 // Get parameters
45
-$action 	= GETPOST('action', 'aZ09');
45
+$action = GETPOST('action', 'aZ09');
46 46
 $massaction = GETPOST('massaction', 'alpha');
47 47
 $show_files = GETPOSTINT('show_files');
48
-$confirm 	= GETPOST('confirm', 'alpha');
48
+$confirm = GETPOST('confirm', 'alpha');
49 49
 $cancel     = GETPOST('cancel', 'alpha');
50
-$toselect 	= GETPOST('toselect', 'array');
50
+$toselect = GETPOST('toselect', 'array');
51 51
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'memberslist'; // To manage different context of search
52 52
 $backtopage = GETPOST('backtopage', 'alpha');
53 53
 $optioncss 	= GETPOST('optioncss', 'aZ');
54
-$mode 		= GETPOST('mode', 'alpha');
54
+$mode = GETPOST('mode', 'alpha');
55 55
 
56 56
 // Search fields
57
-$search 			= GETPOST("search", 'alpha');
58
-$search_ref 		= GETPOST("search_ref", 'alpha');
57
+$search = GETPOST("search", 'alpha');
58
+$search_ref = GETPOST("search_ref", 'alpha');
59 59
 $search_lastname 	= GETPOST("search_lastname", 'alpha');
60
-$search_firstname 	= GETPOST("search_firstname", 'alpha');
60
+$search_firstname = GETPOST("search_firstname", 'alpha');
61 61
 $search_gender 		= GETPOST("search_gender", 'alpha');
62 62
 $search_civility 	= GETPOST("search_civility", 'alpha');
63 63
 $search_company 	= GETPOST('search_company', 'alphanohtml');
64
-$search_login 		= GETPOST("search_login", 'alpha');
64
+$search_login = GETPOST("search_login", 'alpha');
65 65
 $search_address 	= GETPOST("search_address", 'alpha');
66
-$search_zip 		= GETPOST("search_zip", 'alpha');
67
-$search_town 		= GETPOST("search_town", 'alpha');
68
-$search_state 		= GETPOST("search_state", 'alpha');  // county / departement / federal state
69
-$search_country 	= GETPOST("search_country", 'alpha');
66
+$search_zip = GETPOST("search_zip", 'alpha');
67
+$search_town = GETPOST("search_town", 'alpha');
68
+$search_state 		= GETPOST("search_state", 'alpha'); // county / departement / federal state
69
+$search_country = GETPOST("search_country", 'alpha');
70 70
 $search_phone 		= GETPOST("search_phone", 'alpha');
71 71
 $search_phone_perso = GETPOST("search_phone_perso", 'alpha');
72 72
 $search_phone_mobile = GETPOST("search_phone_mobile", 'alpha');
73
-$search_type 		= GETPOST("search_type", 'alpha');
73
+$search_type = GETPOST("search_type", 'alpha');
74 74
 $search_email 		= GETPOST("search_email", 'alpha');
75 75
 $search_categ 		= GETPOST("search_categ", 'intcomma');
76
-$search_morphy 		= GETPOST("search_morphy", 'alpha');
77
-$search_import_key  = trim(GETPOST("search_import_key", 'alpha'));
76
+$search_morphy = GETPOST("search_morphy", 'alpha');
77
+$search_import_key = trim(GETPOST("search_import_key", 'alpha'));
78 78
 
79
-$socid 		= GETPOSTINT('socid');
79
+$socid = GETPOSTINT('socid');
80 80
 if (GETPOSTINT('catid') && empty($search_categ)) {
81 81
 	$search_categ = GETPOSTINT('catid');
82 82
 }
83 83
 
84 84
 $search_filter 		= GETPOST("search_filter", 'alpha');
85
-$search_status 		= GETPOST("search_status", 'intcomma');  // status
85
+$search_status 		= GETPOST("search_status", 'intcomma'); // status
86 86
 $search_datec_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datec_start_month'), GETPOSTINT('search_datec_start_day'), GETPOSTINT('search_datec_start_year'));
87 87
 $search_datec_end = dol_mktime(23, 59, 59, GETPOSTINT('search_datec_end_month'), GETPOSTINT('search_datec_end_day'), GETPOSTINT('search_datec_end_year'));
88 88
 $search_datem_start = dol_mktime(0, 0, 0, GETPOSTINT('search_datem_start_month'), GETPOSTINT('search_datem_start_day'), GETPOSTINT('search_datem_start_year'));
@@ -206,7 +206,7 @@  discard block
 block discarded – undo
206 206
 	}
207 207
 }
208 208
 $arrayfields = dol_sort_array($arrayfields, 'position');
209
-'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields';  // dol_sort_array looses type for Phan
209
+'@phan-var-force array<string,array{label:string,checked?:int<0,1>,position?:int,help?:string}> $arrayfields'; // dol_sort_array looses type for Phan
210 210
 //var_dump($arrayfields);exit;
211 211
 
212 212
 // Security check
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
 $sqlfields = $sql; // $sql fields to remove for count total
434 434
 
435 435
 // SQL Alias adherent
436
-$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d";  // maybe better to use ad (adh) instead of d
436
+$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d"; // maybe better to use ad (adh) instead of d
437 437
 if (!empty($extrafields->attributes[$object->table_element]['label']) && count($extrafields->attributes[$object->table_element]['label'])) {
438 438
 	$sql .= " LEFT JOIN ".MAIN_DB_PREFIX.$object->table_element."_extrafields as ef on (d.rowid = ef.fk_object)";
439 439
 }
@@ -458,7 +458,7 @@  discard block
 block discarded – undo
458 458
 			if ($searchCategoryContactOperator == 0) {
459 459
 				$searchCategoryContactSqlList[] = " EXISTS (SELECT ck.fk_categorie FROM ".MAIN_DB_PREFIX."categorie_member as ck WHERE d.rowid = ck.fk_member AND ck.fk_categorie = ".((int) $searchCategoryContact).")";
460 460
 			} else {
461
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryContact);
461
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryContact);
462 462
 			}
463 463
 		}
464 464
 	}
@@ -622,7 +622,7 @@  discard block
 block discarded – undo
622 622
 // Output page
623 623
 // --------------------------------------------------------------------
624 624
 
625
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
625
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
626 626
 
627 627
 $arrayofselected = is_array($toselect) ? $toselect : array();
628 628
 
Please login to merge, or discard this patch.