Passed
Push — main ( e2b3b9...324b47 )
by Rafael
46:15
created
htdocs/core/modules/product/doc/doc_generic_product_odt.modules.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -188,7 +188,7 @@  discard block
 block discarded – undo
188 188
         return $texte;
189 189
     }
190 190
 
191
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
191
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
192 192
     /**
193 193
      *  Function to build a document on disk using the generic odt module.
194 194
      *
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
      */
203 203
     public function write_file($object, $outputlangs, $srctemplatepath, $hidedetails = 0, $hidedesc = 0, $hideref = 0)
204 204
     {
205
-		// phpcs:enable
205
+        // phpcs:enable
206 206
         global $product, $langs, $conf, $mysoc, $hookmanager, $user;
207 207
 
208 208
         if (empty($srctemplatepath)) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -171,7 +171,7 @@
 block discarded – undo
171 171
         $maxfilesizearray = getMaxFileSizeArray();
172 172
         $maxmin = $maxfilesizearray['maxmin'];
173 173
         if ($maxmin > 0) {
174
-            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">';    // MAX_FILE_SIZE must precede the field type=file
174
+            $texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="' . ($maxmin * 1024) . '">'; // MAX_FILE_SIZE must precede the field type=file
175 175
         }
176 176
         $texte .= ' <input type="file" name="uploadfile">';
177 177
         $texte .= '<input type="hidden" value="PRODUCT_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
Please login to merge, or discard this patch.
htdocs/core/modules/product/mod_codeproduct_elephant.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
     }
209 209
 
210 210
 
211
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
211
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
212 212
     /**
213 213
      *   Check if mask/numbering use prefix
214 214
      *
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
      */
217 217
     public function verif_prefixIsUsed()
218 218
     {
219
-		// phpcs:enable
219
+        // phpcs:enable
220 220
         global $conf;
221 221
 
222 222
         $mask = getDolGlobalString('PRODUCT_ELEPHANT_MASK_PRODUCT');
@@ -286,7 +286,7 @@  discard block
 block discarded – undo
286 286
     }
287 287
 
288 288
 
289
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
289
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
290 290
     /**
291 291
      *  Indicate if the code is available or not (by another third party)
292 292
      *
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
      */
298 298
     public function verif_dispo($db, $code, $product)
