Completed
Branch develop (cad8f2)
by
unknown
16:40
created
htdocs/admin/system/filecheck.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -156,7 +156,7 @@
 block discarded – undo
156 156
 	}
157 157
 }
158 158
 if (GETPOST('target') == 'remote') {
159
-	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only. Same is used into api_setup.class.php.
159
+	$xmlarray = getURLContent($xmlremote, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only. Same is used into api_setup.class.php.
160 160
 
161 161
 	// Return array('content'=>response,'curl_error_no'=>errno,'curl_error_msg'=>errmsg...)
162 162
 	if (!$xmlarray['curl_error_no'] && $xmlarray['http_code'] != '400' && $xmlarray['http_code'] != '404') {
Please login to merge, or discard this patch.
htdocs/datapolicy/class/datapolicycron.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -469,7 +469,7 @@
 block discarded – undo
469 469
 						$object->fetch($obj->rowid);
470 470
 						$object->id = $obj->rowid;
471 471
 
472
-						$action = 'anonymize';	// TODO Offer also action "delete" in setup of module
472
+						$action = 'anonymize'; // TODO Offer also action "delete" in setup of module
473 473
 
474 474
 						if ($action == 'anonymize') {
475 475
 							if ($object->isObjectUsed($obj->rowid) == 0) {			// If object to clean is used
Please login to merge, or discard this patch.
htdocs/api/class/api.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -129,11 +129,11 @@
 block discarded – undo
129 129
 		unset($object->barcode_type_code);
130 130
 		unset($object->barcode_type_label);
131 131
 
132
-		unset($object->mode_reglement);		// We use mode_reglement_id now
133
-		unset($object->cond_reglement);		// We use cond_reglement_id now
134
-		unset($object->note);				// We use note_public or note_private now
135
-		unset($object->contact);			// We use contact_id now
136
-		unset($object->thirdparty);			// We use thirdparty_id or fk_soc or socid now
132
+		unset($object->mode_reglement); // We use mode_reglement_id now
133
+		unset($object->cond_reglement); // We use cond_reglement_id now
134
+		unset($object->note); // We use note_public or note_private now
135
+		unset($object->contact); // We use contact_id now
136
+		unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now
137 137
 
138 138
 		unset($object->projet); // Should be fk_project
139 139
 		unset($object->project); // Should be fk_project
Please login to merge, or discard this patch.
htdocs/fourn/facture/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -193,7 +193,7 @@
 block discarded – undo
193 193
 			$facavoir->fetch($facid);
194 194
 			$invoicecredits[] = $facavoir->getNomUrl(1);
195 195
 		}
196
-		print ' ('.$langs->transnoentities("InvoiceHasAvoir") . (count($invoicecredits) ? ' ' : '') . implode(',', $invoicecredits) . ')';
196
+		print ' ('.$langs->transnoentities("InvoiceHasAvoir").(count($invoicecredits) ? ' ' : '').implode(',', $invoicecredits).')';
197 197
 	}
198 198
 	/*
199 199
 	if ($facidnext > 0) {
Please login to merge, or discard this patch.
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/opensurvey/results.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -270,7 +270,7 @@
 block discarded – undo
270 270
 						$reponsesadd = str_split($obj->reponses);
271 271
 						$lengthresponses = count($reponsesadd);
272 272
 						for ($cpt = $lengthresponses; $cpt > $cleinsertion; $cpt--) {
273
-							$reponsesadd[$cpt] = $reponsesadd[$cpt-1];
273
+							$reponsesadd[$cpt] = $reponsesadd[$cpt - 1];
274 274
 						}
275 275
 						$reponsesadd[$cleinsertion] = '0';
276 276
 						$reponsesadd = implode($reponsesadd);
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.