Completed
Branch develop (1d589f)
by
unknown
21:18
created
htdocs/core/modules/modBlockedLog.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -170,7 +170,7 @@
 block discarded – undo
170 170
 		$sql = array();
171 171
 
172 172
 		// If already used, we add an entry to show we enable module
173
-		require_once DOL_DOCUMENT_ROOT . '/blockedlog/class/blockedlog.class.php';
173
+		require_once DOL_DOCUMENT_ROOT.'/blockedlog/class/blockedlog.class.php';
174 174
 
175 175
 		$object = new stdClass();
176 176
 		$object->id = 1;
Please login to merge, or discard this patch.
htdocs/compta/bank/card.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -75,7 +75,9 @@
 block discarded – undo
75 75
 
76 76
 $parameters = array();
77 77
 $reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
78
-if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
78
+if ($reshook < 0) {
79
+	setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
80
+}
79 81
 
80 82
 if (empty($reshook)) {
81 83
 	$backurlforlist = DOL_URL_ROOT.'/compta/bank/list.php';
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
 			$urltogo = preg_replace('/--IDFORBACKTOPAGE--/', $object->id, $urltogo); // New method to autoselect project after a New on another form object creation
222 222
 
223 223
 			if (empty($noback)) {
224
-				header("Location: " . $urltogo);
224
+				header("Location: ".$urltogo);
225 225
 				exit;
226 226
 			}
227 227
 		} else {
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 
338 338
 		if ($result > 0) {
339 339
 			setEventMessages($langs->trans("RecordDeleted"), null, 'mesgs');
340
-			header("Location: " . DOL_URL_ROOT . "/compta/bank/list.php");
340
+			header("Location: ".DOL_URL_ROOT."/compta/bank/list.php");
341 341
 			exit;
342 342
 		} else {
343 343
 			setEventMessages($object->error, $object->errors, 'errors');
@@ -583,7 +583,7 @@  discard block
 block discarded – undo
583 583
 		if (isModEnabled('paymentbybanktransfer')) {
584 584
 			if ($mysoc->isInEEC()) {
585 585
 				print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td>';
586
-				print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'. (empty(GETPOST('pti_in_ctti')) ? '' : ' checked ') . '>';
586
+				print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'.(empty(GETPOST('pti_in_ctti')) ? '' : ' checked ').'>';
587 587
 				print '</td></tr>';
588 588
 			}
589 589
 		}
@@ -1129,14 +1129,14 @@  discard block
 block discarded – undo
1129 1129
 			$tooltip = $langs->trans("Example").':<br>CH93 0076 2011 6238 5295 7<br>LT12 1000 0111 0100 1000<br>FR14 2004 1010 0505 0001 3M02 606<br>LU28 0019 4006 4475 0000<br>DE89 3704 0044 0532 0130 00';
1130 1130
 			print $form->textwithpicto($langs->trans($ibankey), $tooltip, 1, 'help', '', 0, 3, 'iban');
1131 1131
 			print '</td>';
1132
-			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban',  'alphanohtml') : $object->iban).'"></td></tr>';
1132
+			print '<td><input class="minwidth300 maxwidth200onsmartphone" maxlength="34" type="text" class="flat" name="iban" value="'.(GETPOSTISSET('iban') ? GETPOST('iban', 'alphanohtml') : $object->iban).'"></td></tr>';
1133 1133
 
1134 1134
 			// BIC
1135 1135
 			print '<tr><td>';
1136 1136
 			$tooltip = $langs->trans("Example").': LIABLT2XXXX';
1137 1137
 			print $form->textwithpicto($langs->trans($bickey), $tooltip, 1, 'help', '', 0, 3, 'bic');
1138 1138
 			print '</td>';
1139
-			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic',  'alphanohtml') : $object->bic).'"></td></tr>';
1139
+			print '<td><input class="minwidth150 maxwidth200onsmartphone" maxlength="11" type="text" class="flat" name="bic" value="'.(GETPOSTISSET('bic') ? GETPOST('bic', 'alphanohtml') : $object->bic).'"></td></tr>';
1140 1140
 
1141 1141
 			// Show fields of bank account
1142 1142
 			foreach ($object->getFieldsToShow() as $val) {
@@ -1176,7 +1176,7 @@  discard block
 block discarded – undo
1176 1176
 				}
1177 1177
 				if ($mysoc->isInEEC()) {
1178 1178
 					print '<tr><td>'.$form->textwithpicto($langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformation"), $langs->trans("SEPAXMLPlacePaymentTypeInformationInCreditTransfertransactionInformationHelp")).'</td>';
1179
-					print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'. ($object->pti_in_ctti ? ' checked ' : '') . '>';
1179
+					print '<td><input type="checkbox" class="flat" name="pti_in_ctti"'.($object->pti_in_ctti ? ' checked ' : '').'>';
1180 1180
 					print '</td></tr>';
1181 1181
 				}
1182 1182
 			}
Please login to merge, or discard this patch.
htdocs/core/modules/modMrp.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -268,9 +268,9 @@  discard block
 block discarded – undo
268 268
 		// Exports profiles provided by this module
269 269
 		$r = 1;
270 270
 
271
-		$this->export_code[$r]=$this->rights_class.'_'.$r;
272
-		$this->export_label[$r]='MOs';	// Translation key (used only if key ExportDataset_xxx_z not found)
273
-		$this->export_icon[$r]='mrp';
271
+		$this->export_code[$r] = $this->rights_class.'_'.$r;
272
+		$this->export_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found)
273
+		$this->export_icon[$r] = 'mrp';
274 274
 		$this->export_fields_array[$r] = array(
275 275
 			'm.rowid'=>"Id",
276 276
 			'm.ref'=>"Ref",
@@ -350,9 +350,9 @@  discard block
 block discarded – undo
350 350
 		 $r++; */
351 351
 		/* END MODULEBUILDER IMPORT MO */
352 352
 		$r++;
353
-		$this->import_code[$r]=$this->rights_class.'_'.$r;
354
-		$this->import_label[$r]='MOs';	// Translation key (used only if key ExportDataset_xxx_z not found)
355
-		$this->import_icon[$r]='mrp';
353
+		$this->import_code[$r] = $this->rights_class.'_'.$r;
354
+		$this->import_label[$r] = 'MOs'; // Translation key (used only if key ExportDataset_xxx_z not found)
355
+		$this->import_icon[$r] = 'mrp';
356 356
 		$this->import_entities_array[$r] = array(); // We define here only fields that use a different icon from the one defined in import_icon
357 357
 		$this->import_tables_array[$r] = array('m'=>MAIN_DB_PREFIX.'mrp_mo', 'extra'=>MAIN_DB_PREFIX.'mrp_mo_extrafields');
358 358
 		$this->import_tables_creator_array[$r] = array('m'=>'fk_user_creat'); // Fields to store import user id
Please login to merge, or discard this patch.
htdocs/core/modules/mrp/doc/pdf_vinci.modules.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1120,7 +1120,9 @@
 block discarded – undo
1120 1120
 		global $langs, $conf, $mysoc;
1121 1121
 
1122 1122
 		$ltrdirection = 'L';
1123
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1123
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1124
+			$ltrdirection = 'R';
1125
+		}
1124 1126
 
1125 1127
 		// Load translation files required by the page
1126 1128
 		$outputlangs->loadLangs(array("main", "orders", "companies", "bills", "sendings"));
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 		$this->db = $db;
90 90
 		$this->name = "vinci";
91 91
 		$this->description = $langs->trans('DocumentModelStandardPDF');
92
-		$this->update_main_doc_field = 1;		// Save the name of generated file as the main doc when generating a doc with this template
92
+		$this->update_main_doc_field = 1; // Save the name of generated file as the main doc when generating a doc with this template
93 93
 
94 94
 		// Page size for A4 format
95 95
 		$this->type = 'pdf';
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 				$pdf->SetFont(pdf_getPDFFont($outputlangs));
227 227
 				// Set path to the background PDF File
228 228
 				if (getDolGlobalString('MAIN_ADD_PDF_BACKGROUND')) {
229
-					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/' . getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
229
+					$pagecount = $pdf->setSourceFile($conf->mycompany->dir_output.'/'.getDolGlobalString('MAIN_ADD_PDF_BACKGROUND'));
230 230
 					$tplidx = $pdf->importPage(1);
231 231
 				}
232 232
 
@@ -518,7 +518,7 @@  discard block
 block discarded – undo
518 518
 					if ($this->getColumnStatus('desc')) {
519 519
 						$pdf->startTransaction(); //description
520 520
 						$des = $prod -> description;
521
-						$descr = $des;//implode("<br>", $des);
521
+						$descr = $des; //implode("<br>", $des);
522 522
 
523 523
 						$this->printStdColumnContent($pdf, $curY, 'desc', $descr);
524 524
 
@@ -1157,7 +1157,7 @@  discard block
 block discarded – undo
1157 1157
 		$pdf->SetFont('', 'B', $default_font_size + 3);
1158 1158
 		$pdf->SetXY($posx, $posy);
1159 1159
 		$pdf->SetTextColor(0, 0, 60);
1160
-		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("QtyToProduce").": " .$object->qty, '', 'R');
1160
+		$pdf->MultiCell($w, 3, $outputlangs->transnoentities("QtyToProduce").": ".$object->qty, '', 'R');
1161 1161
 
1162 1162
 
1163 1163
 		$pdf->SetTextColor(0, 0, 60);
Please login to merge, or discard this patch.
htdocs/fourn/commande/list.php 2 patches
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -304,8 +304,11 @@
 block discarded – undo
304 304
 				}
