Passed
Push — master ( 678db7...164b32 )
by Cody
06:12 queued 03:06
created
lib/phpqrcode/index.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -43,19 +43,22 @@  discard block
 block discarded – undo
43 43
     //processing form input
44 44
     //remember to sanitize user input in real-life solution !!!
45 45
     $errorCorrectionLevel = 'L';
46
-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L', 'M', 'Q', 'H')))
47
-        $errorCorrectionLevel = $_REQUEST['level'];    
46
+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L', 'M', 'Q', 'H'))) {
47
+            $errorCorrectionLevel = $_REQUEST['level'];
48
+    }
48 49
 
49 50
     $matrixPointSize = 4;
50
-    if (isset($_REQUEST['size']))
51
-        $matrixPointSize = min(max((int) $_REQUEST['size'], 1), 10);
51
+    if (isset($_REQUEST['size'])) {
52
+            $matrixPointSize = min(max((int) $_REQUEST['size'], 1), 10);
53
+    }
52 54
 
53 55
 
54 56
     if (isset($_REQUEST['data'])) { 
55 57
     
56 58
         //it's very important!
57
-        if (trim($_REQUEST['data']) == '')
58
-            die('data cannot be empty! <a href="?">back</a>');
59
+        if (trim($_REQUEST['data']) == '') {
60
+                    die('data cannot be empty! <a href="?">back</a>');
61
+        }
59 62
             
60 63
         // user data
61 64
         $filename = $PNG_TEMP_DIR.'test'.md5($_REQUEST['data'].'|'.$errorCorrectionLevel.'|'.$matrixPointSize).'.png';
@@ -83,8 +86,9 @@  discard block
 block discarded – undo
83 86
         </select>&nbsp;
84 87
         Size:&nbsp;<select name="size">';
85 88
         
86
-    for ($i = 1; $i <= 10; $i++)
87
-        echo '<option value="'.$i.'"'.(($matrixPointSize == $i) ? ' selected' : '').'>'.$i.'</option>';
89
+    for ($i = 1; $i <= 10; $i++) {
90
+            echo '<option value="'.$i.'"'.(($matrixPointSize == $i) ? ' selected' : '').'>'.$i.'</option>';
91
+    }
88 92
         
89 93
     echo '</select>&nbsp;
90 94
         <input type="submit" value="GENERATE"></form><hr/>';
Please login to merge, or discard this patch.
lib/phpqrcode/qrencode.php 1 patch
Braces   +15 added lines, -6 removed lines patch added patch discarded remove patch
@@ -104,14 +104,17 @@  discard block
 block discarded – undo
104 104
                 $blockNo++;
105 105
             }
106 106
 
107
-            if (QRspec::rsBlockNum2($spec) == 0)
108
-                return 0;
107
+            if (QRspec::rsBlockNum2($spec) == 0) {
108
+                            return 0;
109
+            }
109 110
 
110 111
             $dl = QRspec::rsDataCodes2($spec);
111 112
             $el = QRspec::rsEccCodes2($spec);
112 113
             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
113 114
             
114
-            if ($rs == null) return -1;
115
+            if ($rs == null) {
116
+                return -1;
117
+            }
115 118
             
116 119
             for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {
117 120
                 $ecc = array_slice($this->ecccode, $eccPos);
@@ -249,7 +252,9 @@  discard block
 block discarded – undo
249 252
             }
250 253
 
251 254
             $input = new QRinput($version, $level);
252
-            if ($input == null) return null;
255
+            if ($input == null) {
256
+                return null;
257
+            }
253 258
 
254 259
             $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
255 260
             if ($ret < 0) {
@@ -269,7 +274,9 @@  discard block
 block discarded – undo
269 274
             }
270 275
 
271 276
             $input = new QRinput($version, $level);
272
-            if ($input == null) return null;
277
+            if ($input == null) {
278
+                return null;
279
+            }
273 280
 
274 281
             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
275 282
             if ($ret < 0) {
@@ -379,7 +386,9 @@  discard block
 block discarded – undo
379 386
                         }
380 387
                     }
381 388
                 }
382
-                if ($x < 0 || $y < 0) return null;
389
+                if ($x < 0 || $y < 0) {
390
+                    return null;
391
+                }
383 392
 
384 393
                 $this->x = $x;
385 394
                 $this->y = $y;
Please login to merge, or discard this patch.
lib/phpqrcode/qrbitstream.php 1 patch
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -108,13 +108,15 @@  discard block
 block discarded – undo
108 108
         //----------------------------------------------------------------------
109 109
         public function appendNum($bits, $num)
