Passed
Push — GENERAL_BUG_REVIEW_240911 ( 776d89...c757bd )
by Rafael
50:33
created
public/htdocs/core/modules/export/export_tsv.modules.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
     }
152 152
 
153 153
 
154
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
154
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
155 155
     /**
156 156
      *   Open output file
157 157
      *
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
      */
162 162
     public function open_file($file, $outputlangs)
163 163
     {
164
-		// phpcs:enable
164
+        // phpcs:enable
165 165
         global $langs;
166 166
 
167 167
         dol_syslog("ExportTsv::open_file file=" . $file);
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
         return $ret;
180 180
     }
181 181
 
182
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
182
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
183 183
     /**
184 184
      *  Output header into file
185 185
      *
@@ -188,12 +188,12 @@  discard block
 block discarded – undo
188 188
      */
189 189
     public function write_header($outputlangs)
190 190
     {
191
-		// phpcs:enable
191
+        // phpcs:enable
192 192
         return 0;
193 193
     }
194 194
 
195 195
 
196
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
196
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
197 197
     /**
198 198
      *  Output title line into file
199 199
      *
@@ -205,7 +205,7 @@  discard block
 block discarded – undo
205 205
      */
206 206
     public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
207 207
     {
208
-		// phpcs:enable
208
+        // phpcs:enable
209 209
         $selectlabel = array();
210 210
         foreach ($array_selected_sorted as $code => $value) {
211 211
             $newvalue = $outputlangs->transnoentities($array_export_fields_label[$code]); // newvalue is now $outputlangs->charset_output encoded
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
     }
227 227
 
228 228
 
229
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
229
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
230 230
     /**
231 231
      *  Output record line into file
232 232
      *
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
      */
239 239
     public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
240 240
     {
241
-		// phpcs:enable
241
+        // phpcs:enable
242 242
         global $conf;
243 243
 
244 244
         $this->col = 0;
@@ -284,7 +284,7 @@  discard block
 block discarded – undo
284 284
         return 0;
285 285
     }
286 286
 
287
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
287
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
288 288
     /**
289 289
      *  Output footer into file
290 290
      *
@@ -293,11 +293,11 @@  discard block
 block discarded – undo
293 293
      */
294 294
     public function write_footer($outputlangs)
295 295
     {
296
-		// phpcs:enable
296
+        // phpcs:enable
297 297
         return 0;
298 298
     }
299 299
 
300
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
300
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
301 301
     /**
302 302
      *  Close file handle
303 303
      *
@@ -305,12 +305,12 @@  discard block
 block discarded – undo
305 305
      */
306 306
     public function close_file()
307 307
     {
308
-		// phpcs:enable
308
+        // phpcs:enable
309 309
         fclose($this->handle);
310 310
         return 0;
311 311
     }
312 312
 
313
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
313
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
314 314
     /**
315 315
      * Clean a cell to respect rules of TSV file cells
316 316
      *
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
      */
321 321
     public function tsv_clean($newvalue, $charset)
322 322
     {
323
-		// phpcs:enable
323
+        // phpcs:enable
324 324
         // Rule Dolibarr: No HTML
325 325
         $newvalue = dol_string_nohtmltag($newvalue, 1, $charset);
326 326
 
Please login to merge, or discard this patch.
public/htdocs/core/modules/export/exportcsv.class.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
129 129
     }
130 130
 
131 131
 
132
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
132
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
133 133
     /**
134 134
      *  Open output file
135 135
      *
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
      */
140 140
     public function open_file($file, $outputlangs)
141 141
     {
142
-		// phpcs:enable
142
+        // phpcs:enable
143 143
         global $langs;
144 144
 
145 145
         dol_syslog("ExportCsv::open_file file=" . $file);
@@ -157,7 +157,7 @@  discard block
 block discarded – undo
157 157
         return $ret;
158 158
     }
159 159
 
160
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
160
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
161 161
     /**
162 162
      *  Output header into file
163 163
      *
@@ -166,12 +166,12 @@  discard block
 block discarded – undo
166 166
      */
167 167
     public function write_header($outputlangs)
168 168
     {
169
-		// phpcs:enable
169
+        // phpcs:enable
170 170
         return 0;
171 171
     }
172 172
 
173 173
 
174
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
174
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
175 175
     /**
176 176
      *  Output title line into file
177 177
      *
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
      */
184 184
     public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
185 185
     {
186
-		// phpcs:enable
186
+        // phpcs:enable
187 187
         $outputlangs->charset_output = getDolGlobalString('EXPORT_CSV_FORCE_CHARSET');
188 188
 
189 189
         $selectlabel = array();
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
     }
208 208
 
209 209
 
210
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
210
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
211 211
     /**
212 212
      *  Output record line into file
213 213
      *
@@ -219,7 +219,7 @@  discard block
 block discarded – undo
219 219
      */
220 220
     public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
221 221
     {
222
-		// phpcs:enable
222
+        // phpcs:enable
223 223
         global $conf;
224 224
 
225 225
         $outputlangs->charset_output = getDolGlobalString('EXPORT_CSV_FORCE_CHARSET');
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
         return 0;
272 272
     }
273 273
 
274
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
274
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
275 275
     /**
276 276
      *  Output footer into file
277 277
      *
@@ -280,11 +280,11 @@  discard block
 block discarded – undo
280 280
      */
281 281
     public function write_footer($outputlangs)
282 282
     {
283
-		// phpcs:enable
283
+        // phpcs:enable
284 284
         return 0;
285 285
     }
286 286
 
287
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
287
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
288 288
     /**
289 289
      *  Close file handle
290 290
      *
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
      */
293 293
     public function close_file()
294 294
     {
295
-		// phpcs:enable
295
+        // phpcs:enable
296 296
         fclose($this->handle);
297 297
         return 0;
298 298
     }
Please login to merge, or discard this patch.
public/htdocs/core/modules/export/export_csviso.modules.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         $this->version_lib = DOL_VERSION;
62 62
     }