305 305
 			}
306 306
 
307
-			if (!$error) $db->commit();
308
-			else $db->rollback();
307
+			if (!$error) {
308
+				$db->commit();
309
+			} else {
310
+				$db->rollback();
311
+			}
309 312
 		}
310 313
 	}
311 314
 
Please login to merge, or discard this patch.
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@  discard block
 block discarded – undo
64 64
 $search_date_order_endday = GETPOST('search_date_order_endday', 'int');
65 65
 $search_date_order_endmonth = GETPOST('search_date_order_endmonth', 'int');
66 66
 $search_date_order_endyear = GETPOST('search_date_order_endyear', 'int');
67
-$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear);	// Use tzserver
67
+$search_date_order_start = dol_mktime(0, 0, 0, $search_date_order_startmonth, $search_date_order_startday, $search_date_order_startyear); // Use tzserver
68 68
 $search_date_order_end = dol_mktime(23, 59, 59, $search_date_order_endmonth, $search_date_order_endday, $search_date_order_endyear);
69 69
 
70 70
 $search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int');
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 $search_date_delivery_endday = GETPOST('search_date_delivery_endday', 'int');
74 74
 $search_date_delivery_endmonth = GETPOST('search_date_delivery_endmonth', 'int');
75 75
 $search_date_delivery_endyear = GETPOST('search_date_delivery_endyear', 'int');