299 299
     {
300
-		// phpcs:enable
300
+        // phpcs:enable
301 301
         $sql = "SELECT ref FROM " . MAIN_DB_PREFIX . "product";
302 302
         $sql .= " WHERE ref = '" . $db->escape($code) . "'";
303 303
         if ($product->id > 0) {
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -257,7 +257,7 @@
 block discarded – undo
257 257
         $code = strtoupper(trim($code));
258 258
 
259 259
         if (empty($code) && $this->code_null && !getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED')) {
260
-            $result = 0;  // @phan-suppress-current-line PhanPluginRedundantAssignment
260
+            $result = 0; // @phan-suppress-current-line PhanPluginRedundantAssignment
261 261
         } elseif (empty($code) && (!$this->code_null || getDolGlobalString('MAIN_COMPANY_CODE_ALWAYS_REQUIRED'))) {
262 262
             $result = -2;
263 263
         } else {
Please login to merge, or discard this patch.
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
@@ -517,7 +517,7 @@  discard block
 block discarded – undo
517 517
                                             //print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
518 518
                                             if ($classinstance->id != '') { // id may be 0, it is a found value
519 519
                                                 $newval = $classinstance->id;
520
-                                            } elseif (! $error) {
520
+                                            } elseif (!$error) {
521 521
                                                 if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
522 522
                                                     // @phan-suppress-next-line PhanPluginSuspiciousParamPosition
523 523
                                                     $this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', $key, $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
@@ -694,7 +694,7 @@  discard block
 block discarded – undo
694 694
                                     $classinstance = new $class($this->db);
695 695
                                     $res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, $key));
696 696
                                     if (empty($classinstance->error) && empty($classinstance->errors)) {
697
-                                        $newval = $res;     // We get new value computed.
697
+                                        $newval = $res; // We get new value computed.
698 698
                                     } else {
699 699
                                         $this->errors[$error]['type'] = 'CLASSERROR';
700 700
                                         $this->errors[$error]['lib'] = implode(
@@ -795,11 +795,11 @@  discard block
 block discarded – undo
795 795
                         if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
796 796
                             if (!in_array("socialnetworks", $listfields)) {
797 797
                                 $listfields[] = "socialnetworks";
798
-                                $socialkey = array_search("socialnetworks", $listfields);   // Return position of 'socialnetworks' key in array. Example socialkey=19
798
+                                $socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
799 799
                                 $listvalues[$socialkey] = '';
800 800
                             }
801 801
                             if (!empty($newval) && $arrayrecord[($key)]['type'] > 0) {
802
-                                $socialkey = array_search("socialnetworks", $listfields);   // Return position of 'socialnetworks' key in array. Example socialkey=19
802
+                                $socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array. Example socialkey=19
803 803
                                 $socialnetwork = explode("_", $fieldname)[1];
804 804
                                 if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
805 805
                                     $json = new stdClass();
@@ -922,7 +922,7 @@  discard block
 block discarded – undo
922 922
 
923 923
                                 $data = array_combine($listfields, $listvalues);
924 924
 
925
-                                $where = array();   // filters to forge SQL request
925
+                                $where = array(); // filters to forge SQL request
926 926
                                 '@phan-var string[] $where';
927 927
                                 $filters = array(); // filters to forge output error message
928 928
                                 foreach ($updatekeys as $key) {
@@ -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
 
@@ -1024,7 +1024,7 @@  discard block
 block discarded – undo
1024 1024
                                 $data = array_combine($listfields, $listvalues);
1025 1025
                                 $set = array();
1026 1026
                                 foreach ($data as $key => $val) {
1027
-                                    $set[] = $key . " = " . $val;   // $val was escaped/sanitized previously
1027
+                                    $set[] = $key . " = " . $val; // $val was escaped/sanitized previously
1028 1028
                                 }
1029 1029
                                 $sqlstart .= " SET " . implode(', ', $set) . ", import_key = '" . $this->db->escape($importid) . "'";
1030 1030
 
@@ -1063,7 +1063,7 @@  discard block
 block discarded – undo
1063 1063
                             // We db escape social network field because he isn't in field creation
1064 1064
                             if (in_array("socialnetworks", $listfields)) {
1065 1065
                                 $socialkey = array_search("socialnetworks", $listfields);
1066
-                                $tmpsql =  $listvalues[$socialkey];
1066
+                                $tmpsql = $listvalues[$socialkey];
1067 1067
                                 $listvalues[$socialkey] = "'" . $this->db->escape($tmpsql) . "'";
1068 1068
                             }
1069 1069
 
Please login to merge, or discard this patch.
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.
htdocs/core/modules/bank/modules_bank.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
  */
34 34
 abstract class ModeleBankAccountDoc extends CommonDocGenerator
35 35
 {
36
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
36
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
37 37
     /**
38 38
      *  Return list of active generation modules
39 39
      *
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
      */
44 44
     public static function liste_modeles($db, $maxfilenamelength = 0)
45 45
     {
46
-		// phpcs:enable
46
+        // phpcs:enable
47 47
         $type = 'bankaccount';
48 48
         $list = array();
49 49
 
Please login to merge, or discard this patch.
htdocs/core/modules/bank/doc/pdf_sepamandate.modules.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
         $this->heightforfooter = $this->marge_basse + 8;
113 113
     }
114 114
 
115
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
115
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
116 116
     /**
117 117
      *  Function to create pdf of company bank account sepa mandate
118 118
      *
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
      */
128 128
     public function write_file($object, $outputlangs, $srctemplatepath = '', $hidedetails = 0, $hidedesc = 0, $hideref = 0, $moreparams = null)
129 129
     {
130
-		// phpcs:enable
130
+        // phpcs:enable
131 131
         global $conf, $hookmanager, $langs, $user, $mysoc;
132 132
 
133 133
         if (!is_object($outputlangs)) {
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
     }
470 470
 
471 471
 
472
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
472
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
473 473
     /**
474 474
      *   Show table for lines
475 475
      *
@@ -484,15 +484,15 @@  discard block
 block discarded – undo
484 484
      */
485 485
     protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
486 486
     {
487
-		// phpcs:enable
487
+        // phpcs:enable
488 488
         global $conf, $mysoc;
489 489
 
490 490
         $default_font_size = pdf_getPDFFontSize($outputlangs);
491 491
     }
492 492
 
493 493
 
494
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
495
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
494
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
495
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
496 496
     /**
497 497
      *   Show miscellaneous information (payment mode, payment term, ...)
498 498
      *
@@ -504,7 +504,7 @@  discard block
 block discarded – undo
504 504
      */
505 505
     protected function _tableau_info(&$pdf, $object, $posy, $outputlangs)
506 506
     {
507
-		// phpcs:enable
507
+        // phpcs:enable
508 508
         global $conf, $mysoc;
509 509
 
510 510
         $default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -528,8 +528,8 @@  discard block
 block discarded – undo
528 528
     }
529 529
 
530 530
 
531
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
532
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
531
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
532
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
533 533
     /**
534 534
      *  Show area for the customer to sign
535 535
      *
@@ -541,7 +541,7 @@  discard block
 block discarded – undo
541 541
      */
542 542
     protected function _signature_area(&$pdf, $object, $posy, $outputlangs)
543 543
     {
544
-		// phpcs:enable
544
+        // phpcs:enable
545 545
         $default_font_size = pdf_getPDFFontSize($outputlangs);
546 546
         $tab_top = $posy + 4;
547 547
         $tab_hl = 4;
@@ -570,7 +570,7 @@  discard block
 block discarded – undo
570 570
     }
571 571
 
572 572
 
573
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
573
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
574 574
     /**
575 575
      *  Show top header of page.
576 576
      *
@@ -582,7 +582,7 @@  discard block
 block discarded – undo
582 582
      */
583 583
     protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
584 584
     {
585
-		// phpcs:enable
585
+        // phpcs:enable
586 586
         global $langs, $conf, $mysoc;
587 587
 
588 588
         $default_font_size = pdf_getPDFFontSize($outputlangs);
@@ -663,7 +663,7 @@  discard block
 block discarded – undo
663 663
         return 0;
664 664
     }
665 665
 
666
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
666
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
667 667
     /**
668 668
      *  Show footer of page. Need this->emetteur object
669 669
      *
@@ -675,7 +675,7 @@  discard block
 block discarded – undo
675 675
      */
676 676
     protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
677 677
     {
678
-		// phpcs:enable
678
+        // phpcs:enable
679 679
         $showdetails = getDolGlobalInt('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS', 0);
680 680
         return pdf_pagefoot($pdf, $outputlangs, 'PAYMENTORDER_FREE_TEXT', null, $this->marge_basse, $this->marge_gauche, $this->page_hauteur, $object, $showdetails, $hidefreetext);
681 681
     }
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
                 $default_font_size = pdf_getPDFFontSize($outputlangs); // Must be after pdf_getInstance
185 185
 
186 186
                 if (getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS')) {
187
-                    $this->heightforfooter  += 6;
187
+                    $this->heightforfooter += 6;
188 188
                 }
189 189
                 $pdf->SetAutoPageBreak(1, 0);
190 190
 
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                 $tab_top = 50;
222 222
                 $tab_top_newpage = 40;
223 223
 
224
-                $tab_height = $this->page_hauteur - $tab_top - $this->heightforfooter  - $this->heightforfreetext ;
224
+                $tab_height = $this->page_hauteur - $tab_top - $this->heightforfooter - $this->heightforfreetext;
225 225
 
226 226
                 // Show notes
227 227
                 if (!empty($object->note_public)) {
@@ -334,9 +334,9 @@  discard block
 block discarded – undo
334 334
                 if (!empty($object->owner_address)) {
335 335
                     $address = $object->owner_address;
336 336
                 } elseif ($thirdparty->id > 0) {
337
-                    $tmpaddresswithoutcountry = $thirdparty->getFullAddress();  // we test on address without country
337
+                    $tmpaddresswithoutcountry = $thirdparty->getFullAddress(); // we test on address without country
338 338
                     if ($tmpaddresswithoutcountry) {
339
-                        $address = $thirdparty->getFullAddress(1);  // full address
339
+                        $address = $thirdparty->getFullAddress(1); // full address
340 340
                     }
341 341
                 }
342 342
                 $posY = $pdf->GetY();
@@ -411,11 +411,11 @@  discard block
 block discarded – undo
411 411
 
412 412
                 // Show square
413 413
                 if ($pagenb == 1) {
414
-                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $this->heightforinfotot  - $this->heightforfreetext  - $this->heightforfooter, 0, $outputlangs, 0, 0);
415
-                    $bottomlasttab = $this->page_hauteur - $this->heightforinfotot  - $this->heightforfreetext  - $this->heightforfooter  + 1;
414
+                    $this->_tableau($pdf, $tab_top, $this->page_hauteur - $tab_top - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 0, 0);
415
+                    $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1;
416 416
                 } else {
417
-                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $this->heightforinfotot  - $this->heightforfreetext  - $this->heightforfooter, 0, $outputlangs, 1, 0);
418
-                    $bottomlasttab = $this->page_hauteur - $this->heightforinfotot  - $this->heightforfreetext  - $this->heightforfooter  + 1;
417
+                    $this->_tableau($pdf, $tab_top_newpage, $this->page_hauteur - $tab_top_newpage - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter, 0, $outputlangs, 1, 0);
418
+                    $bottomlasttab = $this->page_hauteur - $this->heightforinfotot - $this->heightforfreetext - $this->heightforfooter + 1;
419 419
                 }
420 420
 
421 421
                 //var_dump($tab_top);
Please login to merge, or discard this patch.
htdocs/core/modules/bank/doc/pdf_ban.modules.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
     }
98 98
 
99 99
 
100
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
100
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
101 101
     /**
102 102
      *  Fonction generant le projet sur le disque
103 103
      *
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
107 107
      */
108 108
     public function write_file($object, $outputlangs)
109 109
     {
110
-		// phpcs:enable
110
+        // phpcs:enable
111 111
         global $conf, $hookmanager, $langs, $user;
112 112
 
113 113
         if (!is_object($outputlangs)) {
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
     }
275 275
 
276 276
 
277
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
277
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
278 278
     /**
279 279
      *   Show table for lines
280 280
      *
@@ -289,13 +289,13 @@  discard block
 block discarded – undo
289 289
      */
290 290
     protected function _tableau(&$pdf, $tab_top, $tab_height, $nexY, $outputlangs, $hidetop = 0, $hidebottom = 0)
291 291
     {
292
-		// phpcs:enable
292
+        // phpcs:enable
293 293
         global $conf, $mysoc;
294 294
 
295 295
         $default_font_size = pdf_getPDFFontSize($outputlangs);
296 296
     }
297 297
 
298
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
298
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
299 299
     /**
300 300
      *  Show top header of page.
301 301
      *
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
     protected function _pagehead(&$pdf, $object, $showaddress, $outputlangs)
309 309
     {
310 310
         global $langs, $conf, $mysoc;
311
-		// phpcs:enable
311
+        // phpcs:enable
312 312
 
313 313
         $default_font_size = pdf_getPDFFontSize($outputlangs);
314 314
 
@@ -382,7 +382,7 @@  discard block
 block discarded – undo
382 382
         return 0;
383 383
     }
384 384
 
385
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
385
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
386 386
     /**
387 387
      *      Show footer of page. Need this->emetteur object
388 388
      *
@@ -394,7 +394,7 @@  discard block
 block discarded – undo
394 394
      */
395 395
     protected function _pagefoot(&$pdf, $object, $outputlangs, $hidefreetext = 0)
396 396
     {
397
-		// phpcs:enable
397
+        // phpcs:enable
398 398
         global $conf;
399 399
 
400 400
         $showdetails = !getDolGlobalString('MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS') ? 0 : $conf->global->MAIN_GENERATE_DOCUMENTS_SHOW_FOOT_DETAILS;
Please login to merge, or discard this patch.
htdocs/core/modules/payment/mod_payment_ant.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -143,7 +143,7 @@  discard block
 block discarded – undo
143 143
     }
144 144
 
145 145
 
146
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
146
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
147 147
     /**
148 148
      *  Return next free value
149 149
      *
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
      */
154 154
     public function commande_get_num($objsoc, $objforref)
155 155
     {
156
-		// phpcs:enable
156
+        // phpcs:enable
157 157
         return $this->getNextValue($objsoc, $objforref);
158 158
     }
159 159
 }
Please login to merge, or discard this patch.
htdocs/core/modules/payment/mod_payment_cicada.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
     }
165 165
 
166 166
 
167
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
167
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
168 168
     /**
169 169
      *  Return next free value
170 170
      *
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
      */
175 175
     public function payment_get_num($objsoc, $objforref)
176 176
     {
177
-		// phpcs:enable
177
+        // phpcs:enable
178 178
         return $this->getNextValue($objsoc, $objforref);
179 179
     }
180 180
 }
Please login to merge, or discard this patch.