63 63
 
64
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
64
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
65 65
     /**
66 66
      *  Output title line into file
67 67
      *
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         return parent::write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types);
80 80
     }
81 81
 
82
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
82
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
83 83
     /**
84 84
      *  Output record line into file
85 85
      *
Please login to merge, or discard this patch.
public/htdocs/core/modules/export/export_excel2007.modules.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
     }
187 187
 
188 188
 
189
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
189
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
190 190
     /**
191 191
      *  Open output file
192 192
      *
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
      */
197 197
     public function open_file($file, $outputlangs)
198 198
     {
199
-		// phpcs:enable
199
+        // phpcs:enable
200 200
         global $user, $langs;
201 201
 
202 202
         dol_syslog(get_class($this) . "::open_file file=" . $file);
@@ -232,7 +232,7 @@  discard block
 block discarded – undo
232 232
         return $ret;
233 233
     }
234 234
 
235
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
235
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
236 236
     /**
237 237
      *  Write header
238 238
      *
@@ -241,14 +241,14 @@  discard block
 block discarded – undo
241 241
      */
242 242
     public function write_header($outputlangs)
243 243
     {
244
-		// phpcs:enable
244
+        // phpcs:enable
245 245
         //$outputlangs->charset_output='ISO-8859-1';    // Because Excel 5 format is ISO
246 246
 
247 247
         return 0;
248 248
     }
249 249
 
250 250
 
251
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
251
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
252 252
     /**
253 253
      *  Output title line into file
254 254
      *
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
      */
261 261
     public function write_title($array_export_fields_label, $array_selected_sorted, $outputlangs, $array_types)
262 262
     {
263
-		// phpcs:enable
263
+        // phpcs:enable
264 264
 
265 265
         // Create a format for the column headings
266 266
         $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
         return 0;
302 302
     }