110 110
         {
111
-            if ($bits == 0) 
112
-                return 0;
111
+            if ($bits == 0) {
112
+                            return 0;
113
+            }
113 114
 
114 115
             $b = QRbitstream::newFromNum($bits, $num);
115 116
             
116
-            if (is_null($b))
117
-                return -1;
117
+            if (is_null($b)) {
118
+                            return -1;
119
+            }
118 120
 
119 121
             $ret = $this->append($b);
120 122
             unset($b);
@@ -125,13 +127,15 @@  discard block
 block discarded – undo
125 127
         //----------------------------------------------------------------------
126 128
         public function appendBytes($size, $data)
127 129
         {
128
-            if ($size == 0) 
129
-                return 0;
130
+            if ($size == 0) {
131
+                            return 0;
132
+            }
130 133
 
131 134
             $b = QRbitstream::newFromBytes($size, $data);
132 135
             
133
-            if (is_null($b))
134
-                return -1;
136
+            if (is_null($b)) {
137
+                            return -1;
138
+            }
135 139
 
136 140
             $ret = $this->append($b);
137 141
             unset($b);
Please login to merge, or discard this patch.
lib/phpqrcode/qrmask.php 1 patch
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -230,8 +230,9 @@
 block discarded – undo
230 230
                 
231 231
                 $frameY = $frame[$y];
232 232
                 
233
-                if ($y > 0)
234
-                    $frameYM = $frame[$y - 1];
233
+                if ($y > 0) {
234
+                                    $frameYM = $frame[$y - 1];
235
+                }
235 236
                 
236 237
                 for ($x = 0; $x < $width; $x++) {
237 238
                     if (($x > 0) && ($y > 0)) {
Please login to merge, or discard this patch.
lib/phpqrcode/tools/merged_config.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,4 +14,4 @@
 block discarded – undo
14 14
     define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false
15 15
                                                   
16 16
     define('QR_PNG_MAXIMUM_SIZE', 1024); // maximum allowed png image width (in pixels), tune to make sure GD and PHP can handle such big images
17
-                                                  
18 17
\ No newline at end of file
18
+                                                    
19 19
\ No newline at end of file
Please login to merge, or discard this patch.
lib/phpqrcode/qrspec.php 1 patch
Braces   +24 added lines, -16 removed lines patch added patch discarded remove patch
@@ -115,8 +115,9 @@  discard block
 block discarded – undo
115 115
 
116 116
             for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {
117 117
                 $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
118
-                if ($words >= $size) 
119
-                    return $i;
118
+                if ($words >= $size) {
119
+                                    return $i;
120
+                }
120 121
             }
121 122
 
122 123
             return -1;
@@ -152,8 +153,9 @@  discard block
 block discarded – undo
152 153
         //----------------------------------------------------------------------
153 154
         public static function maximumWords($mode, $version)
154 155
         {
155
-            if ($mode == QR_MODE_STRUCTURE) 
156
-                return 3;
156
+            if ($mode == QR_MODE_STRUCTURE) {
157
+                            return 3;
158
+            }
157 159
                 
158 160
             if ($version <= 9) {
159 161
                 $l = 0;
@@ -299,8 +301,9 @@  discard block
 block discarded – undo
299 301
         //----------------------------------------------------------------------
300 302
         public static function putAlignmentPattern($version, &$frame, $width)
301 303
         {
302
-            if ($version < 2)
303
-                return;
304
+            if ($version < 2) {
305
+                            return;
306
+            }
304 307
 
305 308
             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
306 309
             if ($d < 0) {
@@ -352,8 +355,9 @@  discard block
 block discarded – undo
352 355
         //----------------------------------------------------------------------
353 356
         public static function getVersionPattern($version)
354 357
         {
355
-            if ($version < 7 || $version > QRSPEC_VERSION_MAX)
356
-                return 0;
358
+            if ($version < 7 || $version > QRSPEC_VERSION_MAX) {
359
+                            return 0;
360
+            }
357 361
 
358 362
             return self::$versionPattern[$version - 7];
359 363
         }
@@ -370,11 +374,13 @@  discard block
 block discarded – undo
370 374
 
371 375
         public static function getFormatInfo($mask, $level)
372 376
         {
373
-            if ($mask < 0 || $mask > 7)
374
-                return 0;
377
+            if ($mask < 0 || $mask > 7) {
378
+                            return 0;
379
+            }
375 380
                 
376
-            if ($level < 0 || $level > 3)
377
-                return 0;                
381
+            if ($level < 0 || $level > 3) {
382
+                            return 0;
383
+            }
378 384
 
379 385
             return self::$formatInfo[$level][$mask];
380 386
         }
@@ -554,8 +560,9 @@  discard block
 block discarded – undo
554 560
         //----------------------------------------------------------------------
555 561
         public static function newFrame($version)
556 562
         {
557
-            if ($version < 1 || $version > QRSPEC_VERSION_MAX) 
558
-                return null;
563
+            if ($version < 1 || $version > QRSPEC_VERSION_MAX) {
564
+                            return null;
565
+            }
559 566
 
560 567
             if (!isset(self::$frames[$version])) {
561 568
                 
@@ -573,8 +580,9 @@  discard block
 block discarded – undo
573 580
                 }
574 581
             }
575 582
             
576
-            if (is_null(self::$frames[$version]))
577
-                return null;
583
+            if (is_null(self::$frames[$version])) {
584
+                            return null;
585
+            }
578 586
 
579 587
             return self::$frames[$version];
580 588
         }
Please login to merge, or discard this patch.
lib/phpqrcode/qrinput.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -422,7 +422,7 @@
 block discarded – undo
422 422
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
423 423
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
424 424
             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
425
-             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
425
+                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
426 426
             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
427 427
             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
428 428
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
Please login to merge, or discard this patch.
Switch Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -201,13 +201,13 @@  discard block
 block discarded – undo
201 201
                 $version = 1;
202 202
 
203 203
             switch ($this->mode) {
204
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
205
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
206
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
207
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
208
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
209
-                default:
210
-                    return 0;
204
+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
205
+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
206
+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
207
+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
208
+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
209
+            default:
210
+                return 0;
211 211
             }
212 212
 
213 213
             $l = QRspec::lengthIndicator($this->mode, $version);
@@ -247,14 +247,14 @@  discard block
 block discarded – undo
247 247
                     $ret = 0;
248 248
                     
249 249
                     switch ($this->mode) {
250
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
251
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
252
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
253
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
254
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
250
+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
251
+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
252
+                    case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
253
+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
254
+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
255 255
                         
256
-                        default:
257
-                            break;
256
+                    default:
257
+                        break;
258 258
                     }
259 259
                     
260 260
                     if ($ret < 0)
@@ -404,14 +404,14 @@  discard block
 block discarded – undo
404 404
             $bits = $w * 10;
405 405
             
406 406
             switch ($size - $w * 3) {
407
-                case 1:
408
-                    $bits += 4;
409
-                    break;
410
-                case 2:
411
-                    $bits += 7;
412
-                    break;
413
-                default:
414
-                    break;
407
+            case 1:
408
+                $bits += 4;
409
+                break;
410
+            case 2:
411
+                $bits += 7;
412
+                break;
413
+            default:
414
+                break;
415 415
             }
416 416
 
417 417
             return $bits;
@@ -500,14 +500,14 @@  discard block
 block discarded – undo
500 500
                 return false;
501 501
 
502 502
             switch ($mode) {
503
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
504
-                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
505
-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
506
-                case QR_MODE_8:         return true; break;
507
-                case QR_MODE_STRUCTURE: return true; break;
503
+            case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
504
+            case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
505
+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
506
+            case QR_MODE_8:         return true; break;
507
+            case QR_MODE_STRUCTURE: return true; break;
508 508
                 
509
-                default:
510
-                    break;
509
+            default:
510
+                break;
511 511
             }
512 512
 
513 513
             return false;
@@ -548,35 +548,35 @@  discard block
 block discarded – undo
548 548
         {
549 549
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
550 550
             switch ($mode) {
551
-                case QR_MODE_NUM:
552
-                    $chunks = (int) ($payload / 10);
553
-                    $remain = $payload - $chunks * 10;
554
-                    $size = $chunks * 3;
555
-                    if ($remain >= 7) {
556
-                        $size += 2;
557
-                    } else if ($remain >= 4) {
558
-                        $size += 1;
559
-                    }
560
-                    break;
561
-                case QR_MODE_AN:
562
-                    $chunks = (int) ($payload / 11);
563
-                    $remain = $payload - $chunks * 11;
564
-                    $size = $chunks * 2;
565
-                    if ($remain >= 6) 
566
-                        $size++;
567
-                    break;
568
-                case QR_MODE_8:
569
-                    $size = (int) ($payload / 8);
570
-                    break;
571
-                case QR_MODE_KANJI:
572
-                    $size = (int) (($payload / 13) * 2);
573
-                    break;
574
-                case QR_MODE_STRUCTURE:
575
-                    $size = (int) ($payload / 8);
576
-                    break;
577
-                default:
578
-                    $size = 0;
579
-                    break;
551
+            case QR_MODE_NUM:
552
+                $chunks = (int) ($payload / 10);
553
+                $remain = $payload - $chunks * 10;
554
+                $size = $chunks * 3;
555
+                if ($remain >= 7) {
556
+                    $size += 2;
557
+                } else if ($remain >= 4) {
558
+                    $size += 1;
559
+                }
560
+                break;
561
+            case QR_MODE_AN:
562
+                $chunks = (int) ($payload / 11);
563
+                $remain = $payload - $chunks * 11;
564
+                $size = $chunks * 2;
565
+                if ($remain >= 6) 
566
+                    $size++;
567
+                break;
568
+            case QR_MODE_8:
569
+                $size = (int) ($payload / 8);
570
+                break;
571
+            case QR_MODE_KANJI:
572
+                $size = (int) (($payload / 13) * 2);
573
+                break;
574
+            case QR_MODE_STRUCTURE:
575
+                $size = (int) ($payload / 8);
576
+                break;
577
+            default:
578
+                $size = 0;
579
+                break;
580 580
             }
581 581
             
582 582
             $maxsize = QRspec::maximumWords($mode, $version);
Please login to merge, or discard this patch.
Braces   +33 added lines, -20 removed lines patch added patch discarded remove patch
@@ -197,8 +197,9 @@  discard block
 block discarded – undo
197 197
         {
198 198
             $bits = 0;
199 199
 
200
-            if ($version == 0) 
201
-                $version = 1;
200
+            if ($version == 0) {
201
+                            $version = 1;
202
+            }
202 203
 
203 204
             switch ($this->mode) {
204 205
                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
@@ -257,8 +258,9 @@  discard block
 block discarded – undo
257 258
                             break;
258 259
                     }
259 260
                     
260
-                    if ($ret < 0)
261
-                        return -1;
261
+                    if ($ret < 0) {
262
+                                            return -1;
263
+                    }
262 264
                 }
263 265
 
264 266
                 return $this->bstream->size();
@@ -475,8 +477,9 @@  discard block
 block discarded – undo
475 477
         //----------------------------------------------------------------------
476 478
         public static function checkModeKanji($size, $data)
477 479
         {
478
-            if ($size & 1)
479
-                return false;
480
+            if ($size & 1) {
481
+                            return false;
482
+            }
480 483
 
481 484
             for ($i = 0; $i < $size; $i += 2) {
482 485
                 $val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
@@ -496,8 +499,9 @@  discard block
 block discarded – undo
496 499
 
497 500
         public static function check($mode, $size, $data)
498 501
         {
499
-            if ($size <= 0) 
500
-                return false;
502
+            if ($size <= 0) {
503
+                            return false;
504
+            }
501 505
 
502 506
             switch ($mode) {
503 507
                 case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
@@ -562,8 +566,9 @@  discard block
 block discarded – undo
562 566
                     $chunks = (int) ($payload / 11);
563 567
                     $remain = $payload - $chunks * 11;
564 568
                     $size = $chunks * 2;
565
-                    if ($remain >= 6) 
566
-                        $size++;
569
+                    if ($remain >= 6) {
570
+                                            $size++;
571
+                    }
567 572
                     break;
568 573
                 case QR_MODE_8:
569 574
                     $size = (int) ($payload / 8);
@@ -580,8 +585,12 @@  discard block
 block discarded – undo
580 585
             }
581 586
             
582 587
             $maxsize = QRspec::maximumWords($mode, $version);
583
-            if ($size < 0) $size = 0;
584
-            if ($size > $maxsize) $size = $maxsize;
588
+            if ($size < 0) {
589
+                $size = 0;
590
+            }
591
+            if ($size > $maxsize) {
592
+                $size = $maxsize;
593
+            }
585 594
 
586 595
             return $size;
587 596
         }
@@ -594,8 +603,9 @@  discard block
 block discarded – undo
594 603
             foreach ($this->items as $item) {
595 604
                 $bits = $item->encodeBitStream($this->version);
596 605
                 
597
-                if ($bits < 0) 
598
-                    return -1;
606
+                if ($bits < 0) {
607
+                                    return -1;
608
+                }
599 609
                     
600 610
                 $total += $bits;
601 611
             }
@@ -614,8 +624,9 @@  discard block
 block discarded – undo
614 624
             for (;;) {
615 625
                 $bits = $this->createBitStream();
616 626
                 
617
-                if ($bits < 0) 
618
-                    return -1;
627
+                if ($bits < 0) {
628
+                                    return -1;
629
+                }
619 630
                     
620 631
                 $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
621 632
                 if ($ver < 0) {
@@ -652,8 +663,9 @@  discard block
 block discarded – undo
652 663
             $padding = new QRbitstream();
653 664
             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
654 665
             
655
-            if ($ret < 0) 
656
-                return $ret;
666
+            if ($ret < 0) {
667
+                            return $ret;
668
+            }
657 669
 
658 670
             $padlen = $maxwords - $words;
659 671
             
@@ -666,8 +678,9 @@  discard block
 block discarded – undo
666 678
                 
667 679
                 $ret = $padding->appendBytes($padlen, $padbuf);
668 680
                 
669
-                if ($ret < 0)
670
-                    return $ret;
681
+                if ($ret < 0) {
682
+                                    return $ret;
683
+                }
671 684
                 
672 685
             }
673 686
 
Please login to merge, or discard this patch.
lib/phpqrcode/phpqrcode.php 3 patches
Indentation   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -74,32 +74,32 @@  discard block
 block discarded – undo
74 74
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
75 75
  */
76 76
  
77
-	// Encoding modes
77
+    // Encoding modes
78 78
 	 
79
-	define('QR_MODE_NUL', -1);
80
-	define('QR_MODE_NUM', 0);
81
-	define('QR_MODE_AN', 1);
82
-	define('QR_MODE_8', 2);
83
-	define('QR_MODE_KANJI', 3);
84
-	define('QR_MODE_STRUCTURE', 4);
85
-
86
-	// Levels of error correction.
87
-
88
-	define('QR_ECLEVEL_L', 0);
89
-	define('QR_ECLEVEL_M', 1);
90
-	define('QR_ECLEVEL_Q', 2);
91
-	define('QR_ECLEVEL_H', 3);
79
+    define('QR_MODE_NUL', -1);
80
+    define('QR_MODE_NUM', 0);
81
+    define('QR_MODE_AN', 1);
82
+    define('QR_MODE_8', 2);
83
+    define('QR_MODE_KANJI', 3);
84
+    define('QR_MODE_STRUCTURE', 4);
85
+
86
+    // Levels of error correction.
87
+
88
+    define('QR_ECLEVEL_L', 0);
89
+    define('QR_ECLEVEL_M', 1);
90
+    define('QR_ECLEVEL_Q', 2);
91
+    define('QR_ECLEVEL_H', 3);
92 92
 	
93
-	// Supported output formats
93
+    // Supported output formats
94 94
 	
95
-	define('QR_FORMAT_TEXT', 0);
96
-	define('QR_FORMAT_PNG', 1);
95
+    define('QR_FORMAT_TEXT', 0);
96
+    define('QR_FORMAT_PNG', 1);
97 97
 	
98
-	class qrstr {
99
-		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
100
-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
101
-		}
102
-	}	
98
+    class qrstr {
99
+        public static function set(&$srctab, $x, $y, $repl, $replLen = false) {
100
+            $srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
101
+        }
102
+    }	
103 103
 
104 104
 
105 105
 
@@ -212,9 +212,9 @@  discard block
 block discarded – undo
212 212
         //----------------------------------------------------------------------
213 213
         public static function buildCache()
214 214
         {
215
-			QRtools::markTime('before_build_cache');
215
+            QRtools::markTime('before_build_cache');
216 216
 			
217
-			$mask = new QRmask();
217
+            $mask = new QRmask();
218 218
             for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {
219 219
                 $frame = QRspec::newFrame($a);
220 220
                 if (QR_IMAGE) {
@@ -222,13 +222,13 @@  discard block
 block discarded – undo
222 222
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);
223 223
                 }
224 224
 				
225
-				$width = count($frame);
226
-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
227
-				for ($maskNo = 0; $maskNo < 8; $maskNo++)
228
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
225
+                $width = count($frame);
226
+                $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
227
+                for ($maskNo = 0; $maskNo < 8; $maskNo++)
228
+                    $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
229 229
             }
230 230
 			
231
-			QRtools::markTime('after_build_cache');
231
+            QRtools::markTime('after_build_cache');
232 232
         }
233 233
 
234 234
         //----------------------------------------------------------------------
@@ -650,10 +650,10 @@  discard block
 block discarded – undo
650 650
 
651 651
         // Version information pattern -----------------------------------------
652 652
 
653
-		// Version information pattern (BCH coded).
653
+        // Version information pattern (BCH coded).
654 654
         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
655 655
         
656
-		// size: [QRSPEC_VERSION_MAX - 6]
656
+        // size: [QRSPEC_VERSION_MAX - 6]
657 657
 		
658 658
         public static $versionPattern = array(
659 659
             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,
@@ -1438,7 +1438,7 @@  discard block
 block discarded – undo
1438 1438
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1439 1439
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1440 1440
             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
1441
-             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
1441
+                0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
1442 1442
             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
1443 1443
             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
1444 1444
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -2504,17 +2504,17 @@  discard block
 block discarded – undo
2504 2504
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2505 2505
  */
2506 2506
  
2507
-	define('N1', 3);
2508
-	define('N2', 3);
2509
-	define('N3', 40);
2510
-	define('N4', 10);
2507
+    define('N1', 3);
2508
+    define('N2', 3);
2509
+    define('N3', 40);
2510
+    define('N4', 10);
2511 2511
 
2512
-	class QRmask {
2512
+    class QRmask {
2513 2513
 	
2514
-		public $runLength = array();
2514
+        public $runLength = array();
2515 2515
 		
2516
-		//----------------------------------------------------------------------
2517
-		public function __construct() 
2516
+        //----------------------------------------------------------------------
2517
+        public function __construct() 
2518 2518
         {
2519 2519
             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);
2520 2520
         }
Please login to merge, or discard this patch.
Switch Indentation   +88 added lines, -88 removed lines patch added patch discarded remove patch
@@ -1217,13 +1217,13 @@  discard block
 block discarded – undo
1217 1217
                 $version = 1;
1218 1218
 
1219 1219
             switch ($this->mode) {
1220
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
1221
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
1222
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
1223
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
1224
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
1225
-                default:
1226
-                    return 0;
1220
+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
1221
+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
1222
+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
1223
+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
1224
+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
1225
+            default:
1226
+                return 0;
1227 1227
             }
1228 1228
 
1229 1229
             $l = QRspec::lengthIndicator($this->mode, $version);
@@ -1263,14 +1263,14 @@  discard block
 block discarded – undo
1263 1263
                     $ret = 0;
1264 1264
                     
1265 1265
                     switch ($this->mode) {
1266
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
1267
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
1268
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
1269
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
1270
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
1266
+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
1267
+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
1268
+                    case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
1269
+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
1270
+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
1271 1271
                         
1272
-                        default:
1273
-                            break;
1272
+                    default:
1273
+                        break;
1274 1274
                     }
1275 1275
                     
1276 1276
                     if ($ret < 0)
@@ -1420,14 +1420,14 @@  discard block
 block discarded – undo
1420 1420
             $bits = $w * 10;
1421 1421
             
1422 1422
             switch ($size - $w * 3) {
1423
-                case 1:
1424
-                    $bits += 4;
1425
-                    break;
1426
-                case 2:
1427
-                    $bits += 7;
1428
-                    break;
1429
-                default:
1430
-                    break;
1423
+            case 1:
1424
+                $bits += 4;
1425
+                break;
1426
+            case 2:
1427
+                $bits += 7;
1428
+                break;
1429
+            default:
1430
+                break;
1431 1431
             }
1432 1432
 
1433 1433
             return $bits;
@@ -1516,14 +1516,14 @@  discard block
 block discarded – undo
1516 1516
                 return false;
1517 1517
 
1518 1518
             switch ($mode) {
1519
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
1520
-                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
1521
-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
1522
-                case QR_MODE_8:         return true; break;
1523
-                case QR_MODE_STRUCTURE: return true; break;
1519
+            case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
1520
+            case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
1521
+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
1522
+            case QR_MODE_8:         return true; break;
1523
+            case QR_MODE_STRUCTURE: return true; break;
1524 1524
                 
1525
-                default:
1526
-                    break;
1525
+            default:
1526
+                break;
1527 1527
             }
1528 1528
 
1529 1529
             return false;
@@ -1564,35 +1564,35 @@  discard block
 block discarded – undo
1564 1564
         {
1565 1565
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
1566 1566
             switch ($mode) {
1567
-                case QR_MODE_NUM:
1568
-                    $chunks = (int) ($payload / 10);
1569
-                    $remain = $payload - $chunks * 10;
1570
-                    $size = $chunks * 3;
1571
-                    if ($remain >= 7) {
1572
-                        $size += 2;
1573
-                    } else if ($remain >= 4) {
1574
-                        $size += 1;
1575
-                    }
1576
-                    break;
1577
-                case QR_MODE_AN:
1578
-                    $chunks = (int) ($payload / 11);
1579
-                    $remain = $payload - $chunks * 11;
1580
-                    $size = $chunks * 2;
1581
-                    if ($remain >= 6) 
1582
-                        $size++;
1583
-                    break;
1584
-                case QR_MODE_8:
1585
-                    $size = (int) ($payload / 8);
1586
-                    break;
1587
-                case QR_MODE_KANJI:
1588
-                    $size = (int) (($payload / 13) * 2);
1589
-                    break;
1590
-                case QR_MODE_STRUCTURE:
1591
-                    $size = (int) ($payload / 8);
1592
-                    break;
1593
-                default:
1594
-                    $size = 0;
1595
-                    break;
1567
+            case QR_MODE_NUM:
1568
+                $chunks = (int) ($payload / 10);
1569
+                $remain = $payload - $chunks * 10;
1570
+                $size = $chunks * 3;
1571
+                if ($remain >= 7) {
1572
+                    $size += 2;
1573
+                } else if ($remain >= 4) {
1574
+                    $size += 1;
1575
+                }
1576
+                break;
1577
+            case QR_MODE_AN:
1578
+                $chunks = (int) ($payload / 11);
1579
+                $remain = $payload - $chunks * 11;
1580
+                $size = $chunks * 2;
1581
+                if ($remain >= 6) 
1582
+                    $size++;
1583
+                break;
1584
+            case QR_MODE_8:
1585
+                $size = (int) ($payload / 8);
1586
+                break;
1587
+            case QR_MODE_KANJI:
1588
+                $size = (int) (($payload / 13) * 2);
1589
+                break;
1590
+            case QR_MODE_STRUCTURE:
1591
+                $size = (int) ($payload / 8);
1592
+                break;
1593
+            default:
1594
+                $size = 0;
1595
+                break;
1596 1596
             }
1597 1597
             
1598 1598
             $maxsize = QRspec::maximumWords($mode, $version);
@@ -2198,14 +2198,14 @@  discard block
 block discarded – undo
2198 2198
                 $mode = $this->identifyMode(0);
2199 2199
                 
2200 2200
                 switch ($mode) {
2201
-                    case QR_MODE_NUM: $length = $this->eatNum(); break;
2202
-                    case QR_MODE_AN:  $length = $this->eatAn(); break;
2203
-                    case QR_MODE_KANJI:
2204
-                        if ($this->modeHint == QR_MODE_KANJI)
2205
-                                $length = $this->eatKanji();
2206
-                        else    $length = $this->eat8();
2207
-                        break;
2208
-                    default: $length = $this->eat8(); break;
2201
+                case QR_MODE_NUM: $length = $this->eatNum(); break;
2202
+                case QR_MODE_AN:  $length = $this->eatAn(); break;
2203
+                case QR_MODE_KANJI:
2204
+                    if ($this->modeHint == QR_MODE_KANJI)
2205
+                            $length = $this->eatKanji();
2206
+                    else    $length = $this->eat8();
2207
+                    break;
2208
+                default: $length = $this->eat8(); break;
2209 2209
                 
2210 2210
                 }
2211 2211
 
@@ -3234,28 +3234,28 @@  discard block
 block discarded – undo
3234 3234
             $enc->margin = $margin;
3235 3235
             
3236 3236
             switch ($level.'') {
3237
-                case '0':
3238
-                case '1':
3239
-                case '2':
3240
-                case '3':
3241
-                        $enc->level = $level;
3242
-                    break;
3243
-                case 'l':
3244
-                case 'L':
3245
-                        $enc->level = QR_ECLEVEL_L;
3246
-                    break;
3247
-                case 'm':
3248
-                case 'M':
3249
-                        $enc->level = QR_ECLEVEL_M;
3250
-                    break;
3251
-                case 'q':
3252
-                case 'Q':
3253
-                        $enc->level = QR_ECLEVEL_Q;
3254
-                    break;
3255
-                case 'h':
3256
-                case 'H':
3257
-                        $enc->level = QR_ECLEVEL_H;
3258
-                    break;
3237
+            case '0':
3238
+            case '1':
3239
+            case '2':
3240
+            case '3':
3241
+                    $enc->level = $level;
3242
+                break;
3243
+            case 'l':
3244
+            case 'L':
3245
+                    $enc->level = QR_ECLEVEL_L;
3246
+                break;
3247
+            case 'm':
3248
+            case 'M':
3249
+                    $enc->level = QR_ECLEVEL_M;
3250
+                break;
3251
+            case 'q':
3252
+            case 'Q':
3253
+                    $enc->level = QR_ECLEVEL_Q;
3254
+                break;
3255
+            case 'h':
3256
+            case 'H':
3257
+                    $enc->level = QR_ECLEVEL_H;
3258
+                break;
3259 3259
             }
3260 3260
             
3261 3261
             return $enc;
Please login to merge, or discard this patch.
Braces   +157 added lines, -84 removed lines patch added patch discarded remove patch
@@ -195,8 +195,9 @@  discard block
 block discarded – undo
195 195
                 
196 196
             foreach ($qrTab as $line) {
197 197
                 $arrAdd = array();
198
-                foreach (str_split($line) as $char)
199
-                    $arrAdd[] = ($char == '1') ? 1 : 0;
198
+                foreach (str_split($line) as $char) {
199
+                                    $arrAdd[] = ($char == '1') ? 1 : 0;
200
+                }
200 201
                 $barcode_array['bcode'][] = $arrAdd;
201 202
             }
202 203
                     
@@ -224,8 +225,9 @@  discard block
 block discarded – undo
224 225
 				
225 226
 				$width = count($frame);
226 227
 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
227
-				for ($maskNo = 0; $maskNo < 8; $maskNo++)
228
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
228
+				for ($maskNo = 0; $maskNo < 8; $maskNo++) {
229
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
230
+				}
229 231
             }
230 232
 			
231 233
 			QRtools::markTime('after_build_cache');
@@ -429,8 +431,9 @@  discard block
 block discarded – undo
429 431
 
430 432
             for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {
431 433
                 $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
432
-                if ($words >= $size) 
433
-                    return $i;
434
+                if ($words >= $size) {
435
+                                    return $i;
436
+                }
434 437
             }
435 438
 
436 439
             return -1;
@@ -466,8 +469,9 @@  discard block
 block discarded – undo
466 469
         //----------------------------------------------------------------------
467 470
         public static function maximumWords($mode, $version)
468 471
         {
469
-            if ($mode == QR_MODE_STRUCTURE) 
470
-                return 3;
472
+            if ($mode == QR_MODE_STRUCTURE) {
473
+                            return 3;
474
+            }
471 475
                 
472 476
             if ($version <= 9) {
473 477
                 $l = 0;
@@ -613,8 +617,9 @@  discard block
 block discarded – undo
613 617
         //----------------------------------------------------------------------
614 618
         public static function putAlignmentPattern($version, &$frame, $width)
615 619
         {
616
-            if ($version < 2)
617
-                return;
620
+            if ($version < 2) {
621
+                            return;
622
+            }
618 623
 
619 624
             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
620 625
             if ($d < 0) {
@@ -666,8 +671,9 @@  discard block
 block discarded – undo
666 671
         //----------------------------------------------------------------------
667 672
         public static function getVersionPattern($version)
668 673
         {
669
-            if ($version < 7 || $version > QRSPEC_VERSION_MAX)
670
-                return 0;
674
+            if ($version < 7 || $version > QRSPEC_VERSION_MAX) {
675
+                            return 0;
676
+            }
671 677
 
672 678
             return self::$versionPattern[$version - 7];
673 679
         }
@@ -684,11 +690,13 @@  discard block
 block discarded – undo
684 690
 
685 691
         public static function getFormatInfo($mask, $level)
686 692
         {
687
-            if ($mask < 0 || $mask > 7)
688
-                return 0;
693
+            if ($mask < 0 || $mask > 7) {
694
+                            return 0;
695
+            }
689 696
                 
690
-            if ($level < 0 || $level > 3)
691
-                return 0;                
697
+            if ($level < 0 || $level > 3) {
698
+                            return 0;
699
+            }
692 700
 
693 701
             return self::$formatInfo[$level][$mask];
694 702
         }
@@ -868,8 +876,9 @@  discard block
 block discarded – undo
868 876
         //----------------------------------------------------------------------
869 877
         public static function newFrame($version)
870 878
         {
871
-            if ($version < 1 || $version > QRSPEC_VERSION_MAX) 
872
-                return null;
879
+            if ($version < 1 || $version > QRSPEC_VERSION_MAX) {
880
+                            return null;
881
+            }
873 882
 
874 883
             if (!isset(self::$frames[$version])) {
875 884
                 
@@ -887,8 +896,9 @@  discard block
 block discarded – undo
887 896
                 }
888 897
             }
889 898
             
890
-            if (is_null(self::$frames[$version]))
891
-                return null;
899
+            if (is_null(self::$frames[$version])) {
900
+                            return null;
901
+            }
892 902
 
893 903
             return self::$frames[$version];
894 904
         }
@@ -1213,8 +1223,9 @@  discard block
 block discarded – undo
1213 1223
         {
1214 1224
             $bits = 0;
1215 1225
 
1216
-            if ($version == 0) 
1217
-                $version = 1;
1226
+            if ($version == 0) {
1227
+                            $version = 1;
1228
+            }
1218 1229
 
1219 1230
             switch ($this->mode) {
1220 1231
                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
@@ -1273,8 +1284,9 @@  discard block
 block discarded – undo
1273 1284
                             break;
1274 1285
                     }
1275 1286
                     
1276
-                    if ($ret < 0)
1277
-                        return -1;
1287
+                    if ($ret < 0) {
1288
+                                            return -1;
1289
+                    }
1278 1290
                 }
1279 1291
 
1280 1292
                 return $this->bstream->size();
@@ -1491,8 +1503,9 @@  discard block
 block discarded – undo
1491 1503
         //----------------------------------------------------------------------
1492 1504
         public static function checkModeKanji($size, $data)
1493 1505
         {
1494
-            if ($size & 1)
1495
-                return false;
1506
+            if ($size & 1) {
1507
+                            return false;
1508
+            }
1496 1509
 
1497 1510
             for ($i = 0; $i < $size; $i += 2) {
1498 1511
                 $val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
@@ -1512,8 +1525,9 @@  discard block
 block discarded – undo
1512 1525
 
1513 1526
         public static function check($mode, $size, $data)
1514 1527
         {
1515
-            if ($size <= 0) 
1516
-                return false;
1528
+            if ($size <= 0) {
1529
+                            return false;
1530
+            }
1517 1531
 
1518 1532
             switch ($mode) {
1519 1533
                 case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
@@ -1578,8 +1592,9 @@  discard block
 block discarded – undo
1578 1592
                     $chunks = (int) ($payload / 11);
1579 1593
                     $remain = $payload - $chunks * 11;
1580 1594
                     $size = $chunks * 2;
1581
-                    if ($remain >= 6) 
1582
-                        $size++;
1595
+                    if ($remain >= 6) {
1596
+                                            $size++;
1597
+                    }
1583 1598
                     break;
1584 1599
                 case QR_MODE_8:
1585 1600
                     $size = (int) ($payload / 8);
@@ -1596,8 +1611,12 @@  discard block
 block discarded – undo
1596 1611
             }
1597 1612
             
1598 1613
             $maxsize = QRspec::maximumWords($mode, $version);
1599
-            if ($size < 0) $size = 0;
1600
-            if ($size > $maxsize) $size = $maxsize;
1614
+            if ($size < 0) {
1615
+                $size = 0;
1616
+            }
1617
+            if ($size > $maxsize) {
1618
+                $size = $maxsize;
1619
+            }
1601 1620
 
1602 1621
             return $size;
1603 1622
         }
@@ -1610,8 +1629,9 @@  discard block
 block discarded – undo
1610 1629
             foreach ($this->items as $item) {
1611 1630
                 $bits = $item->encodeBitStream($this->version);
1612 1631
                 
1613
-                if ($bits < 0) 
1614
-                    return -1;
1632
+                if ($bits < 0) {
1633
+                                    return -1;
1634
+                }
1615 1635
                     
1616 1636
                 $total += $bits;
1617 1637
             }
@@ -1630,8 +1650,9 @@  discard block
 block discarded – undo
1630 1650
             for (;;) {
1631 1651
                 $bits = $this->createBitStream();
1632 1652
                 
1633
-                if ($bits < 0) 
1634
-                    return -1;
1653
+                if ($bits < 0) {
1654
+                                    return -1;
1655
+                }
1635 1656
                     
1636 1657
                 $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
1637 1658
                 if ($ver < 0) {
@@ -1668,8 +1689,9 @@  discard block
 block discarded – undo
1668 1689
             $padding = new QRbitstream();
1669 1690
             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
1670 1691
             
1671
-            if ($ret < 0) 
1672
-                return $ret;
1692
+            if ($ret < 0) {
1693
+                            return $ret;
1694
+            }
1673 1695
 
1674 1696
             $padlen = $maxwords - $words;
1675 1697
             
@@ -1682,8 +1704,9 @@  discard block
 block discarded – undo
1682 1704
                 
1683 1705
                 $ret = $padding->appendBytes($padlen, $padbuf);
1684 1706
                 
1685
-                if ($ret < 0)
1686
-                    return $ret;
1707
+                if ($ret < 0) {
1708
+                                    return $ret;
1709
+                }
1687 1710
                 
1688 1711
             }
1689 1712
 
@@ -1860,13 +1883,15 @@  discard block
 block discarded – undo
1860 1883
         //----------------------------------------------------------------------
1861 1884
         public function appendNum($bits, $num)
1862 1885
         {
1863
-            if ($bits == 0) 
1864
-                return 0;
1886
+            if ($bits == 0) {
1887
+                            return 0;
1888
+            }
1865 1889
 
1866 1890
             $b = QRbitstream::newFromNum($bits, $num);
1867 1891
             
1868
-            if (is_null($b))
1869
-                return -1;
1892
+            if (is_null($b)) {
1893
+                            return -1;
1894
+            }
1870 1895
 
1871 1896
             $ret = $this->append($b);
1872 1897
             unset($b);
@@ -1877,13 +1902,15 @@  discard block
 block discarded – undo
1877 1902
         //----------------------------------------------------------------------
1878 1903
         public function appendBytes($size, $data)
1879 1904
         {
1880
-            if ($size == 0) 
1881
-                return 0;
1905
+            if ($size == 0) {
1906
+                            return 0;
1907
+            }
1882 1908
 
1883 1909
             $b = QRbitstream::newFromBytes($size, $data);
1884 1910
             
1885
-            if (is_null($b))
1886
-                return -1;
1911
+            if (is_null($b)) {
1912
+                            return -1;
1913
+            }
1887 1914
 
1888 1915
             $ret = $this->append($b);
1889 1916
             unset($b);
@@ -2063,8 +2090,9 @@  discard block
 block discarded – undo
2063 2090
             }
2064 2091
             
2065 2092
             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
2066
-            if ($ret < 0)
2067
-                return -1;
2093
+            if ($ret < 0) {
2094
+                            return -1;
2095
+            }
2068 2096
 
2069 2097
             return $run;
2070 2098
         }
@@ -2110,8 +2138,9 @@  discard block
 block discarded – undo
2110 2138
             }
2111 2139
 
2112 2140
             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
2113
-            if ($ret < 0)
2114
-                return -1;
2141
+            if ($ret < 0) {
2142
+                            return -1;
2143
+            }
2115 2144
 
2116 2145
             return $run;
2117 2146
         }
@@ -2126,8 +2155,9 @@  discard block
 block discarded – undo
2126 2155
             }
2127 2156
             
2128 2157
             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
2129
-            if ($ret < 0)
2130
-                return -1;
2158
+            if ($ret < 0) {
2159
+                            return -1;
2160
+            }
2131 2161
 
2132 2162
             return $run;
2133 2163
         }
@@ -2181,8 +2211,9 @@  discard block
 block discarded – undo
2181 2211
             $run = $p;
2182 2212
             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
2183 2213
             
2184
-            if ($ret < 0)
2185
-                return -1;
2214
+            if ($ret < 0) {
2215
+                            return -1;
2216
+            }
2186 2217
 
2187 2218
             return $run;
2188 2219
         }
@@ -2192,8 +2223,9 @@  discard block
 block discarded – undo
2192 2223
         {
2193 2224
             while (strlen($this->dataStr) > 0)
2194 2225
             {
2195
-                if ($this->dataStr == '')
2196
-                    return 0;
2226
+                if ($this->dataStr == '') {
2227
+                                    return 0;
2228
+                }
2197 2229
 
2198 2230
                 $mode = $this->identifyMode(0);
2199 2231
                 
@@ -2201,16 +2233,22 @@  discard block
 block discarded – undo
2201 2233
                     case QR_MODE_NUM: $length = $this->eatNum(); break;
2202 2234
                     case QR_MODE_AN:  $length = $this->eatAn(); break;
2203 2235
                     case QR_MODE_KANJI:
2204
-                        if ($this->modeHint == QR_MODE_KANJI)
2205
-                                $length = $this->eatKanji();
2206
-                        else    $length = $this->eat8();
2236
+                        if ($this->modeHint == QR_MODE_KANJI) {
2237
+                                                        $length = $this->eatKanji();
2238
+                        } else {
2239
+                            $length = $this->eat8();
2240
+                        }
2207 2241
                         break;
2208 2242
                     default: $length = $this->eat8(); break;
2209 2243
                 
2210 2244
                 }
2211 2245
 
2212
-                if ($length == 0) return 0;
2213
-                if ($length < 0)  return -1;
2246
+                if ($length == 0) {
2247
+                    return 0;
2248
+                }
2249
+                if ($length < 0) {
2250
+                    return -1;
2251
+                }
2214 2252
                 
2215 2253
                 $this->dataStr = substr($this->dataStr, $length);
2216 2254
             }
@@ -2246,8 +2284,9 @@  discard block
 block discarded – undo
2246 2284
 
2247 2285
             $split = new QRsplit($string, $input, $modeHint);
2248 2286
             
2249
-            if (!$casesensitive)
2250
-                $split->toUpper();
2287
+            if (!$casesensitive) {
2288
+                            $split->toUpper();
2289
+            }
2251 2290
                 
2252 2291
             return $split->splitString();
2253 2292
         }
@@ -2324,11 +2363,23 @@  discard block
 block discarded – undo
2324 2363
             $rs = null;
2325 2364
             
2326 2365
             // Check parameter ranges
2327
-            if ($symsize < 0 || $symsize > 8)                     return $rs;
2328
-            if ($fcr < 0 || $fcr >= (1 << $symsize))                return $rs;
2329
-            if ($prim <= 0 || $prim >= (1 << $symsize))             return $rs;
2330
-            if ($nroots < 0 || $nroots >= (1 << $symsize))          return $rs; // Can't have more roots than symbol values!
2331
-            if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) return $rs; // Too much padding
2366
+            if ($symsize < 0 || $symsize > 8) {
2367
+                return $rs;
2368
+            }
2369
+            if ($fcr < 0 || $fcr >= (1 << $symsize)) {
2370
+                return $rs;
2371
+            }
2372
+            if ($prim <= 0 || $prim >= (1 << $symsize)) {
2373
+                return $rs;
2374
+            }
2375
+            if ($nroots < 0 || $nroots >= (1 << $symsize)) {
2376
+                return $rs;
2377
+            }
2378
+            // Can't have more roots than symbol values!
2379
+            if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) {
2380
+                return $rs;
2381
+            }
2382
+            // Too much padding
2332 2383
 
2333 2384
             $rs = new QRrsItem();
2334 2385
             $rs->mm = $symsize;
@@ -2454,12 +2505,24 @@  discard block
 block discarded – undo
2454 2505
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
2455 2506
         {
2456 2507
             foreach (self::$items as $rs) {
2457
-                if ($rs->pad != $pad)       continue;
2458
-                if ($rs->nroots != $nroots) continue;
2459
-                if ($rs->mm != $symsize)    continue;
2460
-                if ($rs->gfpoly != $gfpoly) continue;
2461
-                if ($rs->fcr != $fcr)       continue;
2462
-                if ($rs->prim != $prim)     continue;
2508
+                if ($rs->pad != $pad) {
2509
+                    continue;
2510
+                }
2511
+                if ($rs->nroots != $nroots) {
2512
+                    continue;
2513
+                }
2514
+                if ($rs->mm != $symsize) {
2515
+                    continue;
2516
+                }
2517
+                if ($rs->gfpoly != $gfpoly) {
2518
+                    continue;
2519
+                }
2520
+                if ($rs->fcr != $fcr) {
2521
+                    continue;
2522
+                }
2523
+                if ($rs->prim != $prim) {
2524
+                    continue;
2525
+                }
2463 2526
 
2464 2527
                 return $rs;
2465 2528
             }
@@ -2709,8 +2772,9 @@  discard block
 block discarded – undo
2709 2772
                 
2710 2773
                 $frameY = $frame[$y];
2711 2774
                 
2712
-                if ($y > 0)
2713
-                    $frameYM = $frame[$y - 1];
2775
+                if ($y > 0) {
2776
+                                    $frameYM = $frame[$y - 1];
2777
+                }
2714 2778
                 
2715 2779
                 for ($x = 0; $x < $width; $x++) {
2716 2780
                     if (($x > 0) && ($y > 0)) {
@@ -2923,14 +2987,17 @@  discard block
 block discarded – undo
2923 2987
                 $blockNo++;
2924 2988
             }
2925 2989
 
2926
-            if (QRspec::rsBlockNum2($spec) == 0)
2927
-                return 0;
2990
+            if (QRspec::rsBlockNum2($spec) == 0) {
2991
+                            return 0;
2992
+            }
2928 2993
 
2929 2994
             $dl = QRspec::rsDataCodes2($spec);
2930 2995
             $el = QRspec::rsEccCodes2($spec);
2931 2996
             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
2932 2997
             
2933
-            if ($rs == null) return -1;
2998
+            if ($rs == null) {
2999
+                return -1;
3000
+            }
2934 3001
             
2935 3002
             for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {
2936 3003
                 $ecc = array_slice($this->ecccode, $eccPos);
@@ -3068,7 +3135,9 @@  discard block
 block discarded – undo
3068 3135
             }
3069 3136
 
3070 3137
             $input = new QRinput($version, $level);
3071
-            if ($input == null) return null;
3138
+            if ($input == null) {
3139
+                return null;
3140
+            }
3072 3141
 
3073 3142
             $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));
3074 3143
             if ($ret < 0) {
@@ -3088,7 +3157,9 @@  discard block
 block discarded – undo
3088 3157
             }
3089 3158
 
3090 3159
             $input = new QRinput($version, $level);
3091
-            if ($input == null) return null;
3160
+            if ($input == null) {
3161
+                return null;
3162
+            }
3092 3163
 
3093 3164
             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
3094 3165
             if ($ret < 0) {
@@ -3198,7 +3269,9 @@  discard block
 block discarded – undo
3198 3269
                         }
3199 3270
                     }
3200 3271
                 }
3201
-                if ($x < 0 || $y < 0) return null;
3272
+                if ($x < 0 || $y < 0) {
3273
+                    return null;
3274
+                }
3202 3275
 
3203 3276
                 $this->x = $x;
3204 3277
                 $this->y = $y;
Please login to merge, or discard this patch.
lib/phpqrcode/qrsplit.php 1 patch
Braces   +29 added lines, -17 removed lines patch added patch discarded remove patch
@@ -123,8 +123,9 @@  discard block
 block discarded – undo
123 123
             }
124 124
             
125 125
             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
126
-            if ($ret < 0)
127
-                return -1;
126
+            if ($ret < 0) {
127
+                            return -1;
128
+            }
128 129
 
129 130
             return $run;
130 131
         }
@@ -170,8 +171,9 @@  discard block
 block discarded – undo
170 171
             }
171 172
 
172 173
             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
173
-            if ($ret < 0)
174
-                return -1;
174
+            if ($ret < 0) {
175
+                            return -1;
176
+            }
175 177
 
176 178
             return $run;
177 179
         }
@@ -186,8 +188,9 @@  discard block
 block discarded – undo
186 188
             }
187 189
             
188 190
             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
189
-            if ($ret < 0)
190
-                return -1;
191
+            if ($ret < 0) {
192
+                            return -1;
193
+            }
191 194
 
192 195
             return $ret;
193 196
         }
@@ -241,8 +244,9 @@  discard block
 block discarded – undo
241 244
             $run = $p;
242 245
             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
243 246
             
244
-            if ($ret < 0)
245
-                return -1;
247
+            if ($ret < 0) {
248
+                            return -1;
249
+            }
246 250
 
247 251
             return $run;
248 252
         }
