Completed
Branch develop (26ba86)
by
unknown
16:46
created
htdocs/modulebuilder/template/class/actions_mymodule.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -335,10 +335,10 @@
 block discarded – undo
335 335
 			if (in_array($element, ['context1', 'context2'])) {
336 336
 				$datacount = 0;
337 337
 
338
-				$parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1) . '?id=' . $id . '&module='.$element;
338
+				$parameters['head'][$counter][0] = dol_buildpath('/mymodule/mymodule_tab.php', 1).'?id='.$id.'&module='.$element;
339 339
 				$parameters['head'][$counter][1] = $langs->trans('MyModuleTab');
340 340
 				if ($datacount > 0) {
341
-					$parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">' . $datacount . '</span>';
341
+					$parameters['head'][$counter][1] .= '<span class="badge marginleftonlyshort">'.$datacount.'</span>';
342 342
 				}
343 343
 				$parameters['head'][$counter][2] = 'mymoduleemails';
344 344
 				$counter++;
Please login to merge, or discard this patch.
htdocs/core/class/html.formintervention.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -107,7 +107,7 @@
 block discarded – undo
107 107
 							$out .= '<option value="'.$obj->rowid.'" selected>'.$labeltoshow.'</option>';
108 108
 						} else {
109 109
 							$disabled = 0;
110
-							if (!$obj->fk_statut > 0 && ! $draftonly) {
110
+							if (!$obj->fk_statut > 0 && !$draftonly) {
111 111
 								$disabled = 1;
112 112
 								$labeltoshow .= ' ('.$langs->trans("Draft").')';
113 113
 							}
Please login to merge, or discard this patch.
htdocs/eventorganization/tpl/linkedobjectblock.tpl.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,22 +34,22 @@
 block discarded – undo
34 34
 $total = 0;
35 35
 foreach ($linkedObjectBlock as $key => $objectlink) {
36 36
 	echo '<tr class="oddeven">';
37
-	echo '<td>' . $langs->trans(get_class($objectlink)) . '</td>';
37
+	echo '<td>'.$langs->trans(get_class($objectlink)).'</td>';
38 38
 	echo '<td>'.$objectlink->getNomUrl(1).'</td>';
39 39
 	echo '<td class="center">';
40
-	if (get_class($objectlink)=='ConferenceOrBooth') {
40
+	if (get_class($objectlink) == 'ConferenceOrBooth') {
41 41
 		print  dol_trunc($objectlink->label, 20);
42 42
 	}
43 43
 	print '</td>';
44 44
 	echo '<td class="center">';
45
-	if (get_class($objectlink)=='ConferenceOrBoothAttendee') {
45
+	if (get_class($objectlink) == 'ConferenceOrBoothAttendee') {
46 46
 		print dol_print_date($objectlink->date_subscription);
47 47
 	} else {
48 48
 		print dol_print_date($objectlink->datep);
49 49
 	}
50 50
 	print '</td>';
51 51
 	echo '<td class="right">';
52
-	if (get_class($objectlink)=='ConferenceOrBoothAttendee') {
52
+	if (get_class($objectlink) == 'ConferenceOrBoothAttendee') {
53 53
 		print price($objectlink->amount);
54 54
 	}
55 55
 	print '</td>';
Please login to merge, or discard this patch.
htdocs/imports/emptyexample.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -102,8 +102,8 @@
 block discarded – undo
102 102
 
103 103
 
104 104
 // List of targets fields
105
-$headerlinefields = array();	// Array of fields (label to show)
106
-$contentlinevalues = array();	// Array of example values
105
+$headerlinefields = array(); // Array of fields (label to show)
106
+$contentlinevalues = array(); // Array of example values
107 107
 $i = 0;
108 108
 foreach ($fieldstarget as $code => $label) {
109 109
 	$withoutstar = preg_replace('/\*/', '', $fieldstarget[$code]);
Please login to merge, or discard this patch.
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/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/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.
htdocs/salaries/document.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -214,16 +214,16 @@
 block discarded – undo
214 214
 	print '<table class="border tableforfield centpercent">';
215 215
 
216 216
 	print "<tr>";
217
-	print '<td class="titlefield">' . $langs->trans("DateStartPeriod") . '</td><td>';
217
+	print '<td class="titlefield">'.$langs->trans("DateStartPeriod").'</td><td>';
218 218
 	print dol_print_date($object->datesp, 'day');
219 219
 	print '</td></tr>';
220 220
 
221 221
 	print "<tr>";
222
-	print '<td>' . $langs->trans("DateEndPeriod") . '</td><td>';
222
+	print '<td>'.$langs->trans("DateEndPeriod").'</td><td>';
223 223
 	print dol_print_date($object->dateep, 'day');
224 224
 	print '</td></tr>';
225 225
 
226
-	print '<tr><td>' . $langs->trans("Amount") . '</td><td><span class="amount">' . price($object->amount, 0, $langs, 1, -1, -1, $conf->currency) . '</span></td></tr>';
226
+	print '<tr><td>'.$langs->trans("Amount").'</td><td><span class="amount">'.price($object->amount, 0, $langs, 1, -1, -1, $conf->currency).'</span></td></tr>';
227 227
 
228 228
 	print '<tr><td class="titlefield">'.$langs->trans("NbOfAttachedFiles").'</td><td>'.count($filearray).'</td></tr>';
229 229
 
Please login to merge, or discard this patch.
htdocs/projet/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -152,7 +152,7 @@
 block discarded – undo
152 152
 	while ($i < $num) {
153 153
 		$objp = $db->fetch_object($resql);
154 154
 		$listofoppstatus[$objp->rowid] = $objp->percent;
155
-		$listofopplabel[$objp->rowid] = $objp->label;		// default label if translation from "OppStatus".code not found.
155
+		$listofopplabel[$objp->rowid] = $objp->label; // default label if translation from "OppStatus".code not found.
156 156
 		$listofoppcode[$objp->rowid] = $objp->code;
157 157
 		switch ($objp->code) {
158 158
 			case 'PROSP':
Please login to merge, or discard this patch.