303 303
 
304
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
304
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
305 305
     /**
306 306
      *  Output record line into file
307 307
      *
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
313 313
      */
314 314
     public function write_record($array_selected_sorted, $objp, $outputlangs, $array_types)
315 315
     {
316
-		// phpcs:enable
316
+        // phpcs:enable
317 317
 
318 318
         // Define first row
319 319
         $this->col = 1;
@@ -411,7 +411,7 @@  discard block
 block discarded – undo
411 411
     }
412 412
 
413 413
 
414
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
414
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
415 415
     /**
416 416
      *  Write footer
417 417
      *
@@ -420,12 +420,12 @@  discard block
 block discarded – undo
420 420
      */
421 421
     public function write_footer($outputlangs)
422 422
     {
423
-		// phpcs:enable
423
+        // phpcs:enable
424 424
         return 0;
425 425
     }
426 426
 
427 427
 
428
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
428
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
429 429
     /**
430 430
      *  Close Excel file
431 431
      *
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
      */
434 434
     public function close_file()
435 435
     {
436
-		// phpcs:enable
436
+        // phpcs:enable
437 437
 
438 438
         $objWriter = new Xlsx($this->workbook);
439 439
         $objWriter->save($this->file);
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
     }
445 445
 
446 446
 
447
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
447
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
448 448
     /**
449 449
      * Clean a cell to respect rules of Excel file cells
450 450
      *
@@ -453,7 +453,7 @@  discard block
 block discarded – undo
453 453
      */
454 454
     public function excel_clean($newvalue)
455 455
     {
456
-		// phpcs:enable
456
+        // phpcs:enable
457 457
         // Rule Dolibarr: No HTML
458 458
         $newvalue = dol_string_nohtmltag($newvalue);
459 459
 
Please login to merge, or discard this patch.
public/htdocs/core/modules/member/doc/pdf_standard.class.php 1 patch
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
         // use this method in future refactoring
76 76
     }
77 77
 
78
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
78
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
79 79
     /**
80 80
      * Output a sticker on page at position _COUNTX, _COUNTY (_COUNTX and _COUNTY start from 0)
81 81
      * - __LOGO__ is replace with company logo
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
      */
94 94
     public function Add_PDF_card(&$pdf, $textleft, $header, $footer, $outputlangs, $textright = '', $idmember = 0, $photo = '')
95 95
     {
96
-		// phpcs:enable
96
+        // phpcs:enable
97 97
         global $db, $mysoc, $conf, $langs;
98 98
         global $forceimgscalewidth, $forceimgscaleheight;
99 99
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
         }
261 261
     }
262 262
 
263
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
263
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
264 264
     /**
265 265
      *  Function to build PDF on disk, then output on HTTP stream.
266 266
      *
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
      */
275 275
     public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0, $filename = 'tmp_cards')
276 276
     {
277
-		// phpcs:enable
277
+        // phpcs:enable
278 278
         global $user, $conf, $langs, $mysoc, $_Avery_Labels;
279 279
 
280 280
         $this->code = $srctemplatepath;
Please login to merge, or discard this patch.
public/htdocs/core/modules/member/doc/doc_generic_member_odt.class.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
         return $texte;
184 184
     }
185 185
 
186
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
186
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
187 187
     /**
188 188
      *  Function to build a document on disk using the generic odt module.
189 189
      *
@@ -197,7 +197,7 @@  discard block
 block discarded – undo
197 197
      */
198 198
     public function write_file($object, $outputlangs, $srctemplatepath, $mode = 'member', $nooutput = 0, $filename = 'tmp_cards')