@@ -252,8 +256,9 @@  discard block
 block discarded – undo
252 256
         {
253 257
             while (strlen($this->dataStr) > 0)
254 258
             {
255
-                if ($this->dataStr == '')
256
-                    return 0;
259
+                if ($this->dataStr == '') {
260
+                                    return 0;
261
+                }
257 262
 
258 263
                 $mode = $this->identifyMode(0);
259 264
                 
@@ -261,16 +266,22 @@  discard block
 block discarded – undo
261 266
                     case QR_MODE_NUM: $length = $this->eatNum(); break;
262 267
                     case QR_MODE_AN:  $length = $this->eatAn(); break;
263 268
                     case QR_MODE_KANJI:
264
-                        if ($this->modeHint == QR_MODE_KANJI)
265
-                                $length = $this->eatKanji();
266
-                        else    $length = $this->eat8();
269
+                        if ($this->modeHint == QR_MODE_KANJI) {
270
+                                                        $length = $this->eatKanji();
271
+                        } else {
272
+                            $length = $this->eat8();
273
+                        }
267 274
                         break;
268 275
                     default: $length = $this->eat8(); break;
269 276
                 
270 277
                 }
271 278
 
272
-                if ($length == 0) return 0;
273
-                if ($length < 0)  return -1;
279
+                if ($length == 0) {
280
+                    return 0;
281
+                }
282
+                if ($length < 0) {
283
+                    return -1;
284
+                }
274 285
                 
275 286
                 $this->dataStr = substr($this->dataStr, $length);
276 287
             }
@@ -306,8 +317,9 @@  discard block
 block discarded – undo
306 317
 
307 318
             $split = new QRsplit($string, $input, $modeHint);
308 319
             
309
-            if (!$casesensitive)
310
-                $split->toUpper();
320
+            if (!$casesensitive) {
321
+                            $split->toUpper();
322
+            }
311 323
                 
312 324
             return $split->splitString();
313 325
         }
Please login to merge, or discard this patch.