76
-$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear);	// Use tzserver
76
+$search_date_delivery_start = dol_mktime(0, 0, 0, $search_date_delivery_startmonth, $search_date_delivery_startday, $search_date_delivery_startyear); // Use tzserver
77 77
 $search_date_delivery_end = dol_mktime(23, 59, 59, $search_date_delivery_endmonth, $search_date_delivery_endday, $search_date_delivery_endyear);
78 78
 
79 79
 $search_date_valid_startday = GETPOST('search_date_valid_startday', 'int');
@@ -82,7 +82,7 @@  discard block
 block discarded – undo
82 82
 $search_date_valid_endday = GETPOST('search_date_valid_endday', 'int');
83 83
 $search_date_valid_endmonth = GETPOST('search_date_valid_endmonth', 'int');
84 84
 $search_date_valid_endyear = GETPOST('search_date_valid_endyear', 'int');
85
-$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear);	// Use tzserver
85
+$search_date_valid_start = dol_mktime(0, 0, 0, $search_date_valid_startmonth, $search_date_valid_startday, $search_date_valid_startyear); // Use tzserver
86 86
 $search_date_valid_end = dol_mktime(23, 59, 59, $search_date_valid_endmonth, $search_date_valid_endday, $search_date_valid_endyear);
87 87
 