199 199
     {
200
-		// phpcs:enable
200
+        // phpcs:enable
201 201
         global $user, $langs, $conf, $mysoc, $hookmanager;
202 202
 
203 203
         if (empty($srctemplatepath)) {
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
         return -1;
416 416
     }
417 417
 
418
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
418
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
419 419
     /**
420 420
      * get substitution array for object
421 421
      *
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
      */
427 427
     public function get_substitutionarray_object($object, $outputlangs, $array_key = 'object')
428 428
     {
429
-		// phpcs:enable
429
+        // phpcs:enable
430 430
         if (!$object instanceof Adherent) {
431 431
             dol_syslog("Expected Adherent object, got " . gettype($object), LOG_ERR);
432 432
             return array();
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -167,7 +167,7 @@
 block discarded – undo
167 167
         $maxfilesizearray = getMaxFileSizeArray();
168 168
         $maxmin = $maxfilesizearray['maxmin'];
169 169
         if ($maxmin > 0) {
170
-            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
170
+            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
171 171
         }
172 172
         $texte .= ' <input type="file" name="uploadfile">';
173 173
         $texte .= '<input type="hidden" value="MEMBER_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
Please login to merge, or discard this patch.
public/htdocs/core/modules/member/modules_cards.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
     public $error = '';
43 43
 
44 44
 
45
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
45
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
46 46
     /**
47 47
      *  Return list of active generation modules
48 48
      *
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
      */
53 53
     public static function liste_modeles($db, $maxfilenamelength = 0)
54 54
     {
55
-		// phpcs:enable
55
+        // phpcs:enable
56 56
         $type = 'member';
57 57
         $list = array();
58 58
 
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
  */
80 80
 function members_card_pdf_create($db, $arrayofmembers, $modele, $outputlangs, $outputdir = '', $template = 'standard', $filename = 'tmp_cards')
81 81
 {
82
-	// phpcs:enable
82
+    // phpcs:enable
83 83
     global $conf, $langs;
84 84
     $langs->load("members");
85 85
 
Please login to merge, or discard this patch.
public/htdocs/core/modules/import/import_xlsx.modules.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
     }
131 131
 
132 132
 
133
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
133
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
134 134
     /**
135 135
      *  Output header of an example file for this format
136 136
      *
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
      */
140 140
     public function write_header_example($outputlangs)
141 141
     {
142
-		// phpcs:enable
142
+        // phpcs:enable
143 143
         global $user, $conf, $langs, $file;
144 144
         // create a temporary object, the final output will be generated in footer
145 145
         $this->workbook->getProperties()->setCreator($user->getFullName($outputlangs) . ' - Dolibarr ' . DOL_VERSION);
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
         return '';
155 155
     }
156 156
 
157
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
157
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
158 158
     /**
159 159
      *  Output title line of an example file for this format
160 160
      *
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
      */
165 165
     public function write_title_example($outputlangs, $headerlinefields)
166 166
     {
167
-		// phpcs:enable
167
+        // phpcs:enable
168 168
         global $conf;
169 169
         $this->workbook->getActiveSheet()->getStyle('1')->getFont()->setBold(true);
170 170
         $this->workbook->getActiveSheet()->getStyle('1')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_LEFT);
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         return ''; // final output will be generated in footer
181 181
     }
182 182
 
183
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
183
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
184 184
     /**
185 185
      *  Output record of an example file for this format
186 186
      *
@@ -190,7 +190,7 @@  discard block
 block discarded – undo
190 190
      */
191 191
     public function write_record_example($outputlangs, $contentlinevalues)
192 192
     {
193
-		// phpcs:enable
193
+        // phpcs:enable
194 194
         $col = 1;
195 195
         $row = 2;
196 196
         foreach ($contentlinevalues as $cell) {
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
         return ''; // final output will be generated in footer
202 202
     }
203 203
 
204
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
204
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
205 205
     /**
206 206
      *  Output footer of an example file for this format
207 207
      *
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
      */
211 211
     public function write_footer_example($outputlangs)
212 212
     {
213
-		// phpcs:enable
213
+        // phpcs:enable
214 214
         // return the file content as a string
215 215
         $tempfile = tempnam(sys_get_temp_dir(), 'dol');
216 216
         $objWriter = new PhpOffice\PhpSpreadsheet\Writer\Xlsx($this->workbook);
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
 
226 226
 
227 227
 
228
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
228
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
229 229
     /**
230 230
      *  Open input file
231 231
      *
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
      */
235 235
     public function import_open_file($file)
236 236
     {
237
-		// phpcs:enable
237
+        // phpcs:enable
238 238
         global $langs;
239 239
         $ret = 1;
240 240
 
@@ -249,7 +249,7 @@  discard block
 block discarded – undo
249 249
     }
250 250
 
251 251
 
252
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
252
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
253 253
     /**
254 254
      *  Return nb of records. File must be closed.
255 255
      *
@@ -258,7 +258,7 @@  discard block
 block discarded – undo
258 258
      */
259 259
     public function import_get_nb_of_lines($file)
260 260
     {
261
-		// phpcs:enable
261
+        // phpcs:enable
262 262
         $reader = new Xlsx();
263 263
         $this->workbook = $reader->load($file);
264 264
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
     }
272 272
 
273 273
 
274
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
274
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
275 275
     /**
276 276
      *  Input header line from file
277 277
      *
@@ -279,7 +279,7 @@  discard block
 block discarded – undo
279 279
      */
280 280
     public function import_read_header()
281 281
     {
282
-		// phpcs:enable
282
+        // phpcs:enable
283 283
         // This is not called by the import code !!!
284 284
         $this->headers = array();
285 285
         $xlsx = new Xlsx();
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
     }
293 293
 
294 294
 
295
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
295
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
296 296
     /**
297 297
      *  Return array of next record in input file.
298 298
      *
@@ -300,7 +300,7 @@  discard block
 block discarded – undo
300 300
      */
301 301
     public function import_read_record()
302 302
     {
303
-		// phpcs:enable
303
+        // phpcs:enable
304 304
         global $conf;
305 305
 
306 306
         $rowcount = $this->workbook->getActiveSheet()->getHighestDataRow();
@@ -320,7 +320,7 @@  discard block
 block discarded – undo
320 320
         return $array;
321 321
     }
322 322
 
323
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
323
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
324 324
     /**
325 325
      *  Close file handle
326 326
      *
@@ -328,7 +328,7 @@  discard block
 block discarded – undo
328 328
      */
329 329
     public function import_close_file()
330 330
     {
331
-		// phpcs:enable
331
+        // phpcs:enable
332 332
         $this->workbook->disconnectWorksheets();
333 333
         unset($this->workbook);
334 334
         return 0;
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 
337 337
 
338 338
     // What is this doing here ? it is common to all imports, is should be in the parent class
339
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
339
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
340 340
     /**
341 341
      * Insert a record into database
342 342
      *
@@ -350,7 +350,7 @@  discard block
 block discarded – undo
350 350
      */
351 351
     public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
352 352
     {
353
-		// phpcs:enable
353
+        // phpcs:enable
354 354
         global $langs, $conf, $user;
355 355
         global $thirdparty_static; // Specific to thirdparty import
356 356
         global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -520,7 +520,7 @@  discard block
 block discarded – undo
520 520
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
521 521
                                             if ($classinstance->id != '') { // id may be 0, it is a found value
522 522
                                                 $newval = $classinstance->id;
523
-                                            } elseif (! $error) {
523
+                                            } elseif (!$error) {
524 524
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
525 525
                                                     // @phan-suppress-next-line PhanPluginSuspiciousParamPosition
526 526
                                                     $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
@@ -697,7 +697,7 @@  discard block
 block discarded – undo
697 697
                                     $classinstance = new $class($this->db);
698 698
                                     $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, $key));
699 699
                                     if (empty($classinstance->error) && empty($classinstance->errors)) {
700
-                                        $newval = $res;     // We get new value computed.
700
+                                        $newval = $res; // We get new value computed.
701 701
                                     } else {
702 702
                                         $this->errors[$error]['type'] = 'CLASSERROR';
703 703
                                         $this->errors[$error]['lib'] = implode(
@@ -798,11 +798,11 @@  discard block
 block discarded – undo
798 798
                         if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
799 799
                             if (!in_array("socialnetworks", $listfields)) {
800 800
                                 $listfields[] = "socialnetworks";
801
-                                $socialkey = array_search("socialnetworks", $listfields);   // Return position of 'socialnetworks' key in array. Example socialkey=19
801
+                                $socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
802 802
                                 $listvalues[$socialkey] = '';
803 803
                             }
804 804
                             if (!empty($newval) && $arrayrecord[($key)]['type'] > 0) {
805
-                                $socialkey = array_search("socialnetworks", $listfields);   // Return position of 'socialnetworks' key in array. Example socialkey=19
805
+                                $socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
806 806
                                 $socialnetwork = explode("_", $fieldname)[1];
807 807
                                 if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
808 808
                                     $json = new stdClass();
@@ -928,7 +928,7 @@  discard block
 block discarded – undo
928 928
 
929 929
                                 $data = array_combine($listfields, $listvalues);
930 930
 
931
-                                $where = array();   // filters to forge SQL request
931
+                                $where = array(); // filters to forge SQL request
932 932
                                 // @phpstan-ignore-next-line
933 933
                                 '@phan-var string[] $where';
934 934
                                 $filters = array(); // filters to forge output error message
@@ -1021,7 +1021,7 @@  discard block
 block discarded – undo
1021 1021
                                 // We db escape social network field because he isn't in field creation
1022 1022
                                 if (in_array("socialnetworks", $listfields)) {
1023 1023
                                     $socialkey = array_search("socialnetworks", $listfields);
1024
-                                    $tmpsql =  $listvalues[$socialkey];
1024
+                                    $tmpsql = $listvalues[$socialkey];
1025 1025
                                     $listvalues[$socialkey] = "'" . $this->db->escape($tmpsql) . "'";
1026 1026
                                 }
1027 1027
 
@@ -1031,7 +1031,7 @@  discard block
 block discarded – undo
1031 1031
                                 $data = array_combine($listfields, $listvalues);
1032 1032
                                 $set = array();
1033 1033
                                 foreach ($data as $key => $val) {
1034
-                                    $set[] = $key . " = " . $val;   // $val was escaped/sanitized previously
1034
+                                    $set[] = $key . " = " . $val; // $val was escaped/sanitized previously
1035 1035
                                 }
1036 1036
                                 $sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
1037 1037
 
@@ -1070,7 +1070,7 @@  discard block
 block discarded – undo
1070 1070
                             // We db escape social network field because he isn't in field creation
1071 1071
                             if (in_array("socialnetworks", $listfields)) {
1072 1072
                                 $socialkey = array_search("socialnetworks", $listfields);
1073
-                                $tmpsql =  $listvalues[$socialkey];
1073
+                                $tmpsql = $listvalues[$socialkey];
1074 1074
                                 $listvalues[$socialkey] = "'" . $this->db->escape($tmpsql) . "'";
1075 1075
                             }
1076 1076
 
Please login to merge, or discard this patch.
public/htdocs/core/modules/import/import_csv.modules.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
     }
116 116
 
117 117
 
118
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
118
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
119 119
     /**
120 120
      *  Output header of an example file for this format
121 121
      *
@@ -124,11 +124,11 @@  discard block
 block discarded – undo
124 124
      */
125 125
     public function write_header_example($outputlangs)
126 126
     {
127
-		// phpcs:enable
127
+        // phpcs:enable
128 128
         return '';
129 129
     }
130 130
 
131
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
131
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
132 132
     /**
133 133
      *  Output title line of an example file for this format
134 134
      *
@@ -138,12 +138,12 @@  discard block
 block discarded – undo
138 138
      */
139 139
     public function write_title_example($outputlangs, $headerlinefields)
140 140
     {
141
-		// phpcs:enable
141
+        // phpcs:enable
142 142
         $s = implode($this->separator, array_map('cleansep', $headerlinefields));
143 143
         return $s . "\n";
144 144
     }
145 145
 
146
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
146
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
147 147
     /**
148 148
      *  Output record of an example file for this format
149 149
      *
@@ -153,12 +153,12 @@  discard block
 block discarded – undo
153 153
      */
154 154
     public function write_record_example($outputlangs, $contentlinevalues)
155 155
     {
156
-		// phpcs:enable
156
+        // phpcs:enable
157 157
         $s = implode($this->separator, array_map('cleansep', $contentlinevalues));
158 158
         return $s . "\n";
159 159
     }
160 160
 
161
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
161
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
162 162
     /**
163 163
      *  Output footer of an example file for this format
164 164
      *
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
      */
168 168
     public function write_footer_example($outputlangs)
169 169
     {
170
-		// phpcs:enable
170
+        // phpcs:enable
171 171
         return '';
172 172
     }
173 173
 
174 174
 
175
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
175
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
176 176
     /**
177 177
      *  Open input file
178 178
      *
@@ -181,7 +181,7 @@  discard block
 block discarded – undo
181 181
      */
182 182
     public function import_open_file($file)
183 183
     {
184
-		// phpcs:enable
184
+        // phpcs:enable
185 185
         global $langs;
186 186
         $ret = 1;
187 187
 
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
     }
203 203
 
204 204
 
205
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
205
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
206 206
     /**
207 207
      *  Return nb of records. File must be closed.
208 208
      *
@@ -211,12 +211,12 @@  discard block
 block discarded – undo
211 211
      */
212 212
     public function import_get_nb_of_lines($file)
213 213
     {
214
-		// phpcs:enable
214
+        // phpcs:enable
215 215
         return dol_count_nb_of_line($file);
216 216
     }
217 217
 
218 218
 
219
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
219
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
220 220
     /**
221 221
      *  Input header line from file
222 222
      *
@@ -224,12 +224,12 @@  discard block
 block discarded – undo
224 224
      */
225 225
     public function import_read_header()
226 226
     {
227
-		// phpcs:enable
227
+        // phpcs:enable
228 228
         return 0;
229 229
     }
230 230
 
231 231
 
232
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
232
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
233 233
     /**
234 234
      *  Return array of next record in input file.
235 235
      *
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
      */
238 238
     public function import_read_record()
239 239
     {
240
-		// phpcs:enable
240
+        // phpcs:enable
241 241
         global $conf;
242 242
 
243 243
         $arrayres = fgetcsv($this->handle, 100000, $this->separator, $this->enclosure, $this->escape);
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
         return $newarrayres;
278 278
     }
279 279
 
280
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
280
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
281 281
     /**
282 282
      *  Close file handle
283 283
      *
@@ -285,13 +285,13 @@  discard block
 block discarded – undo
285 285
      */
286 286
     public function import_close_file()
287 287
     {
288
-		// phpcs:enable
288
+        // phpcs:enable
289 289
         fclose($this->handle);
290 290
         return 0;
291 291
     }
292 292
 
293 293
 
294
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
294
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
295 295
     /**
296 296
      * Insert a record into database
297 297
      *
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
      */
306 306
     public function import_insert($arrayrecord, $array_match_file_to_database, $objimport, $maxfields, $importid, $updatekeys)
307 307
     {
308
-		// phpcs:enable
308
+        // phpcs:enable
309 309
         global $langs, $conf, $user;
310 310
         global $thirdparty_static; // Specific to thirdparty import
311 311
         global $tablewithentity_cache; // Cache to avoid to call  desc at each rows on tables
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
477 477
                                             if ($classinstance->id != '') { // id may be 0, it is a found value
478 478
                                                 $newval = $classinstance->id;
479
-                                            } elseif (! $error) {
479
+                                            } elseif (!$error) {
480 480
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
481 481
                                                     $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
482 482
                                                 } elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
@@ -649,7 +649,7 @@  discard block
 block discarded – undo
649 649
                                     $classinstance = new $class($this->db);
650 650
                                     $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, ($key - 1)));
651 651
                                     if (empty($classinstance->error) && empty($classinstance->errors)) {
652
-                                        $newval = $res;     // We get new value computed.
652
+                                        $newval = $res; // We get new value computed.
653 653
                                     } else {
654 654
                                         $this->errors[$error]['type'] = 'CLASSERROR';
655 655
                                         $this->errors[$error]['lib'] = implode(
@@ -747,12 +747,12 @@  discard block
 block discarded – undo
747 747
                         if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
748 748
                             if (!in_array("socialnetworks", $listfields)) {
749 749
                                 $listfields[] = "socialnetworks";
750
-                                $socialkey = array_search("socialnetworks", $listfields);   // Return position of 'socialnetworks' key in array
750
+                                $socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
751 751
                                 $listvalues[$socialkey] = '';
752 752
                             }
753 753
                             //var_dump($newval); var_dump($arrayrecord[($key - 1)]['type']);
754 754
                             if (!empty($newval) && $arrayrecord[($key - 1)]['type'] > 0) {
755
-                                $socialkey = array_search("socialnetworks", $listfields);   // Return position of 'socialnetworks' key in array
755
+                                $socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
756 756
                                 //var_dump('sk='.$socialkey);   // socialkey=19
757 757
                                 $socialnetwork = explode("_", $fieldname)[1];
758 758
                                 if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
@@ -875,7 +875,7 @@  discard block
 block discarded – undo
875 875
                             if (empty($lastinsertid)) { // No insert done yet for a parent table
876 876
                                 $sqlSelect = "SELECT " . $fname . " FROM " . $tablename;
877 877
                                 $data = array_combine($listfields, $listvalues);
878
-                                $where = array();   // filters to forge SQL request
878
+                                $where = array(); // filters to forge SQL request
879 879
                                 $filters = array(); // filters to forge output error message
880 880
                                 foreach ($updatekeys as $key) {
881 881
                                     $col = $objimport->array_import_updatekeys[0][$key];
@@ -965,7 +965,7 @@  discard block
 block discarded – undo
965 965
                                 // We db escape social network field because he isn't in field creation
966 966
                                 if (in_array("socialnetworks", $listfields)) {
967 967
                                     $socialkey = array_search("socialnetworks", $listfields);
968
-                                    $tmpsql =  $listvalues[$socialkey];
968
+                                    $tmpsql = $listvalues[$socialkey];
969 969
                                     $listvalues[$socialkey] = "'" . $this->db->escape($tmpsql) . "'";
970 970
                                 }
971 971
 
@@ -975,7 +975,7 @@  discard block
 block discarded – undo
975 975
                                 $data = array_combine($listfields, $listvalues);
976 976
                                 $set = array();
977 977
                                 foreach ($data as $key => $val) {
978
-                                    $set[] = $key . " = " . $val;   // $val was escaped/sanitized previously
978
+                                    $set[] = $key . " = " . $val; // $val was escaped/sanitized previously
979 979
                                 }
980 980
                                 $sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
981 981
 
@@ -1014,7 +1014,7 @@  discard block
 block discarded – undo
1014 1014
                             // We db escape social network field because he isn't in field creation
1015 1015
                             if (in_array("socialnetworks", $listfields)) {
1016 1016
                                 $socialkey = array_search("socialnetworks", $listfields);
1017
-                                $tmpsql =  $listvalues[$socialkey];
1017
+                                $tmpsql = $listvalues[$socialkey];
1018 1018
                                 $listvalues[$socialkey] = "'" . $this->db->escape($tmpsql) . "'";
1019 1019
                             }
1020 1020
 
Please login to merge, or discard this patch.