Passed
Push — main ( 324b47...7af4bb )
by Rafael
43:55
created
htdocs/reception/card.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -966,7 +966,7 @@
 block discarded – undo
966 966
             /**
967 967
              * @var array $suffix2numAsked map HTTP query parameter suffixes (like '1_0') to line indices so that
968 968
              *                             extrafields from HTTP query can be assigned to the correct dispatch line
969
-            */
969
+             */
970 970
             $suffix2numAsked = array();
971 971
             $dispatchLines = array();
972 972
 
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 
344 344
         // Loop lines to calculate $totalqty
345 345
         for ($i = 1; $i <= $num; $i++) {
346
-            $idl = "idl" . $i;    // id line source
346
+            $idl = "idl" . $i; // id line source
347 347
 
348 348
             //$sub_qty = array();
349 349
             //$subtotalqty = 0;
@@ -351,7 +351,7 @@  discard block
 block discarded – undo
351 351
             //$j = 0;
352 352
             //$batch = "batchl".$i."_0";
353 353
             //$stockLocation = "ent1".$i."_0";
354
-            $qty = "qtyl" . $i;   // qty
354
+            $qty = "qtyl" . $i; // qty
355 355
 
356 356
             //reception line for product with no batch management and no multiple stock location
357 357
             if (GETPOST($qty, 'alpha') > 0) {
@@ -365,7 +365,7 @@  discard block
 block discarded – undo
365 365
 
366 366
         if ($totalqty > 0) {  // There is at least one thing to ship
367 367
             for ($i = 1; $i <= $num; $i++) {
368
-                $idl = "idl" . $i;    // id line source
368
+                $idl = "idl" . $i; // id line source
369 369
                 $lineToTest = '';
370 370
                 $lineId = GETPOSTINT($idl);
371 371
                 foreach ($objectsrc->lines as $linesrc) {
@@ -1144,7 +1144,7 @@  discard block
 block discarded – undo
1144 1144
 
1145 1145
                     print '<input type="hidden" name="productl' . $indiceAsked . '" value="' . $line->fk_product . '">';
1146 1146
 
1147
-                    if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1147
+                    if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1148 1148
                         print '<input type="hidden" name="productid' . $indiceAsked . '" value="' . $line->fk_product . '">';
1149 1149
 
1150 1150
                         // Show product and description
@@ -1166,7 +1166,7 @@  discard block
 block discarded – undo
1166 1166
                     print '</td>';
1167 1167
                 } else {
1168 1168
                     print "<td>";
1169
-                    if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1169
+                    if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1170 1170
                         if ($type == 1) {
1171 1171
                             $text = img_object($langs->trans('Service'), 'service');
1172 1172
                         } else {
@@ -1195,7 +1195,7 @@  discard block
 block discarded – undo
1195 1195
 
1196 1196
                 // Qty in source purchase order line
1197 1197
                 print '<td class="center">';
1198
-                if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1198
+                if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1199 1199
                     print $line->qty;
1200 1200
                 }
1201 1201
                 print '<input type="hidden" name="fk_commandefournisseurdet' . $indiceAsked . '" value="' . $line->id . '">';
@@ -1207,7 +1207,7 @@  discard block
 block discarded – undo
1207 1207
                 // Qty already received
1208 1208
                 print '<td class="center">';
1209 1209
                 $quantityDelivered = $objectsrc->receptions[$line->id];
1210
-                if (! array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1210
+                if (!array_key_exists($line->id, $arrayofpurchaselinealreadyoutput)) { // Add test to avoid to show qty twice
1211 1211
                     print $quantityDelivered;
1212 1212
                 }
1213 1213
                 print '<input name="qtydelivered' . $indiceAsked . '" id="qtydelivered' . $indiceAsked . '" type="hidden" value="' . $quantityDelivered . '">';
Please login to merge, or discard this patch.
htdocs/admin/dolistore/class/dolistore.class.php 2 patches
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -198,7 +198,7 @@  discard block
 block discarded – undo
198 198
         }
199 199
     }
200 200
 
201
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
201
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
202 202
     /**
203 203
      * Return tree of Dolistore categories. $this->categories must have been loaded before.
204 204
      *
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
      */
208 208
     public function get_categories($parent = 0)
209 209
     {
210
-		// phpcs:enable
210
+        // phpcs:enable
211 211
         if (!isset($this->categories)) {
212 212
             die('not possible');
213 213
         }
@@ -245,7 +245,7 @@  discard block
 block discarded – undo
245 245
         }
246 246
     }
247 247
 
248
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
248
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
249 249
     /**
250 250
      * Return list of product formatted for output
251 251
      *
@@ -253,7 +253,7 @@  discard block
 block discarded – undo
253 253
      */
254 254
     public function get_products()
255 255
     {
256
-		// phpcs:enable
256
+        // phpcs:enable
257 257
         global $langs, $conf;
258 258
         $html       = "";
259 259
         $last_month = time() - (30 * 24 * 60 * 60);
@@ -342,7 +342,7 @@  discard block
 block discarded – undo
342 342
         return $html;
343 343
     }
344 344
 
345
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
345
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
346 346
     /**
347 347
      * get previous link
348 348
      *
@@ -351,11 +351,11 @@  discard block
 block discarded – undo
351 351
      */
352 352
     public function get_previous_link($text = '<<')
353 353
     {
354
-		// phpcs:enable
354
+        // phpcs:enable
355 355
         return '<a href="' . $this->get_previous_url() . '" class="button">' . dol_escape_htmltag($text) . '</a>';
356 356
     }
357 357
 
358
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
358
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
359 359
     /**
360 360
      * get next link
361 361
      *
@@ -364,11 +364,11 @@  discard block
 block discarded – undo
364 364
      */
365 365
     public function get_next_link($text = '>>')
366 366
     {
367
-		// phpcs:enable
367
+        // phpcs:enable
368 368
         return '<a href="' . $this->get_next_url() . '" class="button">' . dol_escape_htmltag($text) . '</a>';
369 369
     }
370 370
 
371
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
371
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
372 372
     /**
373 373
      * get previous url
374 374
      *
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
      */
377 377
     public function get_previous_url()
378 378
     {
379
-		// phpcs:enable
379
+        // phpcs:enable
380 380
         $param_array = array();
381 381
         if ($this->start < $this->per_page) {
382 382
             $sub = 0;
@@ -392,7 +392,7 @@  discard block
 block discarded – undo
392 392
         return $this->url . "&" . $param;
393 393
     }
394 394
 
395
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
395
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
396 396
     /**
397 397
      * get next url
398 398
      *
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
      */
401 401
     public function get_next_url()
402 402
     {
403
-		// phpcs:enable
403
+        // phpcs:enable
404 404
         $param_array = array();
405 405
         if (count($this->products) < $this->per_page) {
406 406
             $add = 0;
@@ -416,7 +416,7 @@  discard block
 block discarded – undo
416 416
         return $this->url . "&" . $param;
417 417
     }
418 418
 
419
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
419
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
420 420
     /**
421 421
      * version compare
422 422
      *
@@ -426,7 +426,7 @@  discard block
 block discarded – undo
426 426
      */
427 427
     public function version_compare($v1, $v2)
428 428
     {
429
-		// phpcs:enable
429
+        // phpcs:enable
430 430
         $v1       = explode('.', $v1);
431 431
         $v2       = explode('.', $v2);
432 432
         $ret      = 0;
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -324,12 +324,12 @@
 block discarded – undo
324 324
             //output template
325 325
             $html .= '<tr class="app oddeven ' . dol_escape_htmltag($compatible) . '">';
326 326
             $html .= '<td class="center" width="210"><div class="newAppParent">';
327
-            $html .= $newapp . $images;   // No dol_escape_htmltag, it is already escape html
327
+            $html .= $newapp . $images; // No dol_escape_htmltag, it is already escape html
328 328
             $html .= '</div></td>';
329 329
             $html .= '<td class="margeCote"><h2 class="appTitle">';
330 330
             $html .= dol_escape_htmltag($product->name->language[$this->lang - 1]);
331 331
             $html .= '<br><small>';
332
-            $html .= $version;          // No dol_escape_htmltag, it is already escape html
332
+            $html .= $version; // No dol_escape_htmltag, it is already escape html
333 333
             $html .= '</small></h2>';
334 334
             $html .= '<small> ' . dol_print_date(dol_stringtotime($product->date_upd), 'dayhour') . ' - ' . $langs->trans('Ref') . ': ' . dol_escape_htmltag($product->reference) . ' - ' . dol_escape_htmltag($langs->trans('Id')) . ': ' . ((int) $product->id) . '</small><br><br>' . dol_escape_htmltag($product->description_short->language[$this->lang - 1]) . '</td>';
335 335
             // do not load if display none
Please login to merge, or discard this patch.
htdocs/core/tpl/contacts.tpl.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@
 block discarded – undo
189 189
         <div class="tagtd center noborderbottom">
190 190
             <input type="submit" id="add-customer-contact" class="button small" value="<?php echo $langs->trans("Add"); ?>"<?php if (!$nbofcontacts) {
191 191
                 echo ' disabled';
192
-                                                                                       } ?>>
192
+                                                                                        } ?>>
193 193
         </div>
194 194
     </form>
195 195
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 $module = $object->element;
41 41
 
42 42
 // Special cases
43
-if (isset($permissiontoadd) && ! isset($permission)) {
43
+if (isset($permissiontoadd) && !isset($permission)) {
44 44
     $permission = $permissiontoadd;
45 45
 }
46 46
 // TODO Remove this section. We already got $permissiontoadd.
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         <div class="tagtd nowrap noborderbottom">
165 165
             <?php
166 166
             $selectedCompany = GETPOSTISSET("newcompany") ? GETPOSTINT("newcompany") : (empty($object->socid) ? 0 : $object->socid);
167
-            $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp');  // This also print the select component?>
167
+            $selectedCompany = $formcompany->selectCompaniesForNewContact($object, 'id', $selectedCompany, 'newcompany', '', 0, '', 'minwidth300imp'); // This also print the select component?>
168 168
         </div>
169 169
         <div class="tagtd noborderbottom minwidth500imp">
170 170
             <?php
Please login to merge, or discard this patch.
htdocs/core/class/dolgraph.class.php 2 patches
Indentation   +62 added lines, -62 removed lines patch added patch discarded remove patch
@@ -144,7 +144,7 @@  discard block
 block discarded – undo
144 144
     }
145 145
 
146 146
 
147
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
147
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
148 148
     /**
149 149
      * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
150 150
      *
@@ -153,12 +153,12 @@  discard block
 block discarded – undo
153 153
      */
154 154
     public function SetHorizTickIncrement($xi)
155 155
     {
156
-		// phpcs:enable
156
+        // phpcs:enable
157 157
         $this->horizTickIncrement = $xi;
158 158
         return true;
159 159
     }
160 160
 
161
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
161
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
162 162
     /**
163 163
      * Utiliser SetNumTicks ou SetHorizTickIncrement mais pas les 2
164 164
      *
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
      */
168 168
     public function SetNumXTicks($xt)
169 169
     {
170
-		// phpcs:enable
170
+        // phpcs:enable
171 171
         $this->SetNumXTicks = $xt;
172 172
         return true;
173 173
     }
174 174
 
175
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
175
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
176 176
     /**
177 177
      * Set label interval to reduce number of labels
178 178
      *
@@ -181,12 +181,12 @@  discard block
 block discarded – undo
181 181
      */
182 182
     public function SetLabelInterval($x)
183 183
     {
184
-		// phpcs:enable
184
+        // phpcs:enable
185 185
         $this->labelInterval = $x;
186 186
         return true;
187 187
     }
188 188
 
189
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
189
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
190 190
     /**
191 191
      * Hide X grid
192 192
      *
@@ -195,7 +195,7 @@  discard block
 block discarded – undo
195 195
      */
196 196
     public function SetHideXGrid($bool)
197 197
     {
198
-		// phpcs:enable
198
+        // phpcs:enable
199 199
         $this->hideXGrid = $bool;
200 200
         return true;
201 201
     }
@@ -212,7 +212,7 @@  discard block
 block discarded – undo
212 212
         return true;
213 213
     }
214 214
 
215
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
215
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
216 216
     /**
217 217
      * Hide Y grid
218 218
      *
@@ -221,12 +221,12 @@  discard block
 block discarded – undo
221 221
      */
222 222
     public function SetHideYGrid($bool)
223 223
     {
224
-		// phpcs:enable
224
+        // phpcs:enable
225 225
         $this->hideYGrid = $bool;
226 226
         return true;
227 227
     }
228 228
 
229
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
229
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
230 230
     /**
231 231
      * Set y label
232 232
      *
@@ -235,11 +235,11 @@  discard block
 block discarded – undo
235 235
      */
236 236
     public function SetYLabel($label)
237 237
     {
238
-		// phpcs:enable
238
+        // phpcs:enable
239 239
         $this->YLabel = $label;
240 240
     }
241 241
 
242
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
242
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
243 243
     /**
244 244
      * Set width
245 245
      *
@@ -248,11 +248,11 @@  discard block
 block discarded – undo
248 248
      */
249 249
     public function SetWidth($w)
250 250
     {
251
-		// phpcs:enable
251
+        // phpcs:enable
252 252
         $this->width = $w;
253 253
     }
254 254
 
255
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
255
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
256 256
     /**
257 257
      * Set title
258 258
      *
@@ -261,11 +261,11 @@  discard block
 block discarded – undo
261 261
      */
262 262
     public function SetTitle($title)
263 263
     {
264
-		// phpcs:enable
264
+        // phpcs:enable
265 265
         $this->title = $title;
266 266
     }
267 267
 
268
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
268
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
269 269
     /**
270 270
      * Set data
271 271
      *
@@ -275,11 +275,11 @@  discard block
 block discarded – undo
275 275
      */
276 276
     public function SetData($data)
277 277
     {
278
-		// phpcs:enable
278
+        // phpcs:enable
279 279
         $this->data = $data;
280 280
     }
281 281
 
282
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
282
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
283 283
     /**
284 284
      * Set data color
285 285
      *
@@ -288,7 +288,7 @@  discard block
 block discarded – undo
288 288
      */
289 289
     public function SetDataColor($datacolor)
290 290
     {
291
-		// phpcs:enable
291
+        // phpcs:enable
292 292
         $this->datacolor = $datacolor;
293 293
     }
294 294
 
@@ -348,7 +348,7 @@  discard block
 block discarded – undo
348 348
         $this->tooltipsTitles = $tooltipsTitles;
349 349
     }
350 350
 
351
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
351
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
352 352
     /**
353 353
      * Set type
354 354
      *
@@ -358,11 +358,11 @@  discard block
 block discarded – undo
358 358
      */
359 359
     public function SetType($type)
360 360
     {
361
-		// phpcs:enable
361
+        // phpcs:enable
362 362
         $this->type = $type;
363 363
     }
364 364
 
365
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
365
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
366 366
     /**
367 367
      * Set legend
368 368
      *
@@ -371,11 +371,11 @@  discard block
 block discarded – undo
371 371
      */
372 372
     public function SetLegend($legend)
373 373
     {
374
-		// phpcs:enable
374
+        // phpcs:enable
375 375
         $this->Legend = $legend;
376 376
     }
377 377
 
378
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
378
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
379 379
     /**
380 380
      * Set min width
381 381
      *
@@ -384,11 +384,11 @@  discard block
 block discarded – undo
384 384
      */
385 385
     public function SetLegendWidthMin($legendwidthmin)
386 386
     {
387
-		// phpcs:enable
387
+        // phpcs:enable
388 388
         $this->LegendWidthMin = $legendwidthmin;
389 389
     }
390 390
 
391
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
391
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
392 392
     /**
393 393
      * Set max value
394 394
      *
@@ -397,11 +397,11 @@  discard block
 block discarded – undo
397 397
      */
398 398
     public function SetMaxValue($max)
399 399
     {
400
-		// phpcs:enable
400
+        // phpcs:enable
401 401
         $this->MaxValue = $max;
402 402
     }
403 403
 
404
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
404
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
405 405
     /**
406 406
      * Get max value
407 407
      *
@@ -409,11 +409,11 @@  discard block
 block discarded – undo
409 409
      */
410 410
     public function GetMaxValue()
411 411
     {
412
-		// phpcs:enable
412
+        // phpcs:enable
413 413
         return $this->MaxValue;
414 414
     }
415 415
 
416
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
416
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
417 417
     /**
418 418
      * Set min value
419 419
      *
@@ -422,11 +422,11 @@  discard block
 block discarded – undo
422 422
      */
423 423
     public function SetMinValue($min)
424 424
     {
425
-		// phpcs:enable
425
+        // phpcs:enable
426 426
         $this->MinValue = $min;
427 427
     }
428 428
 
429
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
429
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
430 430
     /**
431 431
      * Get min value
432 432
      *
@@ -434,11 +434,11 @@  discard block
 block discarded – undo
434 434
      */
435 435
     public function GetMinValue()
436 436
     {
437
-		// phpcs:enable
437
+        // phpcs:enable
438 438
         return $this->MinValue;
439 439
     }
440 440
 
441
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
441
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
442 442
     /**
443 443
      * Set height
444 444
      *
@@ -447,11 +447,11 @@  discard block
 block discarded – undo
447 447
      */
448 448
     public function SetHeight($h)
449 449
     {
450
-		// phpcs:enable
450
+        // phpcs:enable
451 451
         $this->height = $h;
452 452
     }
453 453
 
454
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
454
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
455 455
     /**
456 456
      * Set shading
457 457
      *
@@ -460,11 +460,11 @@  discard block
 block discarded – undo
460 460
      */
461 461
     public function SetShading($s)
462 462
     {
463
-		// phpcs:enable
463
+        // phpcs:enable
464 464
         $this->SetShading = $s;
465 465
     }
466 466
 
467
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
467
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
468 468
     /**
469 469
      * Set shading
470 470
      *
@@ -473,11 +473,11 @@  discard block
 block discarded – undo
473 473
      */
474 474
     public function SetCssPrefix($s)
475 475
     {
476
-		// phpcs:enable
476
+        // phpcs:enable
477 477
         $this->cssprefix = $s;
478 478
     }
479 479
 
480
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
480
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
481 481
     /**
482 482
      * Reset bg color
483 483
      *
@@ -485,11 +485,11 @@  discard block
 block discarded – undo
485 485
      */
486 486
     public function ResetBgColor()
487 487
     {
488
-		// phpcs:enable
488
+        // phpcs:enable
489 489
         unset($this->bgcolor);
490 490
     }
491 491
 
492
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
492
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
493 493
     /**
494 494
      * Reset bgcolorgrid
495 495
      *
@@ -497,7 +497,7 @@  discard block
 block discarded – undo
497 497
      */
498 498
     public function ResetBgColorGrid()
499 499
     {
500
-		// phpcs:enable
500
+        // phpcs:enable
501 501
         unset($this->bgcolorgrid);
502 502
     }
503 503
 
@@ -557,7 +557,7 @@  discard block
 block discarded – undo
557 557
 
558 558
 
559 559
 
560
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
560
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
561 561
     /**
562 562
      * Define background color of complete image
563 563
      *
@@ -566,7 +566,7 @@  discard block
 block discarded – undo
566 566
      */
567 567
     public function SetBgColor($bg_color = array(255, 255, 255))
568 568
     {
569
-		// phpcs:enable
569
+        // phpcs:enable
570 570
         global $theme_bgcolor, $theme_bgcoloronglet;
571 571
 
572 572
         if (!is_array($bg_color)) {
@@ -581,7 +581,7 @@  discard block
 block discarded – undo
581 581
         }
582 582
     }
583 583
 
584
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
584
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
585 585
     /**
586 586
      * Define background color of grid
587 587
      *
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
      */
591 591
     public function SetBgColorGrid($bg_colorgrid = array(255, 255, 255))
592 592
     {
593
-		// phpcs:enable
593
+        // phpcs:enable
594 594
         global $theme_bgcolor, $theme_bgcoloronglet;
595 595
 
596 596
         if (!is_array($bg_colorgrid)) {
@@ -605,7 +605,7 @@  discard block
 block discarded – undo
605 605
         }
606 606
     }
607 607
 
608
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
608
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
609 609
     /**
610 610
      * Reset data color
611 611
      *
@@ -613,11 +613,11 @@  discard block
 block discarded – undo
613 613
      */
614 614
     public function ResetDataColor()
615 615
     {
616
-		// phpcs:enable
616
+        // phpcs:enable
617 617
         unset($this->datacolor);
618 618
     }
619 619
 
620
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
620
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
621 621
     /**
622 622
      * Get max value among all values of all series
623 623
      *
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
      */
626 626
     public function GetMaxValueInData()
627 627
     {
628
-		// phpcs:enable
628
+        // phpcs:enable
629 629
         if (!is_array($this->data)) {
630 630
             return 0;
631 631
         }
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
         return $max;
648 648
     }
649 649
 
650
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
650
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
651 651
     /**
652 652
      * Return min value of all values of all series
653 653
      *
@@ -655,7 +655,7 @@  discard block
 block discarded – undo
655 655
      */
656 656
     public function GetMinValueInData()
657 657
     {
658
-		// phpcs:enable
658
+        // phpcs:enable
659 659
         if (!is_array($this->data)) {
660 660
             return 0;
661 661
         }
@@ -677,7 +677,7 @@  discard block
 block discarded – undo
677 677
         return $min;
678 678
     }
679 679
 
680
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
680
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
681 681
     /**
682 682
      * Return max value of all data
683 683
      *
@@ -685,7 +685,7 @@  discard block
 block discarded – undo
685 685
      */
686 686
     public function GetCeilMaxValue()
687 687
     {
688
-		// phpcs:enable
688
+        // phpcs:enable
689 689
         $max = $this->GetMaxValueInData();
690 690
         if ($max != 0) {
691 691
             $max++;
@@ -705,7 +705,7 @@  discard block
 block discarded – undo
705 705
         return (int) $res;
706 706
     }
707 707
 
708
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
708
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
709 709
     /**
710 710
      * Return min value of all data
711 711
      *
@@ -713,7 +713,7 @@  discard block
 block discarded – undo
713 713
      */
714 714
     public function GetFloorMinValue()
715 715
     {
716
-		// phpcs:enable
716
+        // phpcs:enable
717 717
         $min = $this->GetMinValueInData();
718 718
         if ($min == '') {
719 719
             $min = 0;
@@ -761,7 +761,7 @@  discard block
 block discarded – undo
761 761
         return call_user_func_array(array($this, $call), array($file, $fileurl));
762 762
     }
763 763
 
764
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
764
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
765 765
     /**
766 766
      * Build a graph using JFlot library. Input when calling this method should be:
767 767
      *  $this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
@@ -780,7 +780,7 @@  discard block
 block discarded – undo
780 780
      */
781 781
     private function draw_jflot($file, $fileurl)
782 782
     {
783
-		// phpcs:enable
783
+        // phpcs:enable
784 784
         global $langs;
785 785
 
786 786
         dol_syslog(get_class($this) . "::draw_jflot this->type=" . implode(',', $this->type) . " this->MaxValue=" . $this->MaxValue);
@@ -1048,7 +1048,7 @@  discard block
 block discarded – undo
1048 1048
     }
1049 1049
 
1050 1050
 
1051
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
1051
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
1052 1052
     /**
1053 1053
      * Build a graph using Chart library. Input when calling this method should be:
1054 1054
      *  $this->data  = array(array(0=>'labelxA',1=>yA),  array('labelxB',yB));
@@ -1067,7 +1067,7 @@  discard block
 block discarded – undo
1067 1067
      */
1068 1068
     private function draw_chart($file, $fileurl)
1069 1069
     {
1070
-		// phpcs:enable
1070
+        // phpcs:enable
1071 1071
         global $langs;
1072 1072
 
1073 1073
         dol_syslog(get_class($this) . "::draw_chart this->type=" . implode(',', $this->type) . " this->MaxValue=" . $this->MaxValue);
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -637,7 +637,7 @@  discard block
 block discarded – undo
637 637
         foreach ($this->data as $x) {   // Loop on each x
638 638
             for ($i = 0; $i < $nbseries; $i++) {    // Loop on each series
639 639
                 if (is_null($max)) {
640
-                    $max = $x[$i + 1];      // $i+1 because the index 0 is the legend
640
+                    $max = $x[$i + 1]; // $i+1 because the index 0 is the legend
641 641
                 } elseif ($max < $x[$i + 1]) {
642 642
                     $max = $x[$i + 1];
643 643
                 }
@@ -667,7 +667,7 @@  discard block
 block discarded – undo
667 667
         foreach ($this->data as $x) {   // Loop on each x
668 668
             for ($i = 0; $i < $nbseries; $i++) {    // Loop on each series
669 669
                 if (is_null($min)) {
670
-                    $min = $x[$i + 1];      // $i+1 because the index 0 is the legend
670
+                    $min = $x[$i + 1]; // $i+1 because the index 0 is the legend
671 671
                 } elseif ($min > $x[$i + 1]) {
672 672
                     $min = $x[$i + 1];
673 673
                 }
@@ -1283,7 +1283,7 @@  discard block
 block discarded – undo
1283 1283
                 if ($i > 0) {
1284 1284
                     $this->stringtoshow .= ', ';
1285 1285
                 }
1286
-                $this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 25)) . "'";  // Lower than 25 make some important label (that we can't shorten) to be truncated
1286
+                $this->stringtoshow .= "'" . dol_escape_js(dol_trunc($val, 25)) . "'"; // Lower than 25 make some important label (that we can't shorten) to be truncated
1287 1287
                 $i++;
1288 1288
             }
1289 1289
 
Please login to merge, or discard this patch.
htdocs/core/class/rssparser.class.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -526,7 +526,7 @@  discard block
 block discarded – undo
526 526
 
527 527
 
528 528
 
529
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
529
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
530 530
     /**
531 531
      *  Triggered when opened tag is found
532 532
      *
@@ -537,7 +537,7 @@  discard block
 block discarded – undo
537 537
      */
538 538
     public function feed_start_element($p, $element, $attrs)
539 539
     {
540
-		// phpcs:enable
540
+        // phpcs:enable
541 541
         $el = $element = strtolower($element);
542 542
         $attrs = array_change_key_case($attrs, CASE_LOWER);
543 543
 
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
615 615
     }
616 616
 
617 617
 
618
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
618
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
619 619
     /**
620 620
      *  Triggered when CDATA is found
621 621
      *
@@ -625,7 +625,7 @@  discard block
 block discarded – undo
625 625
      */
626 626
     public function feed_cdata($p, $text)
627 627
     {
628
-		// phpcs:enable
628
+        // phpcs:enable
629 629
         if ($this->_format == 'atom' and $this->incontent) {
630 630
             $this->append_content($text);
631 631
         } else {
@@ -634,7 +634,7 @@  discard block
 block discarded – undo
634 634
         }
635 635
     }
636 636
 
637
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
637
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
638 638
     /**
639 639
      *  Triggered when closed tag is found
640 640
      *
@@ -644,7 +644,7 @@  discard block
 block discarded – undo
644 644
      */
645 645
     public function feed_end_element($p, $el)
646 646
     {
647
-		// phpcs:enable
647
+        // phpcs:enable
648 648
         $el = strtolower($el);
649 649
 
650 650
         if ($el == 'item' or $el == 'entry') {
@@ -693,7 +693,7 @@  discard block
 block discarded – undo
693 693
         return $str1;
694 694
     }
695 695
 
696
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
696
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
697 697
     /**
698 698
      * Enter description here ...
699 699
      *
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
702 702
      */
703 703
     public function append_content($text)
704 704
     {
705
-		// phpcs:enable
705
+        // phpcs:enable
706 706
         if (!empty($this->initem)) {
707 707
             $this->concat($this->current_item[$this->incontent], $text);
708 708
         } elseif (!empty($this->inchannel)) {
Please login to merge, or discard this patch.
htdocs/core/class/fiscalyear.class.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -400,7 +400,7 @@  discard block
 block discarded – undo
400 400
         return $this->LibStatut($this->status, $mode);
401 401
     }
402 402
 
403
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
403
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
404 404
     /**
405 405
      *  Give a label from a status
406 406
      *
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
      */
411 411
     public function LibStatut($status, $mode = 0)
412 412
     {
413
-		// phpcs:enable
413
+        // phpcs:enable
414 414
         if (empty($this->labelStatus) || empty($this->labelStatusShort)) {
415 415
             global $langs;
416 416
             //$langs->load("mymodule@mymodule");
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -240,7 +240,7 @@
 block discarded – undo
240 240
 
241 241
             $this->id = $obj->rowid;
242 242
             $this->ref = $obj->rowid;
243
-            $this->date_start   = $this->db->jdate($obj->date_start);
243
+            $this->date_start = $this->db->jdate($obj->date_start);
244 244
             $this->date_end = $this->db->jdate($obj->date_end);
245 245
             $this->label = $obj->label;
246 246
             $this->statut = $obj->status;
Please login to merge, or discard this patch.
htdocs/core/class/emailsenderprofile.class.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -314,7 +314,7 @@
 block discarded – undo
314 314
         return $this->LibStatut($this->active, $mode);
315 315
     }
316 316
 
317
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
317
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
318 318
     /**
319 319
      *  Return the label of a given status
320 320
      *
Please login to merge, or discard this patch.
htdocs/core/class/discount.class.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -415,7 +415,7 @@  discard block
 block discarded – undo
415 415
 
416 416
 
417 417
 
418
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
418
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
419 419
     /**
420 420
      *  Link the discount to a particular invoice line or a particular invoice.
421 421
      *  When discount is a global discount used as an invoice line, we link using rowidline.
@@ -427,7 +427,7 @@  discard block
 block discarded – undo
427 427
      */
428 428
     public function link_to_invoice($rowidline, $rowidinvoice)
429 429
     {
430
-		// phpcs:enable
430
+        // phpcs:enable
431 431
         // Check parameters
432 432
         if (!$rowidline && !$rowidinvoice) {
433 433
             $this->error = 'ErrorBadParameters';
@@ -474,7 +474,7 @@  discard block
 block discarded – undo
474 474
     }
475 475
 
476 476
 
477
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
477
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.ScopeNotCamelCaps
478 478
     /**
479 479
      *  Link the discount to a particular invoice line or a particular invoice.
480 480
      *  Do not call this if discount is linked to a reconcialiated invoice
@@ -483,7 +483,7 @@  discard block
 block discarded – undo
483 483
      */
484 484
     public function unlink_invoice()
485 485
     {
486
-		// phpcs:enable
486
+        // phpcs:enable
487 487
         $sql = "UPDATE " . $this->db->prefix() . "societe_remise_except";
488 488
         if (!empty($this->discount_type)) {
489 489
             $sql .= " SET fk_invoice_supplier_line = NULL, fk_invoice_supplier = NULL";
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -47,16 +47,16 @@
 block discarded – undo
47 47
     public $total_ht;
48 48
     public $total_tva;
49 49
     public $total_ttc;
50
-    public $amount_ht;  // deprecated
50
+    public $amount_ht; // deprecated
51 51
     public $amount_tva; // deprecated
52 52
     public $amount_ttc; // deprecated
53 53
 
54 54
     public $multicurrency_total_ht;
55 55
     public $multicurrency_total_tva;
56 56
     public $multicurrency_total_ttc;
57
-    public $multicurrency_amount_ht;    // deprecated
58
-    public $multicurrency_amount_tva;   // deprecated
59
-    public $multicurrency_amount_ttc;   // deprecated
57
+    public $multicurrency_amount_ht; // deprecated
58
+    public $multicurrency_amount_tva; // deprecated
59
+    public $multicurrency_amount_ttc; // deprecated
60 60
 
61 61
     /**
62 62
      * @var double
Please login to merge, or discard this patch.
htdocs/core/class/stats.class.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -381,7 +381,7 @@  discard block
 block discarded – undo
381 381
     // Here we have low level of shared code called by XxxStats.class.php
382 382
 
383 383
 
384
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
384
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
385 385
     /**
386 386
      *  Return nb of elements by year
387 387
      *
@@ -390,7 +390,7 @@  discard block
 block discarded – undo
390 390
      */
391 391
     protected function _getNbByYear($sql)
392 392
     {
393
-		// phpcs:enable
393
+        // phpcs:enable
394 394
         $result = array();
395 395
 
396 396
         dol_syslog(get_class($this) . '::' . __FUNCTION__, LOG_DEBUG);
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
         return $result;
411 411
     }
412 412
 
413
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
413
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
414 414
     /**
415 415
      *  Return nb of elements, total amount and avg amount each year
416 416
      *
@@ -419,7 +419,7 @@  discard block
 block discarded – undo
419 419
      */
420 420
     protected function _getAllByYear($sql)
421 421
     {
422
-		// phpcs:enable
422
+        // phpcs:enable
423 423
         $result = array();
424 424
 
425 425
         dol_syslog(get_class($this) . '::' . __FUNCTION__, LOG_DEBUG);
@@ -464,7 +464,7 @@  discard block
 block discarded – undo
464 464
         return $result;
465 465
     }
466 466
 
467
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
467
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
468 468
     /**
469 469
      *     Renvoie le nombre de documents par mois pour une annee donnee
470 470
      *     Return number of documents per month for a given year
@@ -476,7 +476,7 @@  discard block
 block discarded – undo
476 476
      */
477 477
     protected function _getNbByMonth($year, $sql, $format = 0)
478 478
     {
479
-		// phpcs:enable
479
+        // phpcs:enable
480 480
         global $langs;
481 481
 
482 482
         $result = array();
@@ -522,7 +522,7 @@  discard block
 block discarded – undo
522 522
         return $data;
523 523
     }
524 524
 
525
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
525
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
526 526
     /**
527 527
      *     Return the amount per month for a given year
528 528
      *
@@ -533,7 +533,7 @@  discard block
 block discarded – undo
533 533
      */
534 534
     protected function _getAmountByMonth($year, $sql, $format = 0)
535 535
     {
536
-		// phpcs:enable
536
+        // phpcs:enable
537 537
         global $langs;
538 538
 
539 539
         $result = array();
@@ -579,7 +579,7 @@  discard block
 block discarded – undo
579 579
         return $data;
580 580
     }
581 581
 
582
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
582
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
583 583
     /**
584 584
      *  Renvoie le montant moyen par mois pour une annee donnee
585 585
      *  Return the amount average par month for a given year
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
      */
592 592
     protected function _getAverageByMonth($year, $sql, $format = 0)
593 593
     {
594
-		// phpcs:enable
594
+        // phpcs:enable
595 595
         global $langs;
596 596
 
597 597
         $result = array();
@@ -638,7 +638,7 @@  discard block
 block discarded – undo
638 638
     }
639 639
 
640 640
 
641
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
641
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
642 642
     /**
643 643
      *  Return number or total of product refs
644 644
      *
@@ -648,7 +648,7 @@  discard block
 block discarded – undo
648 648
      */
649 649
     protected function _getAllByProduct($sql, $limit = 10)
650 650
     {
651
-		// phpcs:enable
651
+        // phpcs:enable
652 652
         global $langs;
653 653
 
654 654
         $result = array();
@@ -679,7 +679,7 @@  discard block
 block discarded – undo
679 679
         return $result;
680 680
     }
681 681
 
682
-	// phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
682
+    // phpcs:disable PEAR.NamingConventions.ValidFunctionName.PublicUnderscore
683 683
     /**
684 684
      *  Returns the summed amounts per year for a given number of past years ending now
685 685
      *  @param  string  $sql    SQL
Please login to merge, or discard this patch.