88 88
 $search_date_approve_startday = GETPOST('search_date_approve_startday', 'int');
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 $search_date_approve_endday = GETPOST('search_date_approve_endday', 'int');
92 92
 $search_date_approve_endmonth = GETPOST('search_date_approve_endmonth', 'int');
93 93
 $search_date_approve_endyear = GETPOST('search_date_approve_endyear', 'int');
94
-$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear);	// Use tzserver
94
+$search_date_approve_start = dol_mktime(0, 0, 0, $search_date_approve_startmonth, $search_date_approve_startday, $search_date_approve_startyear); // Use tzserver
95 95
 $search_date_approve_end = dol_mktime(23, 59, 59, $search_date_approve_endmonth, $search_date_approve_endday, $search_date_approve_endyear);
96 96
 
97 97
 $sall = trim((GETPOST('search_all', 'alphanohtml') != '') ?GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
 
371 371
 		$db->begin();
372 372
 
373
-		$default_ref_supplier=dol_print_date(dol_now(), '%Y%m%d%H%M%S');
373
+		$default_ref_supplier = dol_print_date(dol_now(), '%Y%m%d%H%M%S');
374 374
 
375 375
 		foreach ($orders as $id_order) {
376 376
 			$cmd = new CommandeFournisseur($db);
@@ -389,7 +389,7 @@  discard block
 block discarded – undo
389 389
 				$objecttmp->fk_project = $cmd->fk_project;
390 390
 				$objecttmp->multicurrency_code = $cmd->multicurrency_code;
391 391
 				$objecttmp->ref_supplier = !empty($cmd->ref_supplier) ? $cmd->ref_supplier : $default_ref_supplier;
392
-				$default_ref_supplier+=1;
392
+				$default_ref_supplier += 1;
393 393
 
394 394
 				$datefacture = dol_mktime(12, 0, 0, GETPOST('remonth', 'int'), GETPOST('reday', 'int'), GETPOST('reyear', 'int'));
395 395
 				if (empty($datefacture)) {
@@ -885,9 +885,9 @@  discard block
 block discarded – undo
885 885
 if ($search_user > 0) {
886 886
 	$sql .= " AND EXISTS (";
887 887
 	$sql .= " SELECT ec.rowid ";
888
-	$sql .= " FROM " . MAIN_DB_PREFIX . "element_contact as ec";
889
-	$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact";
890
-	$sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = " . ((int) $search_user);
888
+	$sql .= " FROM ".MAIN_DB_PREFIX."element_contact as ec";
889
+	$sql .= " INNER JOIN ".MAIN_DB_PREFIX."c_type_contact as tc ON tc.rowid = ec.fk_c_type_contact";
890
+	$sql .= " WHERE ec.element_id = cf.rowid AND ec.fk_socpeople = ".((int) $search_user);
891 891
 	$sql .= " AND tc.element = 'order_supplier' AND tc.source = 'internal'";
892 892
 	$sql .= ")";
893 893
 }
@@ -931,7 +931,7 @@  discard block
 block discarded – undo
931 931
 			if ($searchCategoryProductOperator == 0) {
932 932
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commande_fournisseurdet as cd WHERE cd.fk_commande = cf.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
933 933
 			} else {
934
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
934
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
935 935
 			}
936 936
 		}
937 937
 	}
@@ -1203,7 +1203,7 @@  discard block
 block discarded – undo
1203 1203
 
1204 1204
 	$topicmail = "SendOrderRef";
1205 1205
 	$modelmail = "order_supplier_send";
1206
-	$objecttmp = new CommandeFournisseur($db);	// in case $object is not the good object
1206
+	$objecttmp = new CommandeFournisseur($db); // in case $object is not the good object
1207 1207
 	$trackid = 'sord'.$object->id;
1208 1208
 	include DOL_DOCUMENT_ROOT.'/core/tpl/massactions_pre.tpl.php';
1209 1209
 
Please login to merge, or discard this patch.
htdocs/eventorganization/conferenceorbooth_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   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@  discard block
 block discarded – undo
85 85
 
86 86
 // Default sort order (if not yet defined by previous GETPOST)
87 87
 if (!$sortfield) {
88
-	reset($object->fields);					// Reset is required to avoid key() to return null.
88
+	reset($object->fields); // Reset is required to avoid key() to return null.
89 89
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
90 90
 }
91 91
 if (!$sortorder) {
@@ -157,15 +157,15 @@  discard block
 block discarded – undo
157 157
 
158 158
 if (preg_match('/^set/', $action) && ($projectid > 0 || $projectref) && $user->hasRight('eventorganization', 'write')) {
159 159
 	//If "set" fields keys is in projects fields
160
-	$project_attr=preg_replace('/^set/', '', $action);
160
+	$project_attr = preg_replace('/^set/', '', $action);
161 161
 	if (array_key_exists($project_attr, $project->fields)) {
162 162
 		$result = $project->fetch($projectid, $projectref);
163 163
 		if ($result < 0) {
164 164
 			setEventMessages(null, $project->errors, 'errors');
165 165
 		} else {
166 166
 			$projectid = $project->id;
167
-			$project->{$project_attr}=GETPOST($project_attr);
168
-			$result=$project->update($user);
167
+			$project->{$project_attr} = GETPOST($project_attr);
168
+			$result = $project->update($user);
169 169
 			if ($result < 0) {
170 170
 				setEventMessages(null, $project->errors, 'errors');
171 171
 			}
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 
227 227
 	if ($permissiontoadd && (($action == 'setstatus' && $confirm == "yes") || $massaction == 'setstatus')) {
228 228
 		$db->begin();
229
-		$error = 0;$nbok = 0;
229
+		$error = 0; $nbok = 0;
230 230
 		$objecttmp = new $objectclass($db);
231 231
 		foreach ($toselect as $key => $idselect) {
232 232
 			$result = $objecttmp->fetch($idselect);
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
242 242
 				}
243 243
 			} else {
244 244
 				setEventMessages($objecttmp->error, $objecttmp->errors, 'errors');
245
-				$error ++;
245
+				$error++;
246 246
 				break;
247 247
 			}
248 248
 		}
@@ -292,9 +292,9 @@  discard block
 block discarded – undo
292 292
 	}
293 293
 
294 294
 	$help_url = "EN:Module_Projects|FR:Module_Projets|ES:M&oacute;dulo_Proyectos";
295
-	$title = $langs->trans("Project") . ' - ' . $langs->trans("EventOrganizationConfOrBoothes") . ' - ' . $project->ref . ' ' . $project->name;
295
+	$title = $langs->trans("Project").' - '.$langs->trans("EventOrganizationConfOrBoothes").' - '.$project->ref.' '.$project->name;
296 296
 	if (getDolGlobalString('MAIN_HTML_TITLE') && preg_match('/projectnameonly/', $conf->global->MAIN_HTML_TITLE) && $project->name) {
297
-		$title = $project->ref . ' ' . $project->name . ' - ' . $langs->trans("ListOfConferencesOrBooths");
297
+		$title = $project->ref.' '.$project->name.' - '.$langs->trans("ListOfConferencesOrBooths");
298 298
 	}
299 299
 }
300 300
 
@@ -724,7 +724,7 @@  discard block
 block discarded – undo
724 724
 }
725 725
 $massactionbutton = $form->selectMassAction('', $arrayofmassactions);
726 726
 
727
-print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($projectid)?'?projectid='.$projectid:'').'">'."\n";
727
+print '<form method="POST" id="searchFormList" action="'.$_SERVER["PHP_SELF"].(!empty($projectid) ? '?projectid='.$projectid : '').'">'."\n";
728 728
 if ($optioncss != '') {
729 729
 	print '<input type="hidden" name="optioncss" value="'.$optioncss.'">';
730 730
 }
@@ -740,10 +740,10 @@  discard block
 block discarded – undo
740 740
 
741 741
 
742 742
 $newcardbutton = '';
743
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.(!empty($project->id)?'&withproject=1&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
744
-$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.(!empty($project->id)?'&withproject=1&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
743
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-bars imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ((empty($mode) || $mode == 'common') ? 2 : 1), array('morecss'=>'reposition'));
744
+$newcardbutton .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=kanban'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').preg_replace('/(&|\?)*mode=[^&]+/', '', $param), '', ($mode == 'kanban' ? 2 : 1), array('morecss'=>'reposition'));
745 745
 $newcardbutton .= dolGetButtonTitleSeparator();
746
-$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?action=create'.(!empty($project->id)?'&withproject=1&fk_project='.$project->id:'').(!empty($project->socid)?'&fk_soc='.$project->socid:'').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id)?'?projectid='.$project->id:''), '', $permissiontoadd);
746
+$newcardbutton .= dolGetButtonTitle($langs->trans('New'), '', 'fa fa-plus-circle', DOL_URL_ROOT.'/eventorganization/conferenceorbooth_card.php?action=create'.(!empty($project->id) ? '&withproject=1&fk_project='.$project->id : '').(!empty($project->socid) ? '&fk_soc='.$project->socid : '').'&backtopage='.urlencode($_SERVER['PHP_SELF']).(!empty($project->id) ? '?projectid='.$project->id : ''), '', $permissiontoadd);
747 747
 
748 748
 print_barre_liste($title, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, $massactionbutton, $num, $nbtotalofrecords, $object->picto, 0, $newcardbutton, '', $limit, 0, 0, 1);
749 749
 
@@ -895,7 +895,7 @@  discard block
 block discarded – undo
895 895
 	} 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'])) {
896 896
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
897 897
 	}
898
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
898
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
899 899
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
900 900
 		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";
901 901
 		$totalarray['nbfield']++;
@@ -1008,7 +1008,7 @@  discard block
 block discarded – undo
1008 1008
 				if ($key == 'status') {
1009 1009
 					print $object->getLibStatut(5);
1010 1010
 				} elseif ($key == 'ref') {
1011
-					print $object->getNomUrl(1, 0, '', (($projectid > 0)?'withproject':''));
1011
+					print $object->getNomUrl(1, 0, '', (($projectid > 0) ? 'withproject' : ''));
1012 1012
 				} else {
1013 1013
 					print $object->showOutputField($val, $key, $object->$key, '');
1014 1014
 				}
Please login to merge, or discard this patch.
htdocs/compta/facture/invoicetemplate_list.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 $search_date_endday = GETPOST('search_date_endday', 'int');
81 81
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
82 82
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
83
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
83
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
84 84
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
85 85
 $search_date_when_startday = GETPOST('search_date_when_startday', 'int');
86 86
 $search_date_when_startmonth = GETPOST('search_date_when_startmonth', 'int');
@@ -88,7 +88,7 @@  discard block
 block discarded – undo
88 88
 $search_date_when_endday = GETPOST('search_date_when_endday', 'int');
89 89
 $search_date_when_endmonth = GETPOST('search_date_when_endmonth', 'int');
90 90
 $search_date_when_endyear = GETPOST('search_date_when_endyear', 'int');
91
-$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear);	// Use tzserver
91
+$search_date_when_start = dol_mktime(0, 0, 0, $search_date_when_startmonth, $search_date_when_startday, $search_date_when_startyear); // Use tzserver
92 92
 $search_date_when_end = dol_mktime(23, 59, 59, $search_date_when_endmonth, $search_date_when_endday, $search_date_when_endyear);
93 93
 $search_recurring = GETPOST('search_recurring', 'int');
94 94
 $search_frequency = GETPOST('search_frequency', 'alpha');
Please login to merge, or discard this patch.
htdocs/fourn/paiement/list.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,9 @@
 block discarded – undo
49 49
 $socid = GETPOST('socid', 'int');
50 50
 
51 51
 // Security check
52
-if ($user->socid) $socid = $user->socid;
52
+if ($user->socid) {
53
+	$socid = $user->socid;
54
+}
53 55
 
54 56
 $search_ref				= GETPOST('search_ref', 'alpha');
55 57
 $search_date_startday	= GETPOST('search_date_startday', 'int');
Please login to merge, or discard this patch.
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -53,20 +53,20 @@  discard block
 block discarded – undo
53 53
 // Security check
54 54
 if ($user->socid) $socid = $user->socid;
55 55
 
56
-$search_ref				= GETPOST('search_ref', 'alpha');
57
-$search_date_startday	= GETPOST('search_date_startday', 'int');
58
-$search_date_startmonth	= GETPOST('search_date_startmonth', 'int');
59
-$search_date_startyear	= GETPOST('search_date_startyear', 'int');
56
+$search_ref = GETPOST('search_ref', 'alpha');
57
+$search_date_startday = GETPOST('search_date_startday', 'int');
58
+$search_date_startmonth = GETPOST('search_date_startmonth', 'int');
59
+$search_date_startyear = GETPOST('search_date_startyear', 'int');
60 60
 $search_date_endday		= GETPOST('search_date_endday', 'int');
61
-$search_date_endmonth	= GETPOST('search_date_endmonth', 'int');
61
+$search_date_endmonth = GETPOST('search_date_endmonth', 'int');
62 62
 $search_date_endyear	= GETPOST('search_date_endyear', 'int');
63
-$search_date_start		= dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
63
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
64 64
 $search_date_end		= dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
65 65
 $search_company			= GETPOST('search_company', 'alpha');
66 66
 $search_payment_type	= GETPOST('search_payment_type');
67
-$search_cheque_num		= GETPOST('search_cheque_num', 'alpha');
67
+$search_cheque_num = GETPOST('search_cheque_num', 'alpha');
68 68
 $search_bank_account	= GETPOST('search_bank_account', 'int');
69
-$search_amount			= GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
69
+$search_amount = GETPOST('search_amount', 'alpha'); // alpha because we must be able to search on '< x'
70 70
 
71 71
 $limit = GETPOST('limit', 'int') ? GETPOST('limit', 'int') : $conf->liste_limit;
72 72
 $sortfield				= GETPOST('sortfield', 'aZ09comma');
@@ -207,10 +207,10 @@  discard block
 block discarded – undo
207 207
 	$sql .= natural_search('p.ref', $search_ref);
208 208
 }
209 209
 if ($search_date_start) {
210
-	$sql .= " AND p.datep >= '" . $db->idate($search_date_start) . "'";
210
+	$sql .= " AND p.datep >= '".$db->idate($search_date_start)."'";
211 211
 }
212 212
 if ($search_date_end) {
213
-	$sql .=" AND p.datep <= '" . $db->idate($search_date_end) . "'";
213
+	$sql .= " AND p.datep <= '".$db->idate($search_date_end)."'";
214 214
 }
215 215
 
216 216
 if ($search_company) {
Please login to merge, or discard this patch.
htdocs/core/ajax/fetchKnowledgeRecord.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,12 +81,12 @@
 block discarded – undo
81 81
 		$response = array();
82 82
 		while ($i < $num) {
83 83
 			$obj = $db->fetch_object($resql);
84
-			$response[] = array('title'=>$obj->question,'ref'=>$obj->ref,'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)),'url'=>$obj->url);
84
+			$response[] = array('title'=>$obj->question, 'ref'=>$obj->ref, 'answer'=>dol_escape_htmltag(preg_replace('/\\r|\\r\\n|\\n/', "", $obj->answer)), 'url'=>$obj->url);
85 85
 			$i++;
86 86
 		}
87 87
 	} else {
88 88
 		dol_print_error($db);
89 89
 	}
90
-	$response =json_encode($response);
90
+	$response = json_encode($response);
91 91
 	echo $response;
92 92
 }
Please login to merge, or discard this patch.