Passed
Push — master ( a3c0d0...678db7 )
by Cody
06:27 queued 03:12
created
lib/phpqrcode/qrencode.php 3 patches
Switch Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -415,28 +415,28 @@
 block discarded – undo
415 415
             $enc->margin = $margin;
416 416
             
417 417
             switch ($level.'') {
418
-                case '0':
419
-                case '1':
420
-                case '2':
421
-                case '3':
422
-                        $enc->level = $level;
423
-                    break;
424
-                case 'l':
425
-                case 'L':
426
-                        $enc->level = QR_ECLEVEL_L;
427
-                    break;
428
-                case 'm':
429
-                case 'M':
430
-                        $enc->level = QR_ECLEVEL_M;
431
-                    break;
432
-                case 'q':
433
-                case 'Q':
434
-                        $enc->level = QR_ECLEVEL_Q;
435
-                    break;
436
-                case 'h':
437
-                case 'H':
438
-                        $enc->level = QR_ECLEVEL_H;
439
-                    break;
418
+            case '0':
419
+            case '1':
420
+            case '2':
421
+            case '3':
422
+                    $enc->level = $level;
423
+                break;
424
+            case 'l':
425
+            case 'L':
426
+                    $enc->level = QR_ECLEVEL_L;
427
+                break;
428
+            case 'm':
429
+            case 'M':
430
+                    $enc->level = QR_ECLEVEL_M;
431
+                break;
432
+            case 'q':
433
+            case 'Q':
434
+                    $enc->level = QR_ECLEVEL_Q;
435
+                break;
436
+            case 'h':
437
+            case 'H':
438
+                    $enc->level = QR_ECLEVEL_H;
439
+                break;
440 440
             }
441 441
             
442 442
             return $enc;
Please login to merge, or discard this patch.
Spacing   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
         //----------------------------------------------------------------------
59 59
         public function __construct(QRinput $input)
60 60
         {
61
-            $spec = array(0,0,0,0,0);
61
+            $spec = array(0, 0, 0, 0, 0);
62 62
             
63 63
             $this->datacode = $input->getByteStream();
64
-            if(is_null($this->datacode)) {
64
+            if (is_null($this->datacode)) {
65 65
                 throw new Exception('null imput string');
66 66
             }
67 67
 
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
             $this->blocks = QRspec::rsBlockNum($spec);
76 76
             
77 77
             $ret = $this->init($spec);
78
-            if($ret < 0) {
78
+            if ($ret < 0) {
79 79
                 throw new Exception('block alloc error');
80 80
                 return null;
81 81
             }
@@ -94,29 +94,29 @@  discard block
 block discarded – undo
94 94
             $blockNo = 0;
95 95
             $dataPos = 0;
96 96
             $eccPos = 0;
97
-            for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {
98
-                $ecc = array_slice($this->ecccode,$eccPos);
99
-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);
100
-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
97
+            for ($i = 0; $i < QRspec::rsBlockNum1($spec); $i++) {
98
+                $ecc = array_slice($this->ecccode, $eccPos);
99
+                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
100
+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
101 101
                 
102 102
                 $dataPos += $dl;
103 103
                 $eccPos += $el;
104 104
                 $blockNo++;
105 105
             }
106 106
 
107
-            if(QRspec::rsBlockNum2($spec) == 0)
107
+            if (QRspec::rsBlockNum2($spec) == 0)
108 108
                 return 0;
109 109
 
110 110
             $dl = QRspec::rsDataCodes2($spec);
111 111
             $el = QRspec::rsEccCodes2($spec);
112 112
             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
113 113
             
114
-            if($rs == null) return -1;
114
+            if ($rs == null) return -1;
115 115
             
116
-            for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
117
-                $ecc = array_slice($this->ecccode,$eccPos);
116
+            for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {
117
+                $ecc = array_slice($this->ecccode, $eccPos);
118 118
                 $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
119
-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
119
+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
120 120
                 
121 121
                 $dataPos += $dl;
122 122
                 $eccPos += $el;
@@ -131,14 +131,14 @@  discard block
 block discarded – undo
131 131
         {
132 132
             $ret = 0;
133 133
 
134
-            if($this->count < $this->dataLength) {
134
+            if ($this->count < $this->dataLength) {
135 135
                 $row = $this->count % $this->blocks;
136 136
                 $col = $this->count / $this->blocks;
137
-                if($col >= $this->rsblocks[0]->dataLength) {
137
+                if ($col >= $this->rsblocks[0]->dataLength) {
138 138
                     $row += $this->b1;
139 139
                 }
140 140
                 $ret = $this->rsblocks[$row]->data[$col];
141
-            } else if($this->count < $this->dataLength + $this->eccLength) {
141
+            } else if ($this->count < $this->dataLength + $this->eccLength) {
142 142
                 $row = ($this->count - $this->dataLength) % $this->blocks;
143 143
                 $col = ($this->count - $this->dataLength) / $this->blocks;
144 144
                 $ret = $this->rsblocks[$row]->ecc[$col];
@@ -162,10 +162,10 @@  discard block
 block discarded – undo
162 162
         //----------------------------------------------------------------------
163 163
         public function encodeMask(QRinput $input, $mask)
164 164
         {
165
-            if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
165
+            if ($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
166 166
                 throw new Exception('wrong version');
167 167
             }
168
-            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
168
+            if ($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
169 169
                 throw new Exception('wrong level');
170 170
             }
171 171
 
@@ -178,15 +178,15 @@  discard block
 block discarded – undo
178 178
             $frame = QRspec::newFrame($version);
179 179
             
180 180
             $filler = new FrameFiller($width, $frame);
181
-            if(is_null($filler)) {
181
+            if (is_null($filler)) {
182 182
                 return null;
183 183
             }
184 184
 
185 185
             // inteleaved data and ecc codes
186
-            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {
186
+            for ($i = 0; $i < $raw->dataLength + $raw->eccLength; $i++) {
187 187
                 $code = $raw->getCode();
188 188
                 $bit = 0x80;
189
-                for($j=0; $j<8; $j++) {
189
+                for ($j = 0; $j < 8; $j++) {
190 190
                     $addr = $filler->next();
191 191
                     $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
192 192
                     $bit = $bit >> 1;
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
             
200 200
             // remainder bits
201 201
             $j = QRspec::getRemainder($version);
202
-            for($i=0; $i<$j; $i++) {
202
+            for ($i = 0; $i < $j; $i++) {
203 203
                 $addr = $filler->next();
204 204
                 $filler->setFrameAt($addr, 0x02);
205 205
             }
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
             
211 211
             // masking
212 212
             $maskObj = new QRmask();
213
-            if($mask < 0) {
213
+            if ($mask < 0) {
214 214
             
215 215
                 if (QR_FIND_BEST_MASK) {
216 216
                     $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                 $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());
222 222
             }
223 223
             
224
-            if($masked == null) {
224
+            if ($masked == null) {
225 225
                 return null;
226 226
             }
227 227
             
@@ -243,16 +243,16 @@  discard block
 block discarded – undo
243 243
         //----------------------------------------------------------------------
244 244
         public function encodeString8bit($string, $version, $level)
245 245
         {
246
-            if(string == null) {
246
+            if (string == null) {
247 247
                 throw new Exception('empty string!');
248 248
                 return null;
249 249
             }
250 250
 
251 251
             $input = new QRinput($version, $level);
252
-            if($input == null) return null;
252
+            if ($input == null) return null;
253 253
 
254 254
             $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));
255
-            if($ret < 0) {
255
+            if ($ret < 0) {
256 256
                 unset($input);
257 257
                 return null;
258 258
             }
@@ -263,16 +263,16 @@  discard block
 block discarded – undo
263 263
         public function encodeString($string, $version, $level, $hint, $casesensitive)
264 264
         {
265 265
 
266
-            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
266
+            if ($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
267 267
                 throw new Exception('bad hint');
268 268
                 return null;
269 269
             }
270 270
 
271 271
             $input = new QRinput($version, $level);
272
-            if($input == null) return null;
272
+            if ($input == null) return null;
273 273
 
274 274
             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
275
-            if($ret < 0) {
275
+            if ($ret < 0) {
276 276
                 return null;
277 277
             }
278 278
 
@@ -280,10 +280,10 @@  discard block
 block discarded – undo
280 280
         }
281 281
         
282 282
         //----------------------------------------------------------------------
283
-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 
283
+        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint = false) 
284 284
         {
285 285
             $enc = QRencode::factory($level, $size, $margin);
286
-            return $enc->encodePNG($text, $outfile, $saveandprint=false);
286
+            return $enc->encodePNG($text, $outfile, $saveandprint = false);
287 287
         }
288 288
 
289 289
         //----------------------------------------------------------------------
@@ -340,7 +340,7 @@  discard block
 block discarded – undo
340 340
         {
341 341
             do {
342 342
             
343
-                if($this->bit == -1) {
343
+                if ($this->bit == -1) {
344 344
                     $this->bit = 0;
345 345
                     return array('x'=>$this->x, 'y'=>$this->y);
346 346
                 }
@@ -349,7 +349,7 @@  discard block
 block discarded – undo
349 349
                 $y = $this->y;
350 350
                 $w = $this->width;
351 351
 
352
-                if($this->bit == 0) {
352
+                if ($this->bit == 0) {
353 353
                     $x--;
354 354
                     $this->bit++;
355 355
                 } else {
@@ -358,33 +358,33 @@  discard block
 block discarded – undo
358 358
                     $this->bit--;
359 359
                 }
360 360
 
361
-                if($this->dir < 0) {
362
-                    if($y < 0) {
361
+                if ($this->dir < 0) {
362
+                    if ($y < 0) {
363 363
                         $y = 0;
364 364
                         $x -= 2;
365 365
                         $this->dir = 1;
366
-                        if($x == 6) {
366
+                        if ($x == 6) {
367 367
                             $x--;
368 368
                             $y = 9;
369 369
                         }
370 370
                     }
371 371
                 } else {
372
-                    if($y == $w) {
372
+                    if ($y == $w) {
373 373
                         $y = $w - 1;
374 374
                         $x -= 2;
375 375
                         $this->dir = -1;
376
-                        if($x == 6) {
376
+                        if ($x == 6) {
377 377
                             $x--;
378 378
                             $y -= 8;
379 379
                         }
380 380
                     }
381 381
                 }
382
-                if($x < 0 || $y < 0) return null;
382
+                if ($x < 0 || $y < 0) return null;
383 383
 
384 384
                 $this->x = $x;
385 385
                 $this->y = $y;
386 386
 
387
-            } while(ord($this->frame[$y][$x]) & 0x80);
387
+            } while (ord($this->frame[$y][$x]) & 0x80);
388 388
                         
389 389
             return array('x'=>$x, 'y'=>$y);
390 390
         }
@@ -447,7 +447,7 @@  discard block
 block discarded – undo
447 447
         {
448 448
             $code = new QRcode();
449 449
 
450
-            if($this->eightbit) {
450
+            if ($this->eightbit) {
451 451
                 $code->encodeString8bit($intext, $this->version, $this->level);
452 452
             } else {
453 453
                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
@@ -461,7 +461,7 @@  discard block
 block discarded – undo
461 461
         {
462 462
             $code = new QRcode();
463 463
 
464
-            if($this->eightbit) {
464
+            if ($this->eightbit) {
465 465
                 $code->encodeString8bit($intext, $this->version, $this->level);
466 466
             } else {
467 467
                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
@@ -469,7 +469,7 @@  discard block
 block discarded – undo
469 469
             
470 470
             QRtools::markTime('after_encode');
471 471
             
472
-            if ($outfile!== false) {
472
+            if ($outfile !== false) {
473 473
                 file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));
474 474
             } else {
475 475
                 return QRtools::binarize($code->data);
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
         }
478 478
         
479 479
         //----------------------------------------------------------------------
480
-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 
480
+        public function encodePNG($intext, $outfile = false, $saveandprint = false) 
481 481
         {
482 482
             try {
483 483
             
@@ -489,9 +489,9 @@  discard block
 block discarded – undo
489 489
                 if ($err != '')
490 490
                     QRtools::log($outfile, $err);
491 491
                 
492
-                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
492
+                $maxSize = (int) (QR_PNG_MAXIMUM_SIZE / (count($tab) + 2 * $this->margin));
493 493
                 
494
-                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);
494
+                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin, $saveandprint);
495 495
             
496 496
             } catch (Exception $e) {
497 497
             
Please login to merge, or discard this patch.
Braces   +18 added lines, -8 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;
@@ -486,8 +495,9 @@  discard block
 block discarded – undo
486 495
                 $err = ob_get_contents();
487 496
                 ob_end_clean();
488 497
                 
489
-                if ($err != '')
490
-                    QRtools::log($outfile, $err);
498
+                if ($err != '') {
499
+                                    QRtools::log($outfile, $err);
500
+                }
491 501
                 
492 502
                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
493 503
                 
Please login to merge, or discard this patch.
lib/phpqrcode/qrspec.php 3 patches
Spacing   +154 added lines, -154 removed lines patch added patch discarded remove patch
@@ -32,57 +32,57 @@  discard block
 block discarded – undo
32 32
  */
33 33
  
34 34
     define('QRSPEC_VERSION_MAX', 40);
35
-    define('QRSPEC_WIDTH_MAX',   177);
35
+    define('QRSPEC_WIDTH_MAX', 177);
36 36
 
37
-    define('QRCAP_WIDTH',        0);
38
-    define('QRCAP_WORDS',        1);
39
-    define('QRCAP_REMINDER',     2);
40
-    define('QRCAP_EC',           3);
37
+    define('QRCAP_WIDTH', 0);
38
+    define('QRCAP_WORDS', 1);
39
+    define('QRCAP_REMINDER', 2);
40
+    define('QRCAP_EC', 3);
41 41
 
42 42
     class QRspec {
43 43
     
44 44
         public static $capacity = array(
45
-            array(  0,    0, 0, array(   0,    0,    0,    0)),
46
-            array( 21,   26, 0, array(   7,   10,   13,   17)), // 1
47
-            array( 25,   44, 7, array(  10,   16,   22,   28)),
48
-            array( 29,   70, 7, array(  15,   26,   36,   44)),
49
-            array( 33,  100, 7, array(  20,   36,   52,   64)),
50
-            array( 37,  134, 7, array(  26,   48,   72,   88)), // 5
51
-            array( 41,  172, 7, array(  36,   64,   96,  112)),
52
-            array( 45,  196, 0, array(  40,   72,  108,  130)),
53
-            array( 49,  242, 0, array(  48,   88,  132,  156)),
54
-            array( 53,  292, 0, array(  60,  110,  160,  192)),
55
-            array( 57,  346, 0, array(  72,  130,  192,  224)), //10
56
-            array( 61,  404, 0, array(  80,  150,  224,  264)),
57
-            array( 65,  466, 0, array(  96,  176,  260,  308)),
58
-            array( 69,  532, 0, array( 104,  198,  288,  352)),
59
-            array( 73,  581, 3, array( 120,  216,  320,  384)),
60
-            array( 77,  655, 3, array( 132,  240,  360,  432)), //15
61
-            array( 81,  733, 3, array( 144,  280,  408,  480)),
62
-            array( 85,  815, 3, array( 168,  308,  448,  532)),
63
-            array( 89,  901, 3, array( 180,  338,  504,  588)),
64
-            array( 93,  991, 3, array( 196,  364,  546,  650)),
65
-            array( 97, 1085, 3, array( 224,  416,  600,  700)), //20
66
-            array(101, 1156, 4, array( 224,  442,  644,  750)),
67
-            array(105, 1258, 4, array( 252,  476,  690,  816)),
68
-            array(109, 1364, 4, array( 270,  504,  750,  900)),
69
-            array(113, 1474, 4, array( 300,  560,  810,  960)),
70
-            array(117, 1588, 4, array( 312,  588,  870, 1050)), //25
71
-            array(121, 1706, 4, array( 336,  644,  952, 1110)),
72
-            array(125, 1828, 4, array( 360,  700, 1020, 1200)),
73
-            array(129, 1921, 3, array( 390,  728, 1050, 1260)),
74
-            array(133, 2051, 3, array( 420,  784, 1140, 1350)),
75
-            array(137, 2185, 3, array( 450,  812, 1200, 1440)), //30
76
-            array(141, 2323, 3, array( 480,  868, 1290, 1530)),
77
-            array(145, 2465, 3, array( 510,  924, 1350, 1620)),
78
-            array(149, 2611, 3, array( 540,  980, 1440, 1710)),
79
-            array(153, 2761, 3, array( 570, 1036, 1530, 1800)),
80
-            array(157, 2876, 0, array( 570, 1064, 1590, 1890)), //35
81
-            array(161, 3034, 0, array( 600, 1120, 1680, 1980)),
82
-            array(165, 3196, 0, array( 630, 1204, 1770, 2100)),
83
-            array(169, 3362, 0, array( 660, 1260, 1860, 2220)),
84
-            array(173, 3532, 0, array( 720, 1316, 1950, 2310)),
85
-            array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40
45
+            array(0, 0, 0, array(0, 0, 0, 0)),
46
+            array(21, 26, 0, array(7, 10, 13, 17)), // 1
47
+            array(25, 44, 7, array(10, 16, 22, 28)),
48
+            array(29, 70, 7, array(15, 26, 36, 44)),
49
+            array(33, 100, 7, array(20, 36, 52, 64)),
50
+            array(37, 134, 7, array(26, 48, 72, 88)), // 5
51
+            array(41, 172, 7, array(36, 64, 96, 112)),
52
+            array(45, 196, 0, array(40, 72, 108, 130)),
53
+            array(49, 242, 0, array(48, 88, 132, 156)),
54
+            array(53, 292, 0, array(60, 110, 160, 192)),
55
+            array(57, 346, 0, array(72, 130, 192, 224)), //10
56
+            array(61, 404, 0, array(80, 150, 224, 264)),
57
+            array(65, 466, 0, array(96, 176, 260, 308)),
58
+            array(69, 532, 0, array(104, 198, 288, 352)),
59
+            array(73, 581, 3, array(120, 216, 320, 384)),
60
+            array(77, 655, 3, array(132, 240, 360, 432)), //15
61
+            array(81, 733, 3, array(144, 280, 408, 480)),
62
+            array(85, 815, 3, array(168, 308, 448, 532)),
63
+            array(89, 901, 3, array(180, 338, 504, 588)),
64
+            array(93, 991, 3, array(196, 364, 546, 650)),
65
+            array(97, 1085, 3, array(224, 416, 600, 700)), //20
66
+            array(101, 1156, 4, array(224, 442, 644, 750)),
67
+            array(105, 1258, 4, array(252, 476, 690, 816)),
68
+            array(109, 1364, 4, array(270, 504, 750, 900)),
69
+            array(113, 1474, 4, array(300, 560, 810, 960)),
70
+            array(117, 1588, 4, array(312, 588, 870, 1050)), //25
71
+            array(121, 1706, 4, array(336, 644, 952, 1110)),
72
+            array(125, 1828, 4, array(360, 700, 1020, 1200)),
73
+            array(129, 1921, 3, array(390, 728, 1050, 1260)),
74
+            array(133, 2051, 3, array(420, 784, 1140, 1350)),
75
+            array(137, 2185, 3, array(450, 812, 1200, 1440)), //30
76
+            array(141, 2323, 3, array(480, 868, 1290, 1530)),
77
+            array(145, 2465, 3, array(510, 924, 1350, 1620)),
78
+            array(149, 2611, 3, array(540, 980, 1440, 1710)),
79
+            array(153, 2761, 3, array(570, 1036, 1530, 1800)),
80
+            array(157, 2876, 0, array(570, 1064, 1590, 1890)), //35
81
+            array(161, 3034, 0, array(600, 1120, 1680, 1980)),
82
+            array(165, 3196, 0, array(630, 1204, 1770, 2100)),
83
+            array(169, 3362, 0, array(660, 1260, 1860, 2220)),
84
+            array(173, 3532, 0, array(720, 1316, 1950, 2310)),
85
+            array(177, 3706, 0, array(750, 1372, 2040, 2430)) //40
86 86
         );
87 87
         
88 88
         //----------------------------------------------------------------------
@@ -113,9 +113,9 @@  discard block
 block discarded – undo
113 113
         public static function getMinimumVersion($size, $level)
114 114
         {
115 115
 
116
-            for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {
117
-                $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
118
-                if($words >= $size) 
116
+            for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {
117
+                $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
118
+                if ($words >= $size) 
119 119
                     return $i;
120 120
             }
121 121
 
@@ -126,9 +126,9 @@  discard block
 block discarded – undo
126 126
         
127 127
         public static $lengthTableBits = array(
128 128
             array(10, 12, 14),
129
-            array( 9, 11, 13),
130
-            array( 8, 16, 16),
131
-            array( 8, 10, 12)
129
+            array(9, 11, 13),
130
+            array(8, 16, 16),
131
+            array(8, 10, 12)
132 132
         );
133 133
         
134 134
         //----------------------------------------------------------------------
@@ -151,12 +151,12 @@  discard block
 block discarded – undo
151 151
         //----------------------------------------------------------------------
152 152
         public static function maximumWords($mode, $version)
153 153
         {
154
-            if($mode == QR_MODE_STRUCTURE) 
154
+            if ($mode == QR_MODE_STRUCTURE) 
155 155
                 return 3;
156 156
                 
157
-            if($version <= 9) {
157
+            if ($version <= 9) {
158 158
                 $l = 0;
159
-            } else if($version <= 26) {
159
+            } else if ($version <= 26) {
160 160
                 $l = 1;
161 161
             } else {
162 162
                 $l = 2;
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
             $bits = self::$lengthTableBits[$mode][$l];
166 166
             $words = (1 << $bits) - 1;
167 167
             
168
-            if($mode == QR_MODE_KANJI) {
168
+            if ($mode == QR_MODE_KANJI) {
169 169
                 $words *= 2; // the number of bytes is required
170 170
             }
171 171
 
@@ -177,47 +177,47 @@  discard block
 block discarded – undo
177 177
         // See Table 12-16 (pp.30-36), JIS X0510:2004.
178 178
 
179 179
         public static $eccTable = array(
180
-            array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)),
181
-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), // 1
182
-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)),
183
-            array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)),
184
-            array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)),
185
-            array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), // 5
186
-            array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)),
187
-            array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)),
188
-            array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)),
189
-            array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)),
190
-            array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), //10
191
-            array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)),
192
-            array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)),
193
-            array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)),
194
-            array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)),
195
-            array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), //15
196
-            array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)),
197
-            array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)),
198
-            array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)),
199
-            array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)),
200
-            array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), //20
201
-            array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)),
202
-            array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)),
203
-            array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)),
204
-            array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)),
205
-            array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), //25
206
-            array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)),
207
-            array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)),
208
-            array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)),
209
-            array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)),
210
-            array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), //30
211
-            array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)),
212
-            array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)),
213
-            array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)),
214
-            array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)),
215
-            array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), //35
216
-            array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)),
217
-            array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)),
218
-            array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)),
219
-            array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)),
220
-            array(array(19,  6), array(18, 31), array(34, 34), array(20, 61)),//40
180
+            array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)),
181
+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), // 1
182
+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)),
183
+            array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)),
184
+            array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)),
185
+            array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), // 5
186
+            array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)),
187
+            array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)),
188
+            array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)),
189
+            array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)),
190
+            array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), //10
191
+            array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)),
192
+            array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)),
193
+            array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)),
194
+            array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)),
195
+            array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), //15
196
+            array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)),
197
+            array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)),
198
+            array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)),
199
+            array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)),
200
+            array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), //20
201
+            array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)),
202
+            array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)),
203
+            array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)),
204
+            array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)),
205
+            array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), //25
206
+            array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)),
207
+            array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)),
208
+            array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)),
209
+            array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)),
210
+            array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), //30
211
+            array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)),
212
+            array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)),
213
+            array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)),
214
+            array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)),
215
+            array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), //35
216
+            array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)),
217
+            array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)),
218
+            array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)),
219
+            array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)),
220
+            array(array(19, 6), array(18, 31), array(34, 34), array(20, 61)), //40
221 221
         );                                                                       
222 222
 
223 223
         //----------------------------------------------------------------------
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
         public static function getEccSpec($version, $level, array &$spec)
227 227
         {
228 228
             if (count($spec) < 5) {
229
-                $spec = array(0,0,0,0,0);
229
+                $spec = array(0, 0, 0, 0, 0);
230 230
             }
231 231
 
232 232
             $b1   = self::$eccTable[$version][$level][0];
@@ -234,16 +234,16 @@  discard block
 block discarded – undo
234 234
             $data = self::getDataLength($version, $level);
235 235
             $ecc  = self::getECCLength($version, $level);
236 236
 
237
-            if($b2 == 0) {
237
+            if ($b2 == 0) {
238 238
                 $spec[0] = $b1;
239
-                $spec[1] = (int)($data / $b1);
240
-                $spec[2] = (int)($ecc / $b1);
239
+                $spec[1] = (int) ($data / $b1);
240
+                $spec[2] = (int) ($ecc / $b1);
241 241
                 $spec[3] = 0; 
242 242
                 $spec[4] = 0;
243 243
             } else {
244 244
                 $spec[0] = $b1;
245
-                $spec[1] = (int)($data / ($b1 + $b2));
246
-                $spec[2] = (int)($ecc  / ($b1 + $b2));
245
+                $spec[1] = (int) ($data / ($b1 + $b2));
246
+                $spec[2] = (int) ($ecc / ($b1 + $b2));
247 247
                 $spec[3] = $b2;
248 248
                 $spec[4] = $spec[1] + 1;
249 249
             }
@@ -259,9 +259,9 @@  discard block
 block discarded – undo
259 259
         // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
260 260
          
261 261
         public static $alignmentPattern = array(      
262
-            array( 0,  0),
263
-            array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), // 1- 5
264
-            array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
262
+            array(0, 0),
263
+            array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), // 1- 5
264
+            array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
265 265
             array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), //11-15
266 266
             array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), //16-20
267 267
             array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), //21-25
@@ -287,28 +287,28 @@  discard block
 block discarded – undo
287 287
                 "\xa1\xa1\xa1\xa1\xa1"
288 288
             );                        
289 289
             
290
-            $yStart = $oy-2;         
291
-            $xStart = $ox-2;
290
+            $yStart = $oy - 2;         
291
+            $xStart = $ox - 2;
292 292
             
293
-            for($y=0; $y<5; $y++) {
294
-                QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);
293
+            for ($y = 0; $y < 5; $y++) {
294
+                QRstr::set($frame, $xStart, $yStart + $y, $finder[$y]);
295 295
             }
296 296
         }
297 297
 
298 298
         //----------------------------------------------------------------------
299 299
         public static function putAlignmentPattern($version, &$frame, $width)
300 300
         {
301
-            if($version < 2)
301
+            if ($version < 2)
302 302
                 return;
303 303
 
304 304
             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
305
-            if($d < 0) {
305
+            if ($d < 0) {
306 306
                 $w = 2;
307 307
             } else {
308
-                $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2);
308
+                $w = (int) (($width - self::$alignmentPattern[$version][0]) / $d + 2);
309 309
             }
310 310
 
311
-            if($w * $w - 3 == 1) {
311
+            if ($w * $w - 3 == 1) {
312 312
                 $x = self::$alignmentPattern[$version][0];
313 313
                 $y = self::$alignmentPattern[$version][0];
314 314
                 self::putAlignmentMarker($frame, $x, $y);
@@ -316,16 +316,16 @@  discard block
 block discarded – undo
316 316
             }
317 317
 
318 318
             $cx = self::$alignmentPattern[$version][0];
319
-            for($x=1; $x<$w - 1; $x++) {
319
+            for ($x = 1; $x < $w - 1; $x++) {
320 320
                 self::putAlignmentMarker($frame, 6, $cx);
321
-                self::putAlignmentMarker($frame, $cx,  6);
321
+                self::putAlignmentMarker($frame, $cx, 6);
322 322
                 $cx += $d;
323 323
             }
324 324
 
325 325
             $cy = self::$alignmentPattern[$version][0];
326
-            for($y=0; $y<$w-1; $y++) {
326
+            for ($y = 0; $y < $w - 1; $y++) {
327 327
                 $cx = self::$alignmentPattern[$version][0];
328
-                for($x=0; $x<$w-1; $x++) {
328
+                for ($x = 0; $x < $w - 1; $x++) {
329 329
                     self::putAlignmentMarker($frame, $cx, $cy);
330 330
                     $cx += $d;
331 331
                 }
@@ -351,10 +351,10 @@  discard block
 block discarded – undo
351 351
         //----------------------------------------------------------------------
352 352
         public static function getVersionPattern($version)
353 353
         {
354
-            if($version < 7 || $version > QRSPEC_VERSION_MAX)
354
+            if ($version < 7 || $version > QRSPEC_VERSION_MAX)
355 355
                 return 0;
356 356
 
357
-            return self::$versionPattern[$version -7];
357
+            return self::$versionPattern[$version - 7];
358 358
         }
359 359
 
360 360
         // Format information --------------------------------------------------
@@ -369,10 +369,10 @@  discard block
 block discarded – undo
369 369
 
370 370
         public static function getFormatInfo($mask, $level)
371 371
         {
372
-            if($mask < 0 || $mask > 7)
372
+            if ($mask < 0 || $mask > 7)
373 373
                 return 0;
374 374
                 
375
-            if($level < 0 || $level > 3)
375
+            if ($level < 0 || $level > 3)
376 376
                 return 0;                
377 377
 
378 378
             return self::$formatInfo[$level][$mask];
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
                 "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
402 402
             );                            
403 403
             
404
-            for($y=0; $y<7; $y++) {
405
-                QRstr::set($frame, $ox, $oy+$y, $finder[$y]);
404
+            for ($y = 0; $y < 7; $y++) {
405
+                QRstr::set($frame, $ox, $oy + $y, $finder[$y]);
406 406
             }
407 407
         }
408 408
 
@@ -410,7 +410,7 @@  discard block
 block discarded – undo
410 410
         public static function createFrame($version)
411 411
         {
412 412
             $width = self::$capacity[$version][QRCAP_WIDTH];
413
-            $frameLine = str_repeat ("\0", $width);
413
+            $frameLine = str_repeat("\0", $width);
414 414
             $frame = array_fill(0, $width, $frameLine);
415 415
 
416 416
             // Finder pattern
@@ -421,7 +421,7 @@  discard block
 block discarded – undo
421 421
             // Separator
422 422
             $yOffset = $width - 7;
423 423
             
424
-            for($y=0; $y<7; $y++) {
424
+            for ($y = 0; $y < 7; $y++) {
425 425
                 $frame[$y][7] = "\xc0";
426 426
                 $frame[$y][$width - 8] = "\xc0";
427 427
                 $frame[$yOffset][7] = "\xc0";
@@ -431,7 +431,7 @@  discard block
 block discarded – undo
431 431
             $setPattern = str_repeat("\xc0", 8);
432 432
             
433 433
             QRstr::set($frame, 0, 7, $setPattern);
434
-            QRstr::set($frame, $width-8, 7, $setPattern);
434
+            QRstr::set($frame, $width - 8, 7, $setPattern);
435 435
             QRstr::set($frame, 0, $width - 8, $setPattern);
436 436
         
437 437
             // Format info
@@ -441,38 +441,38 @@  discard block
 block discarded – undo
441 441
             
442 442
             $yOffset = $width - 8;
443 443
 
444
-            for($y=0; $y<8; $y++,$yOffset++) {
444
+            for ($y = 0; $y < 8; $y++, $yOffset++) {
445 445
                 $frame[$y][8] = "\x84";
446 446
                 $frame[$yOffset][8] = "\x84";
447 447
             }
448 448
 
449 449
             // Timing pattern  
450 450
             
451
-            for($i=1; $i<$width-15; $i++) {
452
-                $frame[6][7+$i] = chr(0x90 | ($i & 1));
453
-                $frame[7+$i][6] = chr(0x90 | ($i & 1));
451
+            for ($i = 1; $i < $width - 15; $i++) {
452
+                $frame[6][7 + $i] = chr(0x90 | ($i & 1));
453
+                $frame[7 + $i][6] = chr(0x90 | ($i & 1));
454 454
             }
455 455
             
456 456
             // Alignment pattern  
457 457
             self::putAlignmentPattern($version, $frame, $width);
458 458
             
459 459
             // Version information 
460
-            if($version >= 7) {
460
+            if ($version >= 7) {
461 461
                 $vinf = self::getVersionPattern($version);
462 462
 
463 463
                 $v = $vinf;
464 464
                 
465
-                for($x=0; $x<6; $x++) {
466
-                    for($y=0; $y<3; $y++) {
467
-                        $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
465
+                for ($x = 0; $x < 6; $x++) {
466
+                    for ($y = 0; $y < 3; $y++) {
467
+                        $frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));
468 468
                         $v = $v >> 1;
469 469
                     }
470 470
                 }
471 471
 
472 472
                 $v = $vinf;
473
-                for($y=0; $y<6; $y++) {
474
-                    for($x=0; $x<3; $x++) {
475
-                        $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
473
+                for ($y = 0; $y < 6; $y++) {
474
+                    for ($x = 0; $x < 3; $x++) {
475
+                        $frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));
476 476
                         $v = $v >> 1;
477 477
                     }
478 478
                 }
@@ -506,16 +506,16 @@  discard block
 block discarded – undo
506 506
             } else {
507 507
             
508 508
                 foreach ($frame as &$frameLine) {
509
-                    $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));
509
+                    $frameLine = join('<span class="m">&nbsp;</span>', explode("\xc0", $frameLine));
510 510
                     $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));
511
-                    $frameLine = join('<span class="p">&nbsp;</span>',  explode("\xa0", $frameLine));
511
+                    $frameLine = join('<span class="p">&nbsp;</span>', explode("\xa0", $frameLine));
512 512
                     $frameLine = join('<span class="p">&#9618;</span>', explode("\xa1", $frameLine));
513 513
                     $frameLine = join('<span class="s">&#9671;</span>', explode("\x84", $frameLine)); //format 0
514 514
                     $frameLine = join('<span class="s">&#9670;</span>', explode("\x85", $frameLine)); //format 1
515 515
                     $frameLine = join('<span class="x">&#9762;</span>', explode("\x81", $frameLine)); //special bit
516
-                    $frameLine = join('<span class="c">&nbsp;</span>',  explode("\x90", $frameLine)); //clock 0
516
+                    $frameLine = join('<span class="c">&nbsp;</span>', explode("\x90", $frameLine)); //clock 0
517 517
                     $frameLine = join('<span class="c">&#9719;</span>', explode("\x91", $frameLine)); //clock 1
518
-                    $frameLine = join('<span class="f">&nbsp;</span>',  explode("\x88", $frameLine)); //version
518
+                    $frameLine = join('<span class="f">&nbsp;</span>', explode("\x88", $frameLine)); //version
519 519
                     $frameLine = join('<span class="f">&#9618;</span>', explode("\x89", $frameLine)); //version
520 520
                     $frameLine = join('&#9830;', explode("\x01", $frameLine));
521 521
                     $frameLine = join('&#8901;', explode("\0", $frameLine));
@@ -553,10 +553,10 @@  discard block
 block discarded – undo
553 553
         //----------------------------------------------------------------------
554 554
         public static function newFrame($version)
555 555
         {
556
-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 
556
+            if ($version < 1 || $version > QRSPEC_VERSION_MAX) 
557 557
                 return null;
558 558
 
559
-            if(!isset(self::$frames[$version])) {
559
+            if (!isset(self::$frames[$version])) {
560 560
                 
561 561
                 $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';
562 562
                 
@@ -572,21 +572,21 @@  discard block
 block discarded – undo
572 572
                 }
573 573
             }
574 574
             
575
-            if(is_null(self::$frames[$version]))
575
+            if (is_null(self::$frames[$version]))
576 576
                 return null;
577 577
 
578 578
             return self::$frames[$version];
579 579
         }
580 580
 
581 581
         //----------------------------------------------------------------------
582
-        public static function rsBlockNum($spec)     { return $spec[0] + $spec[3]; }
583
-        public static function rsBlockNum1($spec)    { return $spec[0]; }
584
-        public static function rsDataCodes1($spec)   { return $spec[1]; }
585
-        public static function rsEccCodes1($spec)    { return $spec[2]; }
586
-        public static function rsBlockNum2($spec)    { return $spec[3]; }
587
-        public static function rsDataCodes2($spec)   { return $spec[4]; }
588
-        public static function rsEccCodes2($spec)    { return $spec[2]; }
589
-        public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }
590
-        public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }
582
+        public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; }
583
+        public static function rsBlockNum1($spec) { return $spec[0]; }
584
+        public static function rsDataCodes1($spec) { return $spec[1]; }
585
+        public static function rsEccCodes1($spec) { return $spec[2]; }
586
+        public static function rsBlockNum2($spec) { return $spec[3]; }
587
+        public static function rsDataCodes2($spec) { return $spec[4]; }
588
+        public static function rsEccCodes2($spec) { return $spec[2]; }
589
+        public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); }
590
+        public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; }
591 591
         
592 592
     }
593 593
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +27 added lines, -18 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;
@@ -134,8 +135,9 @@  discard block
 block discarded – undo
134 135
         //----------------------------------------------------------------------
135 136
         public static function lengthIndicator($mode, $version)
136 137
         {
137
-            if ($mode == QR_MODE_STRUCTURE)
138
-                return 0;
138
+            if ($mode == QR_MODE_STRUCTURE) {
139
+                            return 0;
140
+            }
139 141
                 
140 142
             if ($version <= 9) {
141 143
                 $l = 0;
@@ -151,8 +153,9 @@  discard block
 block discarded – undo
151 153
         //----------------------------------------------------------------------
152 154
         public static function maximumWords($mode, $version)
153 155
         {
154
-            if($mode == QR_MODE_STRUCTURE) 
155
-                return 3;
156
+            if($mode == QR_MODE_STRUCTURE) {
157
+                            return 3;
158
+            }
156 159
                 
157 160
             if($version <= 9) {
158 161
                 $l = 0;
@@ -298,8 +301,9 @@  discard block
 block discarded – undo
298 301
         //----------------------------------------------------------------------
299 302
         public static function putAlignmentPattern($version, &$frame, $width)
300 303
         {
301
-            if($version < 2)
302
-                return;
304
+            if($version < 2) {
305
+                            return;
306
+            }
303 307
 
304 308
             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
305 309
             if($d < 0) {
@@ -351,8 +355,9 @@  discard block
 block discarded – undo
351 355
         //----------------------------------------------------------------------
352 356
         public static function getVersionPattern($version)
353 357
         {
354
-            if($version < 7 || $version > QRSPEC_VERSION_MAX)
355
-                return 0;
358
+            if($version < 7 || $version > QRSPEC_VERSION_MAX) {
359
+                            return 0;
360
+            }
356 361
 
357 362
             return self::$versionPattern[$version -7];
358 363
         }
@@ -369,11 +374,13 @@  discard block
 block discarded – undo
369 374
 
370 375
         public static function getFormatInfo($mask, $level)
371 376
         {
372
-            if($mask < 0 || $mask > 7)
373
-                return 0;
377
+            if($mask < 0 || $mask > 7) {
378
+                            return 0;
379
+            }
374 380
                 
375
-            if($level < 0 || $level > 3)
376
-                return 0;                
381
+            if($level < 0 || $level > 3) {
382
+                            return 0;
383
+            }
377 384
 
378 385
             return self::$formatInfo[$level][$mask];
379 386
         }
@@ -553,8 +560,9 @@  discard block
 block discarded – undo
553 560
         //----------------------------------------------------------------------
554 561
         public static function newFrame($version)
555 562
         {
556
-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 
557
-                return null;
563
+            if($version < 1 || $version > QRSPEC_VERSION_MAX) {
564
+                            return null;
565
+            }
558 566
 
559 567
             if(!isset(self::$frames[$version])) {
560 568
                 
@@ -572,8 +580,9 @@  discard block
 block discarded – undo
572 580
                 }
573 581
             }
574 582
             
575
-            if(is_null(self::$frames[$version]))
576
-                return null;
583
+            if(is_null(self::$frames[$version])) {
584
+                            return null;
585
+            }
577 586
 
578 587
             return self::$frames[$version];
579 588
         }
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -335,10 +335,10 @@
 block discarded – undo
335 335
 
336 336
         // Version information pattern -----------------------------------------
337 337
 
338
-		// Version information pattern (BCH coded).
338
+        // Version information pattern (BCH coded).
339 339
         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
340 340
         
341
-		// size: [QRSPEC_VERSION_MAX - 6]
341
+        // size: [QRSPEC_VERSION_MAX - 6]
342 342
 		
343 343
         public static $versionPattern = array(
344 344
             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,
Please login to merge, or discard this patch.
lib/phpqrcode/phpqrcode.php 4 patches
Switch Indentation   +88 added lines, -88 removed lines patch added patch discarded remove patch
@@ -1214,13 +1214,13 @@  discard block
 block discarded – undo
1214 1214
                 $version = 1;
1215 1215
 
1216 1216
             switch($this->mode) {
1217
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
1218
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
1219
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
1220
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
1221
-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
1222
-                default:
1223
-                    return 0;
1217
+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
1218
+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
1219
+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
1220
+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
1221
+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
1222
+            default:
1223
+                return 0;
1224 1224
             }
1225 1225
 
1226 1226
             $l = QRspec::lengthIndicator($this->mode, $version);
@@ -1260,14 +1260,14 @@  discard block
 block discarded – undo
1260 1260
                     $ret = 0;
1261 1261
                     
1262 1262
                     switch($this->mode) {
1263
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
1264
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
1265
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
1266
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
1267
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
1263
+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
1264
+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
1265
+                    case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
1266
+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
1267
+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
1268 1268
                         
1269
-                        default:
1270
-                            break;
1269
+                    default:
1270
+                        break;
1271 1271
                     }
1272 1272
                     
1273 1273
                     if($ret < 0)
@@ -1417,14 +1417,14 @@  discard block
 block discarded – undo
1417 1417
             $bits = $w * 10;
1418 1418
             
1419 1419
             switch($size - $w * 3) {
1420
-                case 1:
1421
-                    $bits += 4;
1422
-                    break;
1423
-                case 2:
1424
-                    $bits += 7;
1425
-                    break;
1426
-                default:
1427
-                    break;
1420
+            case 1:
1421
+                $bits += 4;
1422
+                break;
1423
+            case 2:
1424
+                $bits += 7;
1425
+                break;
1426
+            default:
1427
+                break;
1428 1428
             }
1429 1429
 
1430 1430
             return $bits;
@@ -1513,14 +1513,14 @@  discard block
 block discarded – undo
1513 1513
                 return false;
1514 1514
 
1515 1515
             switch($mode) {
1516
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
1517
-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
1518
-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
1519
-                case QR_MODE_8:         return true; break;
1520
-                case QR_MODE_STRUCTURE: return true; break;
1516
+            case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
1517
+            case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
1518
+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
1519
+            case QR_MODE_8:         return true; break;
1520
+            case QR_MODE_STRUCTURE: return true; break;
1521 1521
                 
1522
-                default:
1523
-                    break;
1522
+            default:
1523
+                break;
1524 1524
             }
1525 1525
 
1526 1526
             return false;
@@ -1561,35 +1561,35 @@  discard block
 block discarded – undo
1561 1561
         {
1562 1562
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
1563 1563
             switch($mode) {
1564
-                case QR_MODE_NUM:
1565
-                    $chunks = (int)($payload / 10);
1566
-                    $remain = $payload - $chunks * 10;
1567
-                    $size = $chunks * 3;
1568
-                    if($remain >= 7) {
1569
-                        $size += 2;
1570
-                    } else if($remain >= 4) {
1571
-                        $size += 1;
1572
-                    }
1573
-                    break;
1574
-                case QR_MODE_AN:
1575
-                    $chunks = (int)($payload / 11);
1576
-                    $remain = $payload - $chunks * 11;
1577
-                    $size = $chunks * 2;
1578
-                    if($remain >= 6) 
1579
-                        $size++;
1580
-                    break;
1581
-                case QR_MODE_8:
1582
-                    $size = (int)($payload / 8);
1583
-                    break;
1584
-                case QR_MODE_KANJI:
1585
-                    $size = (int)(($payload / 13) * 2);
1586
-                    break;
1587
-                case QR_MODE_STRUCTURE:
1588
-                    $size = (int)($payload / 8);
1589
-                    break;
1590
-                default:
1591
-                    $size = 0;
1592
-                    break;
1564
+            case QR_MODE_NUM:
1565
+                $chunks = (int)($payload / 10);
1566
+                $remain = $payload - $chunks * 10;
1567
+                $size = $chunks * 3;
1568
+                if($remain >= 7) {
1569
+                    $size += 2;
1570
+                } else if($remain >= 4) {
1571
+                    $size += 1;
1572
+                }
1573
+                break;
1574
+            case QR_MODE_AN:
1575
+                $chunks = (int)($payload / 11);
1576
+                $remain = $payload - $chunks * 11;
1577
+                $size = $chunks * 2;
1578
+                if($remain >= 6) 
1579
+                    $size++;
1580
+                break;
1581
+            case QR_MODE_8:
1582
+                $size = (int)($payload / 8);
1583
+                break;
1584
+            case QR_MODE_KANJI:
1585
+                $size = (int)(($payload / 13) * 2);
1586
+                break;
1587
+            case QR_MODE_STRUCTURE:
1588
+                $size = (int)($payload / 8);
1589
+                break;
1590
+            default:
1591
+                $size = 0;
1592
+                break;
1593 1593
             }
1594 1594
             
1595 1595
             $maxsize = QRspec::maximumWords($mode, $version);
@@ -2192,14 +2192,14 @@  discard block
 block discarded – undo
2192 2192
                 $mode = $this->identifyMode(0);
2193 2193
                 
2194 2194
                 switch ($mode) {
2195
-                    case QR_MODE_NUM: $length = $this->eatNum(); break;
2196
-                    case QR_MODE_AN:  $length = $this->eatAn(); break;
2197
-                    case QR_MODE_KANJI:
2198
-                        if ($this->modeHint == QR_MODE_KANJI)
2199
-                                $length = $this->eatKanji();
2200
-                        else    $length = $this->eat8();
2201
-                        break;
2202
-                    default: $length = $this->eat8(); break;
2195
+                case QR_MODE_NUM: $length = $this->eatNum(); break;
2196
+                case QR_MODE_AN:  $length = $this->eatAn(); break;
2197
+                case QR_MODE_KANJI:
2198
+                    if ($this->modeHint == QR_MODE_KANJI)
2199
+                            $length = $this->eatKanji();
2200
+                    else    $length = $this->eat8();
2201
+                    break;
2202
+                default: $length = $this->eat8(); break;
2203 2203
                 
2204 2204
                 }
2205 2205
 
@@ -3223,28 +3223,28 @@  discard block
 block discarded – undo
3223 3223
             $enc->margin = $margin;
3224 3224
             
3225 3225
             switch ($level.'') {
3226
-                case '0':
3227
-                case '1':
3228
-                case '2':
3229
-                case '3':
3230
-                        $enc->level = $level;
3231
-                    break;
3232
-                case 'l':
3233
-                case 'L':
3234
-                        $enc->level = QR_ECLEVEL_L;
3235
-                    break;
3236
-                case 'm':
3237
-                case 'M':
3238
-                        $enc->level = QR_ECLEVEL_M;
3239
-                    break;
3240
-                case 'q':
3241
-                case 'Q':
3242
-                        $enc->level = QR_ECLEVEL_Q;
3243
-                    break;
3244
-                case 'h':
3245
-                case 'H':
3246
-                        $enc->level = QR_ECLEVEL_H;
3247
-                    break;
3226
+            case '0':
3227
+            case '1':
3228
+            case '2':
3229
+            case '3':
3230
+                    $enc->level = $level;
3231
+                break;
3232
+            case 'l':
3233
+            case 'L':
3234
+                    $enc->level = QR_ECLEVEL_L;
3235
+                break;
3236
+            case 'm':
3237
+            case 'M':
3238
+                    $enc->level = QR_ECLEVEL_M;
3239
+                break;
3240
+            case 'q':
3241
+            case 'Q':
3242
+                    $enc->level = QR_ECLEVEL_Q;
3243
+                break;
3244
+            case 'h':
3245
+            case 'H':
3246
+                    $enc->level = QR_ECLEVEL_H;
3247
+                break;
3248 3248
             }
3249 3249
             
3250 3250
             return $enc;
Please login to merge, or discard this patch.
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
 
@@ -211,9 +211,9 @@  discard block
 block discarded – undo
211 211
         //----------------------------------------------------------------------
212 212
         public static function buildCache()
213 213
         {
214
-			QRtools::markTime('before_build_cache');
214
+            QRtools::markTime('before_build_cache');
215 215
 			
216
-			$mask = new QRmask();
216
+            $mask = new QRmask();
217 217
             for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
218 218
                 $frame = QRspec::newFrame($a);
219 219
                 if (QR_IMAGE) {
@@ -221,13 +221,13 @@  discard block
 block discarded – undo
221 221
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);
222 222
                 }
223 223
 				
224
-				$width = count($frame);
225
-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
226
-				for ($maskNo=0; $maskNo<8; $maskNo++)
227
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
224
+                $width = count($frame);
225
+                $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
226
+                for ($maskNo=0; $maskNo<8; $maskNo++)
227
+                    $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
228 228
             }
229 229
 			
230
-			QRtools::markTime('after_build_cache');
230
+            QRtools::markTime('after_build_cache');
231 231
         }
232 232
 
233 233
         //----------------------------------------------------------------------
@@ -647,10 +647,10 @@  discard block
 block discarded – undo
647 647
 
648 648
         // Version information pattern -----------------------------------------
649 649
 
650
-		// Version information pattern (BCH coded).
650
+        // Version information pattern (BCH coded).
651 651
         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.
652 652
         
653
-		// size: [QRSPEC_VERSION_MAX - 6]
653
+        // size: [QRSPEC_VERSION_MAX - 6]
654 654
 		
655 655
         public static $versionPattern = array(
656 656
             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,
@@ -1435,7 +1435,7 @@  discard block
 block discarded – undo
1435 1435
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1436 1436
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1437 1437
             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
1438
-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
1438
+                0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
1439 1439
             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
1440 1440
             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
1441 1441
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -2497,17 +2497,17 @@  discard block
 block discarded – undo
2497 2497
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
2498 2498
  */
2499 2499
  
2500
-	define('N1', 3);
2501
-	define('N2', 3);
2502
-	define('N3', 40);
2503
-	define('N4', 10);
2500
+    define('N1', 3);
2501
+    define('N2', 3);
2502
+    define('N3', 40);
2503
+    define('N4', 10);
2504 2504
 
2505
-	class QRmask {
2505
+    class QRmask {
2506 2506
 	
2507
-		public $runLength = array();
2507
+        public $runLength = array();
2508 2508
 		
2509
-		//----------------------------------------------------------------------
2510
-		public function __construct() 
2509
+        //----------------------------------------------------------------------
2510
+        public function __construct() 
2511 2511
         {
2512 2512
             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);
2513 2513
         }
Please login to merge, or discard this patch.
Spacing   +502 added lines, -502 removed lines patch added patch discarded remove patch
@@ -93,11 +93,11 @@  discard block
 block discarded – undo
93 93
 	// Supported output formats
94 94
 	
95 95
 	define('QR_FORMAT_TEXT', 0);
96
-	define('QR_FORMAT_PNG',  1);
96
+	define('QR_FORMAT_PNG', 1);
97 97
 	
98 98
 	class qrstr {
99 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));
100
+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));
101 101
 		}
102 102
 	}	
103 103
 
@@ -114,15 +114,15 @@  discard block
 block discarded – undo
114 114
  * Config file, tuned-up for merged verion
115 115
  */
116 116
      
117
-    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there
118
-    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true
119
-    define('QR_LOG_DIR', false);         // default error logs dir   
117
+    define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there
118
+    define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true
119
+    define('QR_LOG_DIR', false); // default error logs dir   
120 120
     
121
-    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
122
-    define('QR_FIND_FROM_RANDOM', 2);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
123
-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
121
+    define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
122
+    define('QR_FIND_FROM_RANDOM', 2); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
123
+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false
124 124
                                                   
125
-    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
125
+    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
126 126
                                                   
127 127
 
128 128
 
@@ -163,8 +163,8 @@  discard block
 block discarded – undo
163 163
             $len = count($frame);
164 164
             foreach ($frame as &$frameLine) {
165 165
                 
166
-                for($i=0; $i<$len; $i++) {
167
-                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
166
+                for ($i = 0; $i < $len; $i++) {
167
+                    $frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';
168 168
                 }
169 169
             }
170 170
             
@@ -194,8 +194,8 @@  discard block
 block discarded – undo
194 194
                 
195 195
             foreach ($qrTab as $line) {
196 196
                 $arrAdd = array();
197
-                foreach(str_split($line) as $char)
198
-                    $arrAdd[] = ($char=='1')?1:0;
197
+                foreach (str_split($line) as $char)
198
+                    $arrAdd[] = ($char == '1') ? 1 : 0;
199 199
                 $barcode_array['bcode'][] = $arrAdd;
200 200
             }
201 201
                     
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 			QRtools::markTime('before_build_cache');
215 215
 			
216 216
 			$mask = new QRmask();
217
-            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
217
+            for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {
218 218
                 $frame = QRspec::newFrame($a);
219 219
                 if (QR_IMAGE) {
220 220
                     $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';
@@ -223,7 +223,7 @@  discard block
 block discarded – undo
223 223
 				
224 224
 				$width = count($frame);
225 225
 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
226
-				for ($maskNo=0; $maskNo<8; $maskNo++)
226
+				for ($maskNo = 0; $maskNo < 8; $maskNo++)
227 227
 					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
228 228
             }
229 229
 			
@@ -248,8 +248,8 @@  discard block
 block discarded – undo
248 248
         public static function dumpMask($frame) 
249 249
         {
250 250
             $width = count($frame);
251
-            for($y=0;$y<$width;$y++) {
252
-                for($x=0;$x<$width;$x++) {
251
+            for ($y = 0; $y < $width; $y++) {
252
+                for ($x = 0; $x < $width; $x++) {
253 253
                     echo ord($frame[$y][$x]).',';
254 254
                 }
255 255
             }
@@ -259,7 +259,7 @@  discard block
 block discarded – undo
259 259
         public static function markTime($markerId)
260 260
         {
261 261
             list($usec, $sec) = explode(" ", microtime());
262
-            $time = ((float)$usec + (float)$sec);
262
+            $time = ((float) $usec + (float) $sec);
263 263
             
264 264
             if (!isset($GLOBALS['qr_time_bench']))
265 265
                 $GLOBALS['qr_time_bench'] = array();
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
280 280
                     <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>
281 281
                     <tbody>';
282 282
 
283
-            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
283
+            foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
284 284
                 if ($p > 0) {
285
-                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';
285
+                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime - $lastTime, 6).'s</td></tr>';
286 286
                 } else {
287 287
                     $startTime = $thisTime;
288 288
                 }
@@ -292,7 +292,7 @@  discard block
 block discarded – undo
292 292
             }
293 293
             
294 294
             echo '</tbody><tfoot>
295
-                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>
295
+                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6).'s</td></tr>
296 296
             </tfoot>
297 297
             </table>';
298 298
         }
@@ -344,57 +344,57 @@  discard block
 block discarded – undo
344 344
  */
345 345
  
346 346
     define('QRSPEC_VERSION_MAX', 40);
347
-    define('QRSPEC_WIDTH_MAX',   177);
347
+    define('QRSPEC_WIDTH_MAX', 177);
348 348
 
349
-    define('QRCAP_WIDTH',        0);
350
-    define('QRCAP_WORDS',        1);
351
-    define('QRCAP_REMINDER',     2);
352
-    define('QRCAP_EC',           3);
349
+    define('QRCAP_WIDTH', 0);
350
+    define('QRCAP_WORDS', 1);
351
+    define('QRCAP_REMINDER', 2);
352
+    define('QRCAP_EC', 3);
353 353
 
354 354
     class QRspec {
355 355
     
356 356
         public static $capacity = array(
357
-            array(  0,    0, 0, array(   0,    0,    0,    0)),
358
-            array( 21,   26, 0, array(   7,   10,   13,   17)), // 1
359
-            array( 25,   44, 7, array(  10,   16,   22,   28)),
360
-            array( 29,   70, 7, array(  15,   26,   36,   44)),
361
-            array( 33,  100, 7, array(  20,   36,   52,   64)),
362
-            array( 37,  134, 7, array(  26,   48,   72,   88)), // 5
363
-            array( 41,  172, 7, array(  36,   64,   96,  112)),
364
-            array( 45,  196, 0, array(  40,   72,  108,  130)),
365
-            array( 49,  242, 0, array(  48,   88,  132,  156)),
366
-            array( 53,  292, 0, array(  60,  110,  160,  192)),
367
-            array( 57,  346, 0, array(  72,  130,  192,  224)), //10
368
-            array( 61,  404, 0, array(  80,  150,  224,  264)),
369
-            array( 65,  466, 0, array(  96,  176,  260,  308)),
370
-            array( 69,  532, 0, array( 104,  198,  288,  352)),
371
-            array( 73,  581, 3, array( 120,  216,  320,  384)),
372
-            array( 77,  655, 3, array( 132,  240,  360,  432)), //15
373
-            array( 81,  733, 3, array( 144,  280,  408,  480)),
374
-            array( 85,  815, 3, array( 168,  308,  448,  532)),
375
-            array( 89,  901, 3, array( 180,  338,  504,  588)),
376
-            array( 93,  991, 3, array( 196,  364,  546,  650)),
377
-            array( 97, 1085, 3, array( 224,  416,  600,  700)), //20
378
-            array(101, 1156, 4, array( 224,  442,  644,  750)),
379
-            array(105, 1258, 4, array( 252,  476,  690,  816)),
380
-            array(109, 1364, 4, array( 270,  504,  750,  900)),
381
-            array(113, 1474, 4, array( 300,  560,  810,  960)),
382
-            array(117, 1588, 4, array( 312,  588,  870, 1050)), //25
383
-            array(121, 1706, 4, array( 336,  644,  952, 1110)),
384
-            array(125, 1828, 4, array( 360,  700, 1020, 1200)),
385
-            array(129, 1921, 3, array( 390,  728, 1050, 1260)),
386
-            array(133, 2051, 3, array( 420,  784, 1140, 1350)),
387
-            array(137, 2185, 3, array( 450,  812, 1200, 1440)), //30
388
-            array(141, 2323, 3, array( 480,  868, 1290, 1530)),
389
-            array(145, 2465, 3, array( 510,  924, 1350, 1620)),
390
-            array(149, 2611, 3, array( 540,  980, 1440, 1710)),
391
-            array(153, 2761, 3, array( 570, 1036, 1530, 1800)),
392
-            array(157, 2876, 0, array( 570, 1064, 1590, 1890)), //35
393
-            array(161, 3034, 0, array( 600, 1120, 1680, 1980)),
394
-            array(165, 3196, 0, array( 630, 1204, 1770, 2100)),
395
-            array(169, 3362, 0, array( 660, 1260, 1860, 2220)),
396
-            array(173, 3532, 0, array( 720, 1316, 1950, 2310)),
397
-            array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40
357
+            array(0, 0, 0, array(0, 0, 0, 0)),
358
+            array(21, 26, 0, array(7, 10, 13, 17)), // 1
359
+            array(25, 44, 7, array(10, 16, 22, 28)),
360
+            array(29, 70, 7, array(15, 26, 36, 44)),
361
+            array(33, 100, 7, array(20, 36, 52, 64)),
362
+            array(37, 134, 7, array(26, 48, 72, 88)), // 5
363
+            array(41, 172, 7, array(36, 64, 96, 112)),
364
+            array(45, 196, 0, array(40, 72, 108, 130)),
365
+            array(49, 242, 0, array(48, 88, 132, 156)),
366
+            array(53, 292, 0, array(60, 110, 160, 192)),
367
+            array(57, 346, 0, array(72, 130, 192, 224)), //10
368
+            array(61, 404, 0, array(80, 150, 224, 264)),
369
+            array(65, 466, 0, array(96, 176, 260, 308)),
370
+            array(69, 532, 0, array(104, 198, 288, 352)),
371
+            array(73, 581, 3, array(120, 216, 320, 384)),
372
+            array(77, 655, 3, array(132, 240, 360, 432)), //15
373
+            array(81, 733, 3, array(144, 280, 408, 480)),
374
+            array(85, 815, 3, array(168, 308, 448, 532)),
375
+            array(89, 901, 3, array(180, 338, 504, 588)),
376
+            array(93, 991, 3, array(196, 364, 546, 650)),
377
+            array(97, 1085, 3, array(224, 416, 600, 700)), //20
378
+            array(101, 1156, 4, array(224, 442, 644, 750)),
379
+            array(105, 1258, 4, array(252, 476, 690, 816)),
380
+            array(109, 1364, 4, array(270, 504, 750, 900)),
381
+            array(113, 1474, 4, array(300, 560, 810, 960)),
382
+            array(117, 1588, 4, array(312, 588, 870, 1050)), //25
383
+            array(121, 1706, 4, array(336, 644, 952, 1110)),
384
+            array(125, 1828, 4, array(360, 700, 1020, 1200)),
385
+            array(129, 1921, 3, array(390, 728, 1050, 1260)),
386
+            array(133, 2051, 3, array(420, 784, 1140, 1350)),
387
+            array(137, 2185, 3, array(450, 812, 1200, 1440)), //30
388
+            array(141, 2323, 3, array(480, 868, 1290, 1530)),
389
+            array(145, 2465, 3, array(510, 924, 1350, 1620)),
390
+            array(149, 2611, 3, array(540, 980, 1440, 1710)),
391
+            array(153, 2761, 3, array(570, 1036, 1530, 1800)),
392
+            array(157, 2876, 0, array(570, 1064, 1590, 1890)), //35
393
+            array(161, 3034, 0, array(600, 1120, 1680, 1980)),
394
+            array(165, 3196, 0, array(630, 1204, 1770, 2100)),
395
+            array(169, 3362, 0, array(660, 1260, 1860, 2220)),
396
+            array(173, 3532, 0, array(720, 1316, 1950, 2310)),
397
+            array(177, 3706, 0, array(750, 1372, 2040, 2430)) //40
398 398
         );
399 399
         
400 400
         //----------------------------------------------------------------------
@@ -425,9 +425,9 @@  discard block
 block discarded – undo
425 425
         public static function getMinimumVersion($size, $level)
426 426
         {
427 427
 
428
-            for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {
429
-                $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
430
-                if($words >= $size) 
428
+            for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {
429
+                $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
430
+                if ($words >= $size) 
431 431
                     return $i;
432 432
             }
433 433
 
@@ -438,9 +438,9 @@  discard block
 block discarded – undo
438 438
         
439 439
         public static $lengthTableBits = array(
440 440
             array(10, 12, 14),
441
-            array( 9, 11, 13),
442
-            array( 8, 16, 16),
443
-            array( 8, 10, 12)
441
+            array(9, 11, 13),
442
+            array(8, 16, 16),
443
+            array(8, 10, 12)
444 444
         );
445 445
         
446 446
         //----------------------------------------------------------------------
@@ -463,12 +463,12 @@  discard block
 block discarded – undo
463 463
         //----------------------------------------------------------------------
464 464
         public static function maximumWords($mode, $version)
465 465
         {
466
-            if($mode == QR_MODE_STRUCTURE) 
466
+            if ($mode == QR_MODE_STRUCTURE) 
467 467
                 return 3;
468 468
                 
469
-            if($version <= 9) {
469
+            if ($version <= 9) {
470 470
                 $l = 0;
471
-            } else if($version <= 26) {
471
+            } else if ($version <= 26) {
472 472
                 $l = 1;
473 473
             } else {
474 474
                 $l = 2;
@@ -477,7 +477,7 @@  discard block
 block discarded – undo
477 477
             $bits = self::$lengthTableBits[$mode][$l];
478 478
             $words = (1 << $bits) - 1;
479 479
             
480
-            if($mode == QR_MODE_KANJI) {
480
+            if ($mode == QR_MODE_KANJI) {
481 481
                 $words *= 2; // the number of bytes is required
482 482
             }
483 483
 
@@ -489,47 +489,47 @@  discard block
 block discarded – undo
489 489
         // See Table 12-16 (pp.30-36), JIS X0510:2004.
490 490
 
491 491
         public static $eccTable = array(
492
-            array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)),
493
-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), // 1
494
-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)),
495
-            array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)),
496
-            array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)),
497
-            array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), // 5
498
-            array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)),
499
-            array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)),
500
-            array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)),
501
-            array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)),
502
-            array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), //10
503
-            array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)),
504
-            array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)),
505
-            array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)),
506
-            array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)),
507
-            array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), //15
508
-            array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)),
509
-            array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)),
510
-            array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)),
511
-            array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)),
512
-            array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), //20
513
-            array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)),
514
-            array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)),
515
-            array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)),
516
-            array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)),
517
-            array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), //25
518
-            array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)),
519
-            array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)),
520
-            array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)),
521
-            array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)),
522
-            array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), //30
523
-            array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)),
524
-            array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)),
525
-            array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)),
526
-            array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)),
527
-            array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), //35
528
-            array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)),
529
-            array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)),
530
-            array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)),
531
-            array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)),
532
-            array(array(19,  6), array(18, 31), array(34, 34), array(20, 61)),//40
492
+            array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)),
493
+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), // 1
494
+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)),
495
+            array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)),
496
+            array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)),
497
+            array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), // 5
498
+            array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)),
499
+            array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)),
500
+            array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)),
501
+            array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)),
502
+            array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), //10
503
+            array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)),
504
+            array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)),
505
+            array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)),
506
+            array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)),
507
+            array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), //15
508
+            array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)),
509
+            array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)),
510
+            array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)),
511
+            array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)),
512
+            array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), //20
513
+            array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)),
514
+            array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)),
515
+            array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)),
516
+            array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)),
517
+            array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), //25
518
+            array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)),
519
+            array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)),
520
+            array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)),
521
+            array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)),
522
+            array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), //30
523
+            array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)),
524
+            array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)),
525
+            array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)),
526
+            array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)),
527
+            array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), //35
528
+            array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)),
529
+            array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)),
530
+            array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)),
531
+            array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)),
532
+            array(array(19, 6), array(18, 31), array(34, 34), array(20, 61)), //40
533 533
         );                                                                       
534 534
 
535 535
         //----------------------------------------------------------------------
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
         public static function getEccSpec($version, $level, array &$spec)
539 539
         {
540 540
             if (count($spec) < 5) {
541
-                $spec = array(0,0,0,0,0);
541
+                $spec = array(0, 0, 0, 0, 0);
542 542
             }
543 543
 
544 544
             $b1   = self::$eccTable[$version][$level][0];
@@ -546,16 +546,16 @@  discard block
 block discarded – undo
546 546
             $data = self::getDataLength($version, $level);
547 547
             $ecc  = self::getECCLength($version, $level);
548 548
 
549
-            if($b2 == 0) {
549
+            if ($b2 == 0) {
550 550
                 $spec[0] = $b1;
551
-                $spec[1] = (int)($data / $b1);
552
-                $spec[2] = (int)($ecc / $b1);
551
+                $spec[1] = (int) ($data / $b1);
552
+                $spec[2] = (int) ($ecc / $b1);
553 553
                 $spec[3] = 0; 
554 554
                 $spec[4] = 0;
555 555
             } else {
556 556
                 $spec[0] = $b1;
557
-                $spec[1] = (int)($data / ($b1 + $b2));
558
-                $spec[2] = (int)($ecc  / ($b1 + $b2));
557
+                $spec[1] = (int) ($data / ($b1 + $b2));
558
+                $spec[2] = (int) ($ecc / ($b1 + $b2));
559 559
                 $spec[3] = $b2;
560 560
                 $spec[4] = $spec[1] + 1;
561 561
             }
@@ -571,9 +571,9 @@  discard block
 block discarded – undo
571 571
         // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.
572 572
          
573 573
         public static $alignmentPattern = array(      
574
-            array( 0,  0),
575
-            array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), // 1- 5
576
-            array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
574
+            array(0, 0),
575
+            array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), // 1- 5
576
+            array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10
577 577
             array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), //11-15
578 578
             array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), //16-20
579 579
             array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), //21-25
@@ -599,28 +599,28 @@  discard block
 block discarded – undo
599 599
                 "\xa1\xa1\xa1\xa1\xa1"
600 600
             );                        
601 601
             
602
-            $yStart = $oy-2;         
603
-            $xStart = $ox-2;
602
+            $yStart = $oy - 2;         
603
+            $xStart = $ox - 2;
604 604
             
605
-            for($y=0; $y<5; $y++) {
606
-                QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);
605
+            for ($y = 0; $y < 5; $y++) {
606
+                QRstr::set($frame, $xStart, $yStart + $y, $finder[$y]);
607 607
             }
608 608
         }
609 609
 
610 610
         //----------------------------------------------------------------------
611 611
         public static function putAlignmentPattern($version, &$frame, $width)
612 612
         {
613
-            if($version < 2)
613
+            if ($version < 2)
614 614
                 return;
615 615
 
616 616
             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
617
-            if($d < 0) {
617
+            if ($d < 0) {
618 618
                 $w = 2;
619 619
             } else {
620
-                $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2);
620
+                $w = (int) (($width - self::$alignmentPattern[$version][0]) / $d + 2);
621 621
             }
622 622
 
623
-            if($w * $w - 3 == 1) {
623
+            if ($w * $w - 3 == 1) {
624 624
                 $x = self::$alignmentPattern[$version][0];
625 625
                 $y = self::$alignmentPattern[$version][0];
626 626
                 self::putAlignmentMarker($frame, $x, $y);
@@ -628,16 +628,16 @@  discard block
 block discarded – undo
628 628
             }
629 629
 
630 630
             $cx = self::$alignmentPattern[$version][0];
631
-            for($x=1; $x<$w - 1; $x++) {
631
+            for ($x = 1; $x < $w - 1; $x++) {
632 632
                 self::putAlignmentMarker($frame, 6, $cx);
633
-                self::putAlignmentMarker($frame, $cx,  6);
633
+                self::putAlignmentMarker($frame, $cx, 6);
634 634
                 $cx += $d;
635 635
             }
636 636
 
637 637
             $cy = self::$alignmentPattern[$version][0];
638
-            for($y=0; $y<$w-1; $y++) {
638
+            for ($y = 0; $y < $w - 1; $y++) {
639 639
                 $cx = self::$alignmentPattern[$version][0];
640
-                for($x=0; $x<$w-1; $x++) {
640
+                for ($x = 0; $x < $w - 1; $x++) {
641 641
                     self::putAlignmentMarker($frame, $cx, $cy);
642 642
                     $cx += $d;
643 643
                 }
@@ -663,10 +663,10 @@  discard block
 block discarded – undo
663 663
         //----------------------------------------------------------------------
664 664
         public static function getVersionPattern($version)
665 665
         {
666
-            if($version < 7 || $version > QRSPEC_VERSION_MAX)
666
+            if ($version < 7 || $version > QRSPEC_VERSION_MAX)
667 667
                 return 0;
668 668
 
669
-            return self::$versionPattern[$version -7];
669
+            return self::$versionPattern[$version - 7];
670 670
         }
671 671
 
672 672
         // Format information --------------------------------------------------
@@ -681,10 +681,10 @@  discard block
 block discarded – undo
681 681
 
682 682
         public static function getFormatInfo($mask, $level)
683 683
         {
684
-            if($mask < 0 || $mask > 7)
684
+            if ($mask < 0 || $mask > 7)
685 685
                 return 0;
686 686
                 
687
-            if($level < 0 || $level > 3)
687
+            if ($level < 0 || $level > 3)
688 688
                 return 0;                
689 689
 
690 690
             return self::$formatInfo[$level][$mask];
@@ -713,8 +713,8 @@  discard block
 block discarded – undo
713 713
                 "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"
714 714
             );                            
715 715
             
716
-            for($y=0; $y<7; $y++) {
717
-                QRstr::set($frame, $ox, $oy+$y, $finder[$y]);
716
+            for ($y = 0; $y < 7; $y++) {
717
+                QRstr::set($frame, $ox, $oy + $y, $finder[$y]);
718 718
             }
719 719
         }
720 720
 
@@ -722,7 +722,7 @@  discard block
 block discarded – undo
722 722
         public static function createFrame($version)
723 723
         {
724 724
             $width = self::$capacity[$version][QRCAP_WIDTH];
725
-            $frameLine = str_repeat ("\0", $width);
725
+            $frameLine = str_repeat("\0", $width);
726 726
             $frame = array_fill(0, $width, $frameLine);
727 727
 
728 728
             // Finder pattern
@@ -733,7 +733,7 @@  discard block
 block discarded – undo
733 733
             // Separator
734 734
             $yOffset = $width - 7;
735 735
             
736
-            for($y=0; $y<7; $y++) {
736
+            for ($y = 0; $y < 7; $y++) {
737 737
                 $frame[$y][7] = "\xc0";
738 738
                 $frame[$y][$width - 8] = "\xc0";
739 739
                 $frame[$yOffset][7] = "\xc0";
@@ -743,7 +743,7 @@  discard block
 block discarded – undo
743 743
             $setPattern = str_repeat("\xc0", 8);
744 744
             
745 745
             QRstr::set($frame, 0, 7, $setPattern);
746
-            QRstr::set($frame, $width-8, 7, $setPattern);
746
+            QRstr::set($frame, $width - 8, 7, $setPattern);
747 747
             QRstr::set($frame, 0, $width - 8, $setPattern);
748 748
         
749 749
             // Format info
@@ -753,38 +753,38 @@  discard block
 block discarded – undo
753 753
             
754 754
             $yOffset = $width - 8;
755 755
 
756
-            for($y=0; $y<8; $y++,$yOffset++) {
756
+            for ($y = 0; $y < 8; $y++, $yOffset++) {
757 757
                 $frame[$y][8] = "\x84";
758 758
                 $frame[$yOffset][8] = "\x84";
759 759
             }
760 760
 
761 761
             // Timing pattern  
762 762
             
763
-            for($i=1; $i<$width-15; $i++) {
764
-                $frame[6][7+$i] = chr(0x90 | ($i & 1));
765
-                $frame[7+$i][6] = chr(0x90 | ($i & 1));
763
+            for ($i = 1; $i < $width - 15; $i++) {
764
+                $frame[6][7 + $i] = chr(0x90 | ($i & 1));
765
+                $frame[7 + $i][6] = chr(0x90 | ($i & 1));
766 766
             }
767 767
             
768 768
             // Alignment pattern  
769 769
             self::putAlignmentPattern($version, $frame, $width);
770 770
             
771 771
             // Version information 
772
-            if($version >= 7) {
772
+            if ($version >= 7) {
773 773
                 $vinf = self::getVersionPattern($version);
774 774
 
775 775
                 $v = $vinf;
776 776
                 
777
-                for($x=0; $x<6; $x++) {
778
-                    for($y=0; $y<3; $y++) {
779
-                        $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));
777
+                for ($x = 0; $x < 6; $x++) {
778
+                    for ($y = 0; $y < 3; $y++) {
779
+                        $frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));
780 780
                         $v = $v >> 1;
781 781
                     }
782 782
                 }
783 783
 
784 784
                 $v = $vinf;
785
-                for($y=0; $y<6; $y++) {
786
-                    for($x=0; $x<3; $x++) {
787
-                        $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));
785
+                for ($y = 0; $y < 6; $y++) {
786
+                    for ($x = 0; $x < 3; $x++) {
787
+                        $frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));
788 788
                         $v = $v >> 1;
789 789
                     }
790 790
                 }
@@ -818,16 +818,16 @@  discard block
 block discarded – undo
818 818
             } else {
819 819
             
820 820
                 foreach ($frame as &$frameLine) {
821
-                    $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));
821
+                    $frameLine = join('<span class="m">&nbsp;</span>', explode("\xc0", $frameLine));
822 822
                     $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));
823
-                    $frameLine = join('<span class="p">&nbsp;</span>',  explode("\xa0", $frameLine));
823
+                    $frameLine = join('<span class="p">&nbsp;</span>', explode("\xa0", $frameLine));
824 824
                     $frameLine = join('<span class="p">&#9618;</span>', explode("\xa1", $frameLine));
825 825
                     $frameLine = join('<span class="s">&#9671;</span>', explode("\x84", $frameLine)); //format 0
826 826
                     $frameLine = join('<span class="s">&#9670;</span>', explode("\x85", $frameLine)); //format 1
827 827
                     $frameLine = join('<span class="x">&#9762;</span>', explode("\x81", $frameLine)); //special bit
828
-                    $frameLine = join('<span class="c">&nbsp;</span>',  explode("\x90", $frameLine)); //clock 0
828
+                    $frameLine = join('<span class="c">&nbsp;</span>', explode("\x90", $frameLine)); //clock 0
829 829
                     $frameLine = join('<span class="c">&#9719;</span>', explode("\x91", $frameLine)); //clock 1
830
-                    $frameLine = join('<span class="f">&nbsp;</span>',  explode("\x88", $frameLine)); //version
830
+                    $frameLine = join('<span class="f">&nbsp;</span>', explode("\x88", $frameLine)); //version
831 831
                     $frameLine = join('<span class="f">&#9618;</span>', explode("\x89", $frameLine)); //version
832 832
                     $frameLine = join('&#9830;', explode("\x01", $frameLine));
833 833
                     $frameLine = join('&#8901;', explode("\0", $frameLine));
@@ -865,10 +865,10 @@  discard block
 block discarded – undo
865 865
         //----------------------------------------------------------------------
866 866
         public static function newFrame($version)
867 867
         {
868
-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 
868
+            if ($version < 1 || $version > QRSPEC_VERSION_MAX) 
869 869
                 return null;
870 870
 
871
-            if(!isset(self::$frames[$version])) {
871
+            if (!isset(self::$frames[$version])) {
872 872
                 
873 873
                 $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';
874 874
                 
@@ -884,22 +884,22 @@  discard block
 block discarded – undo
884 884
                 }
885 885
             }
886 886
             
887
-            if(is_null(self::$frames[$version]))
887
+            if (is_null(self::$frames[$version]))
888 888
                 return null;
889 889
 
890 890
             return self::$frames[$version];
891 891
         }
892 892
 
893 893
         //----------------------------------------------------------------------
894
-        public static function rsBlockNum($spec)     { return $spec[0] + $spec[3]; }
895
-        public static function rsBlockNum1($spec)    { return $spec[0]; }
896
-        public static function rsDataCodes1($spec)   { return $spec[1]; }
897
-        public static function rsEccCodes1($spec)    { return $spec[2]; }
898
-        public static function rsBlockNum2($spec)    { return $spec[3]; }
899
-        public static function rsDataCodes2($spec)   { return $spec[4]; }
900
-        public static function rsEccCodes2($spec)    { return $spec[2]; }
901
-        public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }
902
-        public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }
894
+        public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; }
895
+        public static function rsBlockNum1($spec) { return $spec[0]; }
896
+        public static function rsDataCodes1($spec) { return $spec[1]; }
897
+        public static function rsEccCodes1($spec) { return $spec[2]; }
898
+        public static function rsBlockNum2($spec) { return $spec[3]; }
899
+        public static function rsDataCodes2($spec) { return $spec[4]; }
900
+        public static function rsEccCodes2($spec) { return $spec[2]; }
901
+        public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); }
902
+        public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; }
903 903
         
904 904
     }
905 905
 
@@ -938,7 +938,7 @@  discard block
 block discarded – undo
938 938
     class QRimage {
939 939
     
940 940
         //----------------------------------------------------------------------
941
-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=false) 
941
+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = false) 
942 942
         {
943 943
             $image = self::image($frame, $pixelPerPoint, $outerFrame);
944 944
             
@@ -946,11 +946,11 @@  discard block
 block discarded – undo
946 946
                 Header("Content-type: image/png");
947 947
                 ImagePng($image);
948 948
             } else {
949
-                if($saveandprint===true){
949
+                if ($saveandprint === true) {
950 950
                     ImagePng($image, $filename);
951 951
                     header("Content-type: image/png");
952 952
                     ImagePng($image);
953
-                }else{
953
+                } else {
954 954
                     ImagePng($image, $filename);
955 955
                 }
956 956
             }
@@ -979,25 +979,25 @@  discard block
 block discarded – undo
979 979
             $h = count($frame);
980 980
             $w = strlen($frame[0]);
981 981
             
982
-            $imgW = $w + 2*$outerFrame;
983
-            $imgH = $h + 2*$outerFrame;
982
+            $imgW = $w + 2 * $outerFrame;
983
+            $imgH = $h + 2 * $outerFrame;
984 984
             
985
-            $base_image =ImageCreate($imgW, $imgH);
985
+            $base_image = ImageCreate($imgW, $imgH);
986 986
             
987
-            $col[0] = ImageColorAllocate($base_image,255,255,255);
988
-            $col[1] = ImageColorAllocate($base_image,0,0,0);
987
+            $col[0] = ImageColorAllocate($base_image, 255, 255, 255);
988
+            $col[1] = ImageColorAllocate($base_image, 0, 0, 0);
989 989
 
990 990
             imagefill($base_image, 0, 0, $col[0]);
991 991
 
992
-            for($y=0; $y<$h; $y++) {
993
-                for($x=0; $x<$w; $x++) {
992
+            for ($y = 0; $y < $h; $y++) {
993
+                for ($x = 0; $x < $w; $x++) {
994 994
                     if ($frame[$y][$x] == '1') {
995
-                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 
995
+                        ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); 
996 996
                     }
997 997
                 }
998 998
             }
999 999
             
1000
-            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);
1000
+            $target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);
1001 1001
             ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);
1002 1002
             ImageDestroy($base_image);
1003 1003
             
@@ -1038,7 +1038,7 @@  discard block
 block discarded – undo
1038 1038
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1039 1039
  */
1040 1040
  
1041
-    define('STRUCTURE_HEADER_BITS',  20);
1041
+    define('STRUCTURE_HEADER_BITS', 20);
1042 1042
     define('MAX_STRUCTURED_SYMBOLS', 16);
1043 1043
 
1044 1044
     class QRinputItem {
@@ -1053,11 +1053,11 @@  discard block
 block discarded – undo
1053 1053
             $setData = array_slice($data, 0, $size);
1054 1054
             
1055 1055
             if (count($setData) < $size) {
1056
-                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));
1056
+                $setData = array_merge($setData, array_fill(0, $size - count($setData), 0));
1057 1057
             }
1058 1058
         
1059
-            if(!QRinput::check($mode, $size, $setData)) {
1060
-                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));
1059
+            if (!QRinput::check($mode, $size, $setData)) {
1060
+                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',', $setData));
1061 1061
                 return null;
1062 1062
             }
1063 1063
             
@@ -1072,26 +1072,26 @@  discard block
 block discarded – undo
1072 1072
         {
1073 1073
             try {
1074 1074
             
1075
-                $words = (int)($this->size / 3);
1075
+                $words = (int) ($this->size / 3);
1076 1076
                 $bs = new QRbitstream();
1077 1077
                 
1078 1078
                 $val = 0x1;
1079 1079
                 $bs->appendNum(4, $val);
1080 1080
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);
1081 1081
 
1082
-                for($i=0; $i<$words; $i++) {
1083
-                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;
1084
-                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;
1085
-                    $val += (ord($this->data[$i*3+2]) - ord('0'));
1082
+                for ($i = 0; $i < $words; $i++) {
1083
+                    $val  = (ord($this->data[$i * 3]) - ord('0')) * 100;
1084
+                    $val += (ord($this->data[$i * 3 + 1]) - ord('0')) * 10;
1085
+                    $val += (ord($this->data[$i * 3 + 2]) - ord('0'));
1086 1086
                     $bs->appendNum(10, $val);
1087 1087
                 }
1088 1088
 
1089
-                if($this->size - $words * 3 == 1) {
1090
-                    $val = ord($this->data[$words*3]) - ord('0');
1089
+                if ($this->size - $words * 3 == 1) {
1090
+                    $val = ord($this->data[$words * 3]) - ord('0');
1091 1091
                     $bs->appendNum(4, $val);
1092
-                } else if($this->size - $words * 3 == 2) {
1093
-                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;
1094
-                    $val += (ord($this->data[$words*3+1]) - ord('0'));
1092
+                } else if ($this->size - $words * 3 == 2) {
1093
+                    $val  = (ord($this->data[$words * 3]) - ord('0')) * 10;
1094
+                    $val += (ord($this->data[$words * 3 + 1]) - ord('0'));
1095 1095
                     $bs->appendNum(7, $val);
1096 1096
                 }
1097 1097
 
@@ -1107,20 +1107,20 @@  discard block
 block discarded – undo
1107 1107
         public function encodeModeAn($version)
1108 1108
         {
1109 1109
             try {
1110
-                $words = (int)($this->size / 2);
1110
+                $words = (int) ($this->size / 2);
1111 1111
                 $bs = new QRbitstream();
1112 1112
                 
1113 1113
                 $bs->appendNum(4, 0x02);
1114 1114
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);
1115 1115
 
1116
-                for($i=0; $i<$words; $i++) {
1117
-                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;
1118
-                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));
1116
+                for ($i = 0; $i < $words; $i++) {
1117
+                    $val  = (int) QRinput::lookAnTable(ord($this->data[$i * 2])) * 45;
1118
+                    $val += (int) QRinput::lookAnTable(ord($this->data[$i * 2 + 1]));
1119 1119
 
1120 1120
                     $bs->appendNum(11, $val);
1121 1121
                 }
1122 1122
 
1123
-                if($this->size & 1) {
1123
+                if ($this->size & 1) {
1124 1124
                     $val = QRinput::lookAnTable(ord($this->data[$words * 2]));
1125 1125
                     $bs->appendNum(6, $val);
1126 1126
                 }
@@ -1142,7 +1142,7 @@  discard block
 block discarded – undo
1142 1142
                 $bs->appendNum(4, 0x4);
1143 1143
                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);
1144 1144
 
1145
-                for($i=0; $i<$this->size; $i++) {
1145
+                for ($i = 0; $i < $this->size; $i++) {
1146 1146
                     $bs->appendNum(8, ord($this->data[$i]));
1147 1147
                 }
1148 1148
 
@@ -1162,11 +1162,11 @@  discard block
 block discarded – undo
1162 1162
                 $bs = new QRbitrtream();
1163 1163
                 
1164 1164
                 $bs->appendNum(4, 0x8);
1165
-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));
1165
+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int) ($this->size / 2));
1166 1166
 
1167
-                for($i=0; $i<$this->size; $i+=2) {
1168
-                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);
1169
-                    if($val <= 0x9ffc) {
1167
+                for ($i = 0; $i < $this->size; $i += 2) {
1168
+                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i + 1]);
1169
+                    if ($val <= 0x9ffc) {
1170 1170
                         $val -= 0x8140;
1171 1171
                     } else {
1172 1172
                         $val -= 0xc140;
@@ -1190,7 +1190,7 @@  discard block
 block discarded – undo
1190 1190
         public function encodeModeStructure()
1191 1191
         {
1192 1192
             try {
1193
-                $bs =  new QRbitstream();
1193
+                $bs = new QRbitstream();
1194 1194
                 
1195 1195
                 $bs->appendNum(4, 0x03);
1196 1196
                 $bs->appendNum(4, ord($this->data[1]) - 1);
@@ -1210,14 +1210,14 @@  discard block
 block discarded – undo
1210 1210
         {
1211 1211
             $bits = 0;
1212 1212
 
1213
-            if($version == 0) 
1213
+            if ($version == 0) 
1214 1214
                 $version = 1;
1215 1215
 
1216
-            switch($this->mode) {
1217
-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
1218
-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;
1219
-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;
1220
-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;
1216
+            switch ($this->mode) {
1217
+                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;
1218
+                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;
1219
+                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;
1220
+                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;
1221 1221
                 case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            
1222 1222
                 default:
1223 1223
                     return 0;
@@ -1225,7 +1225,7 @@  discard block
 block discarded – undo
1225 1225
 
1226 1226
             $l = QRspec::lengthIndicator($this->mode, $version);
1227 1227
             $m = 1 << $l;
1228
-            $num = (int)(($this->size + $m - 1) / $m);
1228
+            $num = (int) (($this->size + $m - 1) / $m);
1229 1229
 
1230 1230
             $bits += $num * (4 + $l);
1231 1231
 
@@ -1240,7 +1240,7 @@  discard block
 block discarded – undo
1240 1240
                 unset($this->bstream);
1241 1241
                 $words = QRspec::maximumWords($this->mode, $version);
1242 1242
                 
1243
-                if($this->size > $words) {
1243
+                if ($this->size > $words) {
1244 1244
                 
1245 1245
                     $st1 = new QRinputItem($this->mode, $words, $this->data);
1246 1246
                     $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));
@@ -1259,18 +1259,18 @@  discard block
 block discarded – undo
1259 1259
                     
1260 1260
                     $ret = 0;
1261 1261
                     
1262
-                    switch($this->mode) {
1263
-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;
1264
-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;
1265
-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;
1266
-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;
1267
-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;
1262
+                    switch ($this->mode) {
1263
+                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;
1264
+                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;
1265
+                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;
1266
+                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;
1267
+                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;
1268 1268
                         
1269 1269
                         default:
1270 1270
                             break;
1271 1271
                     }
1272 1272
                     
1273
-                    if($ret < 0)
1273
+                    if ($ret < 0)
1274 1274
                         return -1;
1275 1275
                 }
1276 1276
 
@@ -1312,7 +1312,7 @@  discard block
 block discarded – undo
1312 1312
         //----------------------------------------------------------------------
1313 1313
         public function setVersion($version)
1314 1314
         {
1315
-            if($version < 0 || $version > QRSPEC_VERSION_MAX) {
1315
+            if ($version < 0 || $version > QRSPEC_VERSION_MAX) {
1316 1316
                 throw new Exception('Invalid version no');
1317 1317
                 return -1;
1318 1318
             }
@@ -1331,7 +1331,7 @@  discard block
 block discarded – undo
1331 1331
         //----------------------------------------------------------------------
1332 1332
         public function setErrorCorrectionLevel($level)
1333 1333
         {
1334
-            if($level > QR_ECLEVEL_H) {
1334
+            if ($level > QR_ECLEVEL_H) {
1335 1335
                 throw new Exception('Invalid ECLEVEL');
1336 1336
                 return -1;
1337 1337
             }
@@ -1363,11 +1363,11 @@  discard block
 block discarded – undo
1363 1363
         
1364 1364
         public function insertStructuredAppendHeader($size, $index, $parity)
1365 1365
         {
1366
-            if( $size > MAX_STRUCTURED_SYMBOLS ) {
1366
+            if ($size > MAX_STRUCTURED_SYMBOLS) {
1367 1367
                 throw new Exception('insertStructuredAppendHeader wrong size');
1368 1368
             }
1369 1369
             
1370
-            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {
1370
+            if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) {
1371 1371
                 throw new Exception('insertStructuredAppendHeader wrong index');
1372 1372
             }
1373 1373
 
@@ -1387,9 +1387,9 @@  discard block
 block discarded – undo
1387 1387
         {
1388 1388
             $parity = 0;
1389 1389
             
1390
-            foreach($this->items as $item) {
1391
-                if($item->mode != QR_MODE_STRUCTURE) {
1392
-                    for($i=$item->size-1; $i>=0; $i--) {
1390
+            foreach ($this->items as $item) {
1391
+                if ($item->mode != QR_MODE_STRUCTURE) {
1392
+                    for ($i = $item->size - 1; $i >= 0; $i--) {
1393 1393
                         $parity ^= $item->data[$i];
1394 1394
                     }
1395 1395
                 }
@@ -1401,8 +1401,8 @@  discard block
 block discarded – undo
1401 1401
         //----------------------------------------------------------------------
1402 1402
         public static function checkModeNum($size, $data)
1403 1403
         {
1404
-            for($i=0; $i<$size; $i++) {
1405
-                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){
1404
+            for ($i = 0; $i < $size; $i++) {
1405
+                if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) {
1406 1406
                     return false;
1407 1407
                 }
1408 1408
             }
@@ -1413,10 +1413,10 @@  discard block
 block discarded – undo
1413 1413
         //----------------------------------------------------------------------
1414 1414
         public static function estimateBitsModeNum($size)
1415 1415
         {
1416
-            $w = (int)$size / 3;
1416
+            $w = (int) $size / 3;
1417 1417
             $bits = $w * 10;
1418 1418
             
1419
-            switch($size - $w * 3) {
1419
+            switch ($size - $w * 3) {
1420 1420
                 case 1:
1421 1421
                     $bits += 4;
1422 1422
                     break;
@@ -1435,7 +1435,7 @@  discard block
 block discarded – undo
1435 1435
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1436 1436
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
1437 1437
             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,
1438
-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,
1438
+             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,
1439 1439
             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
1440 1440
             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,
1441 1441
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
@@ -1445,13 +1445,13 @@  discard block
 block discarded – undo
1445 1445
         //----------------------------------------------------------------------
1446 1446
         public static function lookAnTable($c)
1447 1447
         {
1448
-            return (($c > 127)?-1:self::$anTable[$c]);
1448
+            return (($c > 127) ?-1 : self::$anTable[$c]);
1449 1449
         }
1450 1450
         
1451 1451
         //----------------------------------------------------------------------
1452 1452
         public static function checkModeAn($size, $data)
1453 1453
         {
1454
-            for($i=0; $i<$size; $i++) {
1454
+            for ($i = 0; $i < $size; $i++) {
1455 1455
                 if (self::lookAnTable(ord($data[$i])) == -1) {
1456 1456
                     return false;
1457 1457
                 }
@@ -1463,10 +1463,10 @@  discard block
 block discarded – undo
1463 1463
         //----------------------------------------------------------------------
1464 1464
         public static function estimateBitsModeAn($size)
1465 1465
         {
1466
-            $w = (int)($size / 2);
1466
+            $w = (int) ($size / 2);
1467 1467
             $bits = $w * 11;
1468 1468
             
1469
-            if($size & 1) {
1469
+            if ($size & 1) {
1470 1470
                 $bits += 6;
1471 1471
             }
1472 1472
 
@@ -1482,18 +1482,18 @@  discard block
 block discarded – undo
1482 1482
         //----------------------------------------------------------------------
1483 1483
         public function estimateBitsModeKanji($size)
1484 1484
         {
1485
-            return (int)(($size / 2) * 13);
1485
+            return (int) (($size / 2) * 13);
1486 1486
         }
1487 1487
         
1488 1488
         //----------------------------------------------------------------------
1489 1489
         public static function checkModeKanji($size, $data)
1490 1490
         {
1491
-            if($size & 1)
1491
+            if ($size & 1)
1492 1492
                 return false;
1493 1493
 
1494
-            for($i=0; $i<$size; $i+=2) {
1495
-                $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
1496
-                if( $val < 0x8140 
1494
+            for ($i = 0; $i < $size; $i += 2) {
1495
+                $val = (ord($data[$i]) << 8) | ord($data[$i + 1]);
1496
+                if ($val < 0x8140 
1497 1497
                 || ($val > 0x9ffc && $val < 0xe040) 
1498 1498
                 || $val > 0xebbf) {
1499 1499
                     return false;
@@ -1509,12 +1509,12 @@  discard block
 block discarded – undo
1509 1509
 
1510 1510
         public static function check($mode, $size, $data)
1511 1511
         {
1512
-            if($size <= 0) 
1512
+            if ($size <= 0) 
1513 1513
                 return false;
1514 1514
 
1515
-            switch($mode) {
1516
-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
1517
-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;
1515
+            switch ($mode) {
1516
+                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;
1517
+                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;
1518 1518
                 case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;
1519 1519
                 case QR_MODE_8:         return true; break;
1520 1520
                 case QR_MODE_STRUCTURE: return true; break;
@@ -1532,7 +1532,7 @@  discard block
 block discarded – undo
1532 1532
         {
1533 1533
             $bits = 0;
1534 1534
 
1535
-            foreach($this->items as $item) {
1535
+            foreach ($this->items as $item) {
1536 1536
                 $bits += $item->estimateBitStreamSizeOfEntry($version);
1537 1537
             }
1538 1538
 
@@ -1547,7 +1547,7 @@  discard block
 block discarded – undo
1547 1547
             do {
1548 1548
                 $prev = $version;
1549 1549
                 $bits = $this->estimateBitStreamSize($prev);
1550
-                $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
1550
+                $version = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
1551 1551
                 if ($version < 0) {
1552 1552
                     return -1;
1553 1553
                 }
@@ -1560,32 +1560,32 @@  discard block
 block discarded – undo
1560 1560
         public static function lengthOfCode($mode, $version, $bits)
1561 1561
         {
1562 1562
             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);
1563
-            switch($mode) {
1563
+            switch ($mode) {
1564 1564
                 case QR_MODE_NUM:
1565
-                    $chunks = (int)($payload / 10);
1565
+                    $chunks = (int) ($payload / 10);
1566 1566
                     $remain = $payload - $chunks * 10;
1567 1567
                     $size = $chunks * 3;
1568
-                    if($remain >= 7) {
1568
+                    if ($remain >= 7) {
1569 1569
                         $size += 2;
1570
-                    } else if($remain >= 4) {
1570
+                    } else if ($remain >= 4) {
1571 1571
                         $size += 1;
1572 1572
                     }
1573 1573
                     break;
1574 1574
                 case QR_MODE_AN:
1575
-                    $chunks = (int)($payload / 11);
1575
+                    $chunks = (int) ($payload / 11);
1576 1576
                     $remain = $payload - $chunks * 11;
1577 1577
                     $size = $chunks * 2;
1578
-                    if($remain >= 6) 
1578
+                    if ($remain >= 6) 
1579 1579
                         $size++;
1580 1580
                     break;
1581 1581
                 case QR_MODE_8:
1582
-                    $size = (int)($payload / 8);
1582
+                    $size = (int) ($payload / 8);
1583 1583
                     break;
1584 1584
                 case QR_MODE_KANJI:
1585
-                    $size = (int)(($payload / 13) * 2);
1585
+                    $size = (int) (($payload / 13) * 2);
1586 1586
                     break;
1587 1587
                 case QR_MODE_STRUCTURE:
1588
-                    $size = (int)($payload / 8);
1588
+                    $size = (int) ($payload / 8);
1589 1589
                     break;
1590 1590
                 default:
1591 1591
                     $size = 0;
@@ -1593,8 +1593,8 @@  discard block
 block discarded – undo
1593 1593
             }
1594 1594
             
1595 1595
             $maxsize = QRspec::maximumWords($mode, $version);
1596
-            if($size < 0) $size = 0;
1597
-            if($size > $maxsize) $size = $maxsize;
1596
+            if ($size < 0) $size = 0;
1597
+            if ($size > $maxsize) $size = $maxsize;
1598 1598
 
1599 1599
             return $size;
1600 1600
         }
@@ -1604,10 +1604,10 @@  discard block
 block discarded – undo
1604 1604
         {
1605 1605
             $total = 0;
1606 1606
 
1607
-            foreach($this->items as $item) {
1607
+            foreach ($this->items as $item) {
1608 1608
                 $bits = $item->encodeBitStream($this->version);
1609 1609
                 
1610
-                if($bits < 0) 
1610
+                if ($bits < 0) 
1611 1611
                     return -1;
1612 1612
                     
1613 1613
                 $total += $bits;
@@ -1620,21 +1620,21 @@  discard block
 block discarded – undo
1620 1620
         public function convertData()
1621 1621
         {
1622 1622
             $ver = $this->estimateVersion();
1623
-            if($ver > $this->getVersion()) {
1623
+            if ($ver > $this->getVersion()) {
1624 1624
                 $this->setVersion($ver);
1625 1625
             }
1626 1626
 
1627
-            for(;;) {
1627
+            for (;;) {
1628 1628
                 $bits = $this->createBitStream();
1629 1629
                 
1630
-                if($bits < 0) 
1630
+                if ($bits < 0) 
1631 1631
                     return -1;
1632 1632
                     
1633
-                $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
1634
-                if($ver < 0) {
1633
+                $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);
1634
+                if ($ver < 0) {
1635 1635
                     throw new Exception('WRONG VERSION');
1636 1636
                     return -1;
1637
-                } else if($ver > $this->getVersion()) {
1637
+                } else if ($ver > $this->getVersion()) {
1638 1638
                     $this->setVersion($ver);
1639 1639
                 } else {
1640 1640
                     break;
@@ -1660,26 +1660,26 @@  discard block
 block discarded – undo
1660 1660
             }
1661 1661
 
1662 1662
             $bits += 4;
1663
-            $words = (int)(($bits + 7) / 8);
1663
+            $words = (int) (($bits + 7) / 8);
1664 1664
 
1665 1665
             $padding = new QRbitstream();
1666 1666
             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
1667 1667
             
1668
-            if($ret < 0) 
1668
+            if ($ret < 0) 
1669 1669
                 return $ret;
1670 1670
 
1671 1671
             $padlen = $maxwords - $words;
1672 1672
             
1673
-            if($padlen > 0) {
1673
+            if ($padlen > 0) {
1674 1674
                 
1675 1675
                 $padbuf = array();
1676
-                for($i=0; $i<$padlen; $i++) {
1677
-                    $padbuf[$i] = ($i&1)?0x11:0xec;
1676
+                for ($i = 0; $i < $padlen; $i++) {
1677
+                    $padbuf[$i] = ($i & 1) ? 0x11 : 0xec;
1678 1678
                 }
1679 1679
                 
1680 1680
                 $ret = $padding->appendBytes($padlen, $padbuf);
1681 1681
                 
1682
-                if($ret < 0)
1682
+                if ($ret < 0)
1683 1683
                     return $ret;
1684 1684
                 
1685 1685
             }
@@ -1692,15 +1692,15 @@  discard block
 block discarded – undo
1692 1692
         //----------------------------------------------------------------------
1693 1693
         public function mergeBitStream()
1694 1694
         {
1695
-            if($this->convertData() < 0) {
1695
+            if ($this->convertData() < 0) {
1696 1696
                 return null;
1697 1697
             }
1698 1698
 
1699 1699
             $bstream = new QRbitstream();
1700 1700
             
1701
-            foreach($this->items as $item) {
1701
+            foreach ($this->items as $item) {
1702 1702
                 $ret = $bstream->append($item->bstream);
1703
-                if($ret < 0) {
1703
+                if ($ret < 0) {
1704 1704
                     return null;
1705 1705
                 }
1706 1706
             }
@@ -1714,12 +1714,12 @@  discard block
 block discarded – undo
1714 1714
 
1715 1715
             $bstream = $this->mergeBitStream();
1716 1716
             
1717
-            if($bstream == null) {
1717
+            if ($bstream == null) {
1718 1718
                 return null;
1719 1719
             }
1720 1720
             
1721 1721
             $ret = $this->appendPaddingBit($bstream);
1722
-            if($ret < 0) {
1722
+            if ($ret < 0) {
1723 1723
                 return null;
1724 1724
             }
1725 1725
 
@@ -1730,7 +1730,7 @@  discard block
 block discarded – undo
1730 1730
         public function getByteStream()
1731 1731
         {
1732 1732
             $bstream = $this->getBitStream();
1733
-            if($bstream == null) {
1733
+            if ($bstream == null) {
1734 1734
                 return null;
1735 1735
             }
1736 1736
             
@@ -1798,8 +1798,8 @@  discard block
 block discarded – undo
1798 1798
             $bstream->allocate($bits);
1799 1799
             
1800 1800
             $mask = 1 << ($bits - 1);
1801
-            for($i=0; $i<$bits; $i++) {
1802
-                if($num & $mask) {
1801
+            for ($i = 0; $i < $bits; $i++) {
1802
+                if ($num & $mask) {
1803 1803
                     $bstream->data[$i] = 1;
1804 1804
                 } else {
1805 1805
                     $bstream->data[$i] = 0;
@@ -1815,12 +1815,12 @@  discard block
 block discarded – undo
1815 1815
         {
1816 1816
             $bstream = new QRbitstream();
1817 1817
             $bstream->allocate($size * 8);
1818
-            $p=0;
1818
+            $p = 0;
1819 1819
 
1820
-            for($i=0; $i<$size; $i++) {
1820
+            for ($i = 0; $i < $size; $i++) {
1821 1821
                 $mask = 0x80;
1822
-                for($j=0; $j<8; $j++) {
1823
-                    if($data[$i] & $mask) {
1822
+                for ($j = 0; $j < 8; $j++) {
1823
+                    if ($data[$i] & $mask) {
1824 1824
                         $bstream->data[$p] = 1;
1825 1825
                     } else {
1826 1826
                         $bstream->data[$p] = 0;
@@ -1840,11 +1840,11 @@  discard block
 block discarded – undo
1840 1840
                 return -1;
1841 1841
             }
1842 1842
             
1843
-            if($arg->size() == 0) {
1843
+            if ($arg->size() == 0) {
1844 1844
                 return 0;
1845 1845
             }
1846 1846
             
1847
-            if($this->size() == 0) {
1847
+            if ($this->size() == 0) {
1848 1848
                 $this->data = $arg->data;
1849 1849
                 return 0;
1850 1850
             }
@@ -1862,7 +1862,7 @@  discard block
 block discarded – undo
1862 1862
 
1863 1863
             $b = QRbitstream::newFromNum($bits, $num);
1864 1864
             
1865
-            if(is_null($b))
1865
+            if (is_null($b))
1866 1866
                 return -1;
1867 1867
 
1868 1868
             $ret = $this->append($b);
@@ -1879,7 +1879,7 @@  discard block
 block discarded – undo
1879 1879
 
1880 1880
             $b = QRbitstream::newFromBytes($size, $data);
1881 1881
             
1882
-            if(is_null($b))
1882
+            if (is_null($b))
1883 1883
                 return -1;
1884 1884
 
1885 1885
             $ret = $this->append($b);
@@ -1894,18 +1894,18 @@  discard block
 block discarded – undo
1894 1894
         
1895 1895
             $size = $this->size();
1896 1896
 
1897
-            if($size == 0) {
1897
+            if ($size == 0) {
1898 1898
                 return array();
1899 1899
             }
1900 1900
             
1901
-            $data = array_fill(0, (int)(($size + 7) / 8), 0);
1902
-            $bytes = (int)($size / 8);
1901
+            $data = array_fill(0, (int) (($size + 7) / 8), 0);
1902
+            $bytes = (int) ($size / 8);
1903 1903
 
1904 1904
             $p = 0;
1905 1905
             
1906
-            for($i=0; $i<$bytes; $i++) {
1906
+            for ($i = 0; $i < $bytes; $i++) {
1907 1907
                 $v = 0;
1908
-                for($j=0; $j<8; $j++) {
1908
+                for ($j = 0; $j < 8; $j++) {
1909 1909
                     $v = $v << 1;
1910 1910
                     $v |= $this->data[$p];
1911 1911
                     $p++;
@@ -1913,9 +1913,9 @@  discard block
 block discarded – undo
1913 1913
                 $data[$i] = $v;
1914 1914
             }
1915 1915
             
1916
-            if($size & 7) {
1916
+            if ($size & 7) {
1917 1917
                 $v = 0;
1918
-                for($j=0; $j<($size & 7); $j++) {
1918
+                for ($j = 0; $j < ($size & 7); $j++) {
1919 1919
                     $v = $v << 1;
1920 1920
                     $v |= $this->data[$p];
1921 1921
                     $p++;
@@ -1987,7 +1987,7 @@  discard block
 block discarded – undo
1987 1987
             if ($pos >= strlen($str))
1988 1988
                 return false;
1989 1989
             
1990
-            return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
1990
+            return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));
1991 1991
         }
1992 1992
         
1993 1993
         //----------------------------------------------------------------------
@@ -2007,17 +2007,17 @@  discard block
 block discarded – undo
2007 2007
                 
2008 2008
             $c = $this->dataStr[$pos];
2009 2009
             
2010
-            if(self::isdigitat($this->dataStr, $pos)) {
2010
+            if (self::isdigitat($this->dataStr, $pos)) {
2011 2011
                 return QR_MODE_NUM;
2012
-            } else if(self::isalnumat($this->dataStr, $pos)) {
2012
+            } else if (self::isalnumat($this->dataStr, $pos)) {
2013 2013
                 return QR_MODE_AN;
2014
-            } else if($this->modeHint == QR_MODE_KANJI) {
2014
+            } else if ($this->modeHint == QR_MODE_KANJI) {
2015 2015
             
2016
-                if ($pos+1 < strlen($this->dataStr)) 
2016
+                if ($pos + 1 < strlen($this->dataStr)) 
2017 2017
                 {
2018
-                    $d = $this->dataStr[$pos+1];
2018
+                    $d = $this->dataStr[$pos + 1];
2019 2019
                     $word = (ord($c) << 8) | ord($d);
2020
-                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
2020
+                    if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {
2021 2021
                         return QR_MODE_KANJI;
2022 2022
                     }
2023 2023
                 }
@@ -2032,32 +2032,32 @@  discard block
 block discarded – undo
2032 2032
             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
2033 2033
 
2034 2034
             $p = 0;
2035
-            while(self::isdigitat($this->dataStr, $p)) {
2035
+            while (self::isdigitat($this->dataStr, $p)) {
2036 2036
                 $p++;
2037 2037
             }
2038 2038
             
2039 2039
             $run = $p;
2040 2040
             $mode = $this->identifyMode($p);
2041 2041
             
2042
-            if($mode == QR_MODE_8) {
2042
+            if ($mode == QR_MODE_8) {
2043 2043
                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
2044 2044
                      + QRinput::estimateBitsMode8(1)         // + 4 + l8
2045 2045
                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
2046
-                if($dif > 0) {
2046
+                if ($dif > 0) {
2047 2047
                     return $this->eat8();
2048 2048
                 }
2049 2049
             }
2050
-            if($mode == QR_MODE_AN) {
2050
+            if ($mode == QR_MODE_AN) {
2051 2051
                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln
2052 2052
                      + QRinput::estimateBitsModeAn(1)        // + 4 + la
2053
-                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la
2054
-                if($dif > 0) {
2053
+                     - QRinput::estimateBitsModeAn($run + 1); // - 4 - la
2054
+                if ($dif > 0) {
2055 2055
                     return $this->eatAn();
2056 2056
                 }
2057 2057
             }
2058 2058
             
2059 2059
             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
2060
-            if($ret < 0)
2060
+            if ($ret < 0)
2061 2061
                 return -1;
2062 2062
 
2063 2063
             return $run;
@@ -2066,15 +2066,15 @@  discard block
 block discarded – undo
2066 2066
         //----------------------------------------------------------------------
2067 2067
         public function eatAn()
2068 2068
         {
2069
-            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());
2069
+            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());
2070 2070
             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());
2071 2071
 
2072 2072
             $p = 0;
2073 2073
             
2074
-            while(self::isalnumat($this->dataStr, $p)) {
2075
-                if(self::isdigitat($this->dataStr, $p)) {
2074
+            while (self::isalnumat($this->dataStr, $p)) {
2075
+                if (self::isdigitat($this->dataStr, $p)) {
2076 2076
                     $q = $p;
2077
-                    while(self::isdigitat($this->dataStr, $q)) {
2077
+                    while (self::isdigitat($this->dataStr, $q)) {
2078 2078
                         $q++;
2079 2079
                     }
2080 2080
                     
@@ -2082,7 +2082,7 @@  discard block
 block discarded – undo
2082 2082
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
2083 2083
                          - QRinput::estimateBitsModeAn($q); // - 4 - la
2084 2084
                          
2085
-                    if($dif < 0) {
2085
+                    if ($dif < 0) {
2086 2086
                         break;
2087 2087
                     } else {
2088 2088
                         $p = $q;
@@ -2094,17 +2094,17 @@  discard block
 block discarded – undo
2094 2094
 
2095 2095
             $run = $p;
2096 2096
 
2097
-            if(!self::isalnumat($this->dataStr, $p)) {
2097
+            if (!self::isalnumat($this->dataStr, $p)) {
2098 2098
                 $dif = QRinput::estimateBitsModeAn($run) + 4 + $la
2099 2099
                      + QRinput::estimateBitsMode8(1) // + 4 + l8
2100 2100
                       - QRinput::estimateBitsMode8($run + 1); // - 4 - l8
2101
-                if($dif > 0) {
2101
+                if ($dif > 0) {
2102 2102
                     return $this->eat8();
2103 2103
                 }
2104 2104
             }
2105 2105
 
2106 2106
             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
2107
-            if($ret < 0)
2107
+            if ($ret < 0)
2108 2108
                 return -1;
2109 2109
 
2110 2110
             return $run;
@@ -2115,12 +2115,12 @@  discard block
 block discarded – undo
2115 2115
         {
2116 2116
             $p = 0;
2117 2117
             
2118
-            while($this->identifyMode($p) == QR_MODE_KANJI) {
2118
+            while ($this->identifyMode($p) == QR_MODE_KANJI) {
2119 2119
                 $p += 2;
2120 2120
             }
2121 2121
             
2122 2122
             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
2123
-            if($ret < 0)
2123
+            if ($ret < 0)
2124 2124
                 return -1;
2125 2125
 
2126 2126
             return $run;
@@ -2135,34 +2135,34 @@  discard block
 block discarded – undo
2135 2135
             $p = 1;
2136 2136
             $dataStrLen = strlen($this->dataStr);
2137 2137
             
2138
-            while($p < $dataStrLen) {
2138
+            while ($p < $dataStrLen) {
2139 2139
                 
2140 2140
                 $mode = $this->identifyMode($p);
2141
-                if($mode == QR_MODE_KANJI) {
2141
+                if ($mode == QR_MODE_KANJI) {
2142 2142
                     break;
2143 2143
                 }
2144
-                if($mode == QR_MODE_NUM) {
2144
+                if ($mode == QR_MODE_NUM) {
2145 2145
                     $q = $p;
2146
-                    while(self::isdigitat($this->dataStr, $q)) {
2146
+                    while (self::isdigitat($this->dataStr, $q)) {
2147 2147
                         $q++;
2148 2148
                     }
2149 2149
                     $dif = QRinput::estimateBitsMode8($p) // + 4 + l8
2150 2150
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln
2151 2151
                          - QRinput::estimateBitsMode8($q); // - 4 - l8
2152
-                    if($dif < 0) {
2152
+                    if ($dif < 0) {
2153 2153
                         break;
2154 2154
                     } else {
2155 2155
                         $p = $q;
2156 2156
                     }
2157
-                } else if($mode == QR_MODE_AN) {
2157
+                } else if ($mode == QR_MODE_AN) {
2158 2158
                     $q = $p;
2159
-                    while(self::isalnumat($this->dataStr, $q)) {
2159
+                    while (self::isalnumat($this->dataStr, $q)) {
2160 2160
                         $q++;
2161 2161
                     }
2162 2162
                     $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8
2163 2163
                          + QRinput::estimateBitsModeAn($q - $p) + 4 + $la
2164 2164
                          - QRinput::estimateBitsMode8($q); // - 4 - l8
2165
-                    if($dif < 0) {
2165
+                    if ($dif < 0) {
2166 2166
                         break;
2167 2167
                     } else {
2168 2168
                         $p = $q;
@@ -2175,7 +2175,7 @@  discard block
 block discarded – undo
2175 2175
             $run = $p;
2176 2176
             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
2177 2177
             
2178
-            if($ret < 0)
2178
+            if ($ret < 0)
2179 2179
                 return -1;
2180 2180
 
2181 2181
             return $run;
@@ -2186,7 +2186,7 @@  discard block
 block discarded – undo
2186 2186
         {
2187 2187
             while (strlen($this->dataStr) > 0)
2188 2188
             {
2189
-                if($this->dataStr == '')
2189
+                if ($this->dataStr == '')
2190 2190
                     return 0;
2191 2191
 
2192 2192
                 $mode = $this->identifyMode(0);
@@ -2203,8 +2203,8 @@  discard block
 block discarded – undo
2203 2203
                 
2204 2204
                 }
2205 2205
 
2206
-                if($length == 0) return 0;
2207
-                if($length < 0)  return -1;
2206
+                if ($length == 0) return 0;
2207
+                if ($length < 0)  return -1;
2208 2208
                 
2209 2209
                 $this->dataStr = substr($this->dataStr, $length);
2210 2210
             }
@@ -2216,9 +2216,9 @@  discard block
 block discarded – undo
2216 2216
             $stringLen = strlen($this->dataStr);
2217 2217
             $p = 0;
2218 2218
             
2219
-            while ($p<$stringLen) {
2219
+            while ($p < $stringLen) {
2220 2220
                 $mode = self::identifyMode(substr($this->dataStr, $p));
2221
-                if($mode == QR_MODE_KANJI) {
2221
+                if ($mode == QR_MODE_KANJI) {
2222 2222
                     $p += 2;
2223 2223
                 } else {
2224 2224
                     if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {
@@ -2234,13 +2234,13 @@  discard block
 block discarded – undo
2234 2234
         //----------------------------------------------------------------------
2235 2235
         public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)
2236 2236
         {
2237
-            if(is_null($string) || $string == '\0' || $string == '') {
2237
+            if (is_null($string) || $string == '\0' || $string == '') {
2238 2238
                 throw new Exception('empty string!!!');
2239 2239
             }
2240 2240
 
2241 2241
             $split = new QRsplit($string, $input, $modeHint);
2242 2242
             
2243
-            if(!$casesensitive)
2243
+            if (!$casesensitive)
2244 2244
                 $split->toUpper();
2245 2245
                 
2246 2246
             return $split->splitString();
@@ -2285,16 +2285,16 @@  discard block
 block discarded – undo
2285 2285
  
2286 2286
     class QRrsItem {
2287 2287
     
2288
-        public $mm;                  // Bits per symbol 
2289
-        public $nn;                  // Symbols per block (= (1<<mm)-1) 
2290
-        public $alpha_to = array();  // log lookup table 
2291
-        public $index_of = array();  // Antilog lookup table 
2292
-        public $genpoly = array();   // Generator polynomial 
2293
-        public $nroots;              // Number of generator roots = number of parity symbols 
2294
-        public $fcr;                 // First consecutive root, index form 
2295
-        public $prim;                // Primitive element, index form 
2296
-        public $iprim;               // prim-th root of 1, index form 
2297
-        public $pad;                 // Padding bytes in shortened block 
2288
+        public $mm; // Bits per symbol 
2289
+        public $nn; // Symbols per block (= (1<<mm)-1) 
2290
+        public $alpha_to = array(); // log lookup table 
2291
+        public $index_of = array(); // Antilog lookup table 
2292
+        public $genpoly = array(); // Generator polynomial 
2293
+        public $nroots; // Number of generator roots = number of parity symbols 
2294
+        public $fcr; // First consecutive root, index form 
2295
+        public $prim; // Primitive element, index form 
2296
+        public $iprim; // prim-th root of 1, index form 
2297
+        public $pad; // Padding bytes in shortened block 
2298 2298
         public $gfpoly;
2299 2299
     
2300 2300
         //----------------------------------------------------------------------
@@ -2318,47 +2318,47 @@  discard block
 block discarded – undo
2318 2318
             $rs = null;
2319 2319
             
2320 2320
             // Check parameter ranges
2321
-            if($symsize < 0 || $symsize > 8)                     return $rs;
2322
-            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
2323
-            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;
2324
-            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!
2325
-            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding
2321
+            if ($symsize < 0 || $symsize > 8)                     return $rs;
2322
+            if ($fcr < 0 || $fcr >= (1 << $symsize))                return $rs;
2323
+            if ($prim <= 0 || $prim >= (1 << $symsize))             return $rs;
2324
+            if ($nroots < 0 || $nroots >= (1 << $symsize))          return $rs; // Can't have more roots than symbol values!
2325
+            if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) return $rs; // Too much padding
2326 2326
 
2327 2327
             $rs = new QRrsItem();
2328 2328
             $rs->mm = $symsize;
2329
-            $rs->nn = (1<<$symsize)-1;
2329
+            $rs->nn = (1 << $symsize) - 1;
2330 2330
             $rs->pad = $pad;
2331 2331
 
2332
-            $rs->alpha_to = array_fill(0, $rs->nn+1, 0);
2333
-            $rs->index_of = array_fill(0, $rs->nn+1, 0);
2332
+            $rs->alpha_to = array_fill(0, $rs->nn + 1, 0);
2333
+            $rs->index_of = array_fill(0, $rs->nn + 1, 0);
2334 2334
           
2335 2335
             // PHP style macro replacement ;)
2336
-            $NN =& $rs->nn;
2337
-            $A0 =& $NN;
2336
+            $NN = & $rs->nn;
2337
+            $A0 = & $NN;
2338 2338
             
2339 2339
             // Generate Galois field lookup tables
2340 2340
             $rs->index_of[0] = $A0; // log(zero) = -inf
2341 2341
             $rs->alpha_to[$A0] = 0; // alpha**-inf = 0
2342 2342
             $sr = 1;
2343 2343
           
2344
-            for($i=0; $i<$rs->nn; $i++) {
2344
+            for ($i = 0; $i < $rs->nn; $i++) {
2345 2345
                 $rs->index_of[$sr] = $i;
2346 2346
                 $rs->alpha_to[$i] = $sr;
2347 2347
                 $sr <<= 1;
2348
-                if($sr & (1<<$symsize)) {
2348
+                if ($sr & (1 << $symsize)) {
2349 2349
                     $sr ^= $gfpoly;
2350 2350
                 }
2351 2351
                 $sr &= $rs->nn;
2352 2352
             }
2353 2353
             
2354
-            if($sr != 1){
2354
+            if ($sr != 1) {
2355 2355
                 // field generator polynomial is not primitive!
2356 2356
                 $rs = null;
2357 2357
                 return $rs;
2358 2358
             }
2359 2359
 
2360 2360
             /* Form RS code generator polynomial from its roots */
2361
-            $rs->genpoly = array_fill(0, $nroots+1, 0);
2361
+            $rs->genpoly = array_fill(0, $nroots + 1, 0);
2362 2362
         
2363 2363
             $rs->fcr = $fcr;
2364 2364
             $rs->prim = $prim;
@@ -2366,21 +2366,21 @@  discard block
 block discarded – undo
2366 2366
             $rs->gfpoly = $gfpoly;
2367 2367
 
2368 2368
             /* Find prim-th root of 1, used in decoding */
2369
-            for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn)
2369
+            for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs->nn)
2370 2370
             ; // intentional empty-body loop!
2371 2371
             
2372
-            $rs->iprim = (int)($iprim / $prim);
2372
+            $rs->iprim = (int) ($iprim / $prim);
2373 2373
             $rs->genpoly[0] = 1;
2374 2374
             
2375
-            for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {
2376
-                $rs->genpoly[$i+1] = 1;
2375
+            for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {
2376
+                $rs->genpoly[$i + 1] = 1;
2377 2377
 
2378 2378
                 // Multiply rs->genpoly[] by  @**(root + x)
2379 2379
                 for ($j = $i; $j > 0; $j--) {
2380 2380
                     if ($rs->genpoly[$j] != 0) {
2381
-                        $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];
2381
+                        $rs->genpoly[$j] = $rs->genpoly[$j - 1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];
2382 2382
                     } else {
2383
-                        $rs->genpoly[$j] = $rs->genpoly[$j-1];
2383
+                        $rs->genpoly[$j] = $rs->genpoly[$j - 1];
2384 2384
                     }
2385 2385
                 }
2386 2386
                 // rs->genpoly[0] can never be zero
@@ -2397,38 +2397,38 @@  discard block
 block discarded – undo
2397 2397
         //----------------------------------------------------------------------
2398 2398
         public function encode_rs_char($data, &$parity)
2399 2399
         {
2400
-            $MM       =& $this->mm;
2401
-            $NN       =& $this->nn;
2402
-            $ALPHA_TO =& $this->alpha_to;
2403
-            $INDEX_OF =& $this->index_of;
2404
-            $GENPOLY  =& $this->genpoly;
2405
-            $NROOTS   =& $this->nroots;
2406
-            $FCR      =& $this->fcr;
2407
-            $PRIM     =& $this->prim;
2408
-            $IPRIM    =& $this->iprim;
2409
-            $PAD      =& $this->pad;
2410
-            $A0       =& $NN;
2400
+            $MM       = & $this->mm;
2401
+            $NN       = & $this->nn;
2402
+            $ALPHA_TO = & $this->alpha_to;
2403
+            $INDEX_OF = & $this->index_of;
2404
+            $GENPOLY  = & $this->genpoly;
2405
+            $NROOTS   = & $this->nroots;
2406
+            $FCR      = & $this->fcr;
2407
+            $PRIM     = & $this->prim;
2408
+            $IPRIM    = & $this->iprim;
2409
+            $PAD      = & $this->pad;
2410
+            $A0       = & $NN;
2411 2411
 
2412 2412
             $parity = array_fill(0, $NROOTS, 0);
2413 2413
 
2414
-            for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) {
2414
+            for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {
2415 2415
                 
2416 2416
                 $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];
2417
-                if($feedback != $A0) {      
2417
+                if ($feedback != $A0) {      
2418 2418
                     // feedback term is non-zero
2419 2419
             
2420 2420
                     // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must
2421 2421
                     // always be for the polynomials constructed by init_rs()
2422 2422
                     $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback);
2423 2423
             
2424
-                    for($j=1;$j<$NROOTS;$j++) {
2425
-                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])];
2424
+                    for ($j = 1; $j < $NROOTS; $j++) {
2425
+                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS - $j])];
2426 2426
                     }
2427 2427
                 }
2428 2428
                 
2429 2429
                 // Shift 
2430 2430
                 array_shift($parity);
2431
-                if($feedback != $A0) {
2431
+                if ($feedback != $A0) {
2432 2432
                     array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]);
2433 2433
                 } else {
2434 2434
                     array_push($parity, 0);
@@ -2446,13 +2446,13 @@  discard block
 block discarded – undo
2446 2446
         //----------------------------------------------------------------------
2447 2447
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
2448 2448
         {
2449
-            foreach(self::$items as $rs) {
2450
-                if($rs->pad != $pad)       continue;
2451
-                if($rs->nroots != $nroots) continue;
2452
-                if($rs->mm != $symsize)    continue;
2453
-                if($rs->gfpoly != $gfpoly) continue;
2454
-                if($rs->fcr != $fcr)       continue;
2455
-                if($rs->prim != $prim)     continue;
2449
+            foreach (self::$items as $rs) {
2450
+                if ($rs->pad != $pad)       continue;
2451
+                if ($rs->nroots != $nroots) continue;
2452
+                if ($rs->mm != $symsize)    continue;
2453
+                if ($rs->gfpoly != $gfpoly) continue;
2454
+                if ($rs->fcr != $fcr)       continue;
2455
+                if ($rs->prim != $prim)     continue;
2456 2456
 
2457 2457
                 return $rs;
2458 2458
             }
@@ -2516,10 +2516,10 @@  discard block
 block discarded – undo
2516 2516
         public function writeFormatInformation($width, &$frame, $mask, $level)
2517 2517
         {
2518 2518
             $blacks = 0;
2519
-            $format =  QRspec::getFormatInfo($mask, $level);
2519
+            $format = QRspec::getFormatInfo($mask, $level);
2520 2520
 
2521
-            for($i=0; $i<8; $i++) {
2522
-                if($format & 1) {
2521
+            for ($i = 0; $i < 8; $i++) {
2522
+                if ($format & 1) {
2523 2523
                     $blacks += 2;
2524 2524
                     $v = 0x85;
2525 2525
                 } else {
@@ -2527,7 +2527,7 @@  discard block
 block discarded – undo
2527 2527
                 }
2528 2528
                 
2529 2529
                 $frame[8][$width - 1 - $i] = chr($v);
2530
-                if($i < 6) {
2530
+                if ($i < 6) {
2531 2531
                     $frame[$i][8] = chr($v);
2532 2532
                 } else {
2533 2533
                     $frame[$i + 1][8] = chr($v);
@@ -2535,8 +2535,8 @@  discard block
 block discarded – undo
2535 2535
                 $format = $format >> 1;
2536 2536
             }
2537 2537
             
2538
-            for($i=0; $i<7; $i++) {
2539
-                if($format & 1) {
2538
+            for ($i = 0; $i < 7; $i++) {
2539
+                if ($format & 1) {
2540 2540
                     $blacks += 2;
2541 2541
                     $v = 0x85;
2542 2542
                 } else {
@@ -2544,7 +2544,7 @@  discard block
 block discarded – undo
2544 2544
                 }
2545 2545
                 
2546 2546
                 $frame[$width - 7 + $i][8] = chr($v);
2547
-                if($i == 0) {
2547
+                if ($i == 0) {
2548 2548
                     $frame[8][7] = chr($v);
2549 2549
                 } else {
2550 2550
                     $frame[8][6 - $i] = chr($v);
@@ -2557,27 +2557,27 @@  discard block
 block discarded – undo
2557 2557
         }
2558 2558
         
2559 2559
         //----------------------------------------------------------------------
2560
-        public function mask0($x, $y) { return ($x+$y)&1;                       }
2561
-        public function mask1($x, $y) { return ($y&1);                          }
2562
-        public function mask2($x, $y) { return ($x%3);                          }
2563
-        public function mask3($x, $y) { return ($x+$y)%3;                       }
2564
-        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }
2565
-        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }
2566
-        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }
2567
-        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }
2560
+        public function mask0($x, $y) { return ($x + $y) & 1; }
2561
+        public function mask1($x, $y) { return ($y & 1); }
2562
+        public function mask2($x, $y) { return ($x % 3); }
2563
+        public function mask3($x, $y) { return ($x + $y) % 3; }
2564
+        public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3))) & 1; }
2565
+        public function mask5($x, $y) { return (($x * $y) & 1) + ($x * $y) % 3; }
2566
+        public function mask6($x, $y) { return ((($x * $y) & 1) + ($x * $y) % 3) & 1; }
2567
+        public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y) & 1)) & 1; }
2568 2568
         
2569 2569
         //----------------------------------------------------------------------
2570 2570
         private function generateMaskNo($maskNo, $width, $frame)
2571 2571
         {
2572 2572
             $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
2573 2573
             
2574
-            for($y=0; $y<$width; $y++) {
2575
-                for($x=0; $x<$width; $x++) {
2576
-                    if(ord($frame[$y][$x]) & 0x80) {
2574
+            for ($y = 0; $y < $width; $y++) {
2575
+                for ($x = 0; $x < $width; $x++) {
2576
+                    if (ord($frame[$y][$x]) & 0x80) {
2577 2577
                         $bitMask[$y][$x] = 0;
2578 2578
                     } else {
2579 2579
                         $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
2580
-                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;
2580
+                        $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;
2581 2581
                     }
2582 2582
                     
2583 2583
                 }
@@ -2635,12 +2635,12 @@  discard block
 block discarded – undo
2635 2635
                 
2636 2636
             $d = $s;
2637 2637
 
2638
-            for($y=0; $y<$width; $y++) {
2639
-                for($x=0; $x<$width; $x++) {
2640
-                    if($bitMask[$y][$x] == 1) {
2641
-                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
2638
+            for ($y = 0; $y < $width; $y++) {
2639
+                for ($x = 0; $x < $width; $x++) {
2640
+                    if ($bitMask[$y][$x] == 1) {
2641
+                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);
2642 2642
                     }
2643
-                    $b += (int)(ord($d[$y][$x]) & 1);
2643
+                    $b += (int) (ord($d[$y][$x]) & 1);
2644 2644
                 }
2645 2645
             }
2646 2646
 
@@ -2662,21 +2662,21 @@  discard block
 block discarded – undo
2662 2662
         {
2663 2663
             $demerit = 0;
2664 2664
 
2665
-            for($i=0; $i<$length; $i++) {
2665
+            for ($i = 0; $i < $length; $i++) {
2666 2666
                 
2667
-                if($this->runLength[$i] >= 5) {
2667
+                if ($this->runLength[$i] >= 5) {
2668 2668
                     $demerit += (N1 + ($this->runLength[$i] - 5));
2669 2669
                 }
2670
-                if($i & 1) {
2671
-                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {
2672
-                        $fact = (int)($this->runLength[$i] / 3);
2673
-                        if(($this->runLength[$i-2] == $fact) &&
2674
-                           ($this->runLength[$i-1] == $fact) &&
2675
-                           ($this->runLength[$i+1] == $fact) &&
2676
-                           ($this->runLength[$i+2] == $fact)) {
2677
-                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {
2670
+                if ($i & 1) {
2671
+                    if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) {
2672
+                        $fact = (int) ($this->runLength[$i] / 3);
2673
+                        if (($this->runLength[$i - 2] == $fact) &&
2674
+                           ($this->runLength[$i - 1] == $fact) &&
2675
+                           ($this->runLength[$i + 1] == $fact) &&
2676
+                           ($this->runLength[$i + 2] == $fact)) {
2677
+                            if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) {
2678 2678
                                 $demerit += N3;
2679
-                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {
2679
+                            } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) {
2680 2680
                                 $demerit += N3;
2681 2681
                             }
2682 2682
                         }
@@ -2692,30 +2692,30 @@  discard block
 block discarded – undo
2692 2692
             $head = 0;
2693 2693
             $demerit = 0;
2694 2694
 
2695
-            for($y=0; $y<$width; $y++) {
2695
+            for ($y = 0; $y < $width; $y++) {
2696 2696
                 $head = 0;
2697 2697
                 $this->runLength[0] = 1;
2698 2698
                 
2699 2699
                 $frameY = $frame[$y];
2700 2700
                 
2701
-                if ($y>0)
2702
-                    $frameYM = $frame[$y-1];
2701
+                if ($y > 0)
2702
+                    $frameYM = $frame[$y - 1];
2703 2703
                 
2704
-                for($x=0; $x<$width; $x++) {
2705
-                    if(($x > 0) && ($y > 0)) {
2706
-                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
2707
-                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
2704
+                for ($x = 0; $x < $width; $x++) {
2705
+                    if (($x > 0) && ($y > 0)) {
2706
+                        $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);
2707
+                        $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);
2708 2708
                         
2709
-                        if(($b22 | ($w22 ^ 1))&1) {                                                                     
2709
+                        if (($b22 | ($w22 ^ 1)) & 1) {                                                                     
2710 2710
                             $demerit += N2;
2711 2711
                         }
2712 2712
                     }
2713
-                    if(($x == 0) && (ord($frameY[$x]) & 1)) {
2713
+                    if (($x == 0) && (ord($frameY[$x]) & 1)) {
2714 2714
                         $this->runLength[0] = -1;
2715 2715
                         $head = 1;
2716 2716
                         $this->runLength[$head] = 1;
2717
-                    } else if($x > 0) {
2718
-                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
2717
+                    } else if ($x > 0) {
2718
+                        if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {
2719 2719
                             $head++;
2720 2720
                             $this->runLength[$head] = 1;
2721 2721
                         } else {
@@ -2724,20 +2724,20 @@  discard block
 block discarded – undo
2724 2724
                     }
2725 2725
                 }
2726 2726
     
2727
-                $demerit += $this->calcN1N3($head+1);
2727
+                $demerit += $this->calcN1N3($head + 1);
2728 2728
             }
2729 2729
 
2730
-            for($x=0; $x<$width; $x++) {
2730
+            for ($x = 0; $x < $width; $x++) {
2731 2731
                 $head = 0;
2732 2732
                 $this->runLength[0] = 1;
2733 2733
                 
2734
-                for($y=0; $y<$width; $y++) {
2735
-                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {
2734
+                for ($y = 0; $y < $width; $y++) {
2735
+                    if ($y == 0 && (ord($frame[$y][$x]) & 1)) {
2736 2736
                         $this->runLength[0] = -1;
2737 2737
                         $head = 1;
2738 2738
                         $this->runLength[$head] = 1;
2739
-                    } else if($y > 0) {
2740
-                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
2739
+                    } else if ($y > 0) {
2740
+                        if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {
2741 2741
                             $head++;
2742 2742
                             $this->runLength[$head] = 1;
2743 2743
                         } else {
@@ -2746,7 +2746,7 @@  discard block
 block discarded – undo
2746 2746
                     }
2747 2747
                 }
2748 2748
             
2749
-                $demerit += $this->calcN1N3($head+1);
2749
+                $demerit += $this->calcN1N3($head + 1);
2750 2750
             }
2751 2751
 
2752 2752
             return $demerit;
@@ -2760,13 +2760,13 @@  discard block
 block discarded – undo
2760 2760
             $bestMaskNum = 0;
2761 2761
             $bestMask = array();
2762 2762
             
2763
-            $checked_masks = array(0,1,2,3,4,5,6,7);
2763
+            $checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
2764 2764
             
2765 2765
             if (QR_FIND_FROM_RANDOM !== false) {
2766 2766
             
2767
-                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);
2768
-                for ($i = 0; $i <  $howManuOut; $i++) {
2769
-                    $remPos = rand (0, count($checked_masks)-1);
2767
+                $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
2768
+                for ($i = 0; $i < $howManuOut; $i++) {
2769
+                    $remPos = rand(0, count($checked_masks) - 1);
2770 2770
                     unset($checked_masks[$remPos]);
2771 2771
                     $checked_masks = array_values($checked_masks);
2772 2772
                 }
@@ -2775,18 +2775,18 @@  discard block
 block discarded – undo
2775 2775
             
2776 2776
             $bestMask = $frame;
2777 2777
              
2778
-            foreach($checked_masks as $i) {
2778
+            foreach ($checked_masks as $i) {
2779 2779
                 $mask = array_fill(0, $width, str_repeat("\0", $width));
2780 2780
 
2781 2781
                 $demerit = 0;
2782 2782
                 $blacks = 0;
2783 2783
                 $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
2784 2784
                 $blacks += $this->writeFormatInformation($width, $mask, $i, $level);
2785
-                $blacks  = (int)(100 * $blacks / ($width * $width));
2786
-                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
2785
+                $blacks  = (int) (100 * $blacks / ($width * $width));
2786
+                $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);
2787 2787
                 $demerit += $this->evaluateSymbol($width, $mask);
2788 2788
                 
2789
-                if($demerit < $minDemerit) {
2789
+                if ($demerit < $minDemerit) {
2790 2790
                     $minDemerit = $demerit;
2791 2791
                     $bestMask = $mask;
2792 2792
                     $bestMaskNum = $i;
@@ -2866,10 +2866,10 @@  discard block
 block discarded – undo
2866 2866
         //----------------------------------------------------------------------
2867 2867
         public function __construct(QRinput $input)
2868 2868
         {
2869
-            $spec = array(0,0,0,0,0);
2869
+            $spec = array(0, 0, 0, 0, 0);
2870 2870
             
2871 2871
             $this->datacode = $input->getByteStream();
2872
-            if(is_null($this->datacode)) {
2872
+            if (is_null($this->datacode)) {
2873 2873
                 throw new Exception('null imput string');
2874 2874
             }
2875 2875
 
@@ -2883,7 +2883,7 @@  discard block
 block discarded – undo
2883 2883
             $this->blocks = QRspec::rsBlockNum($spec);
2884 2884
             
2885 2885
             $ret = $this->init($spec);
2886
-            if($ret < 0) {
2886
+            if ($ret < 0) {
2887 2887
                 throw new Exception('block alloc error');
2888 2888
                 return null;
2889 2889
             }
@@ -2902,29 +2902,29 @@  discard block
 block discarded – undo
2902 2902
             $blockNo = 0;
2903 2903
             $dataPos = 0;
2904 2904
             $eccPos = 0;
2905
-            for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {
2906
-                $ecc = array_slice($this->ecccode,$eccPos);
2907
-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);
2908
-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
2905
+            for ($i = 0; $i < QRspec::rsBlockNum1($spec); $i++) {
2906
+                $ecc = array_slice($this->ecccode, $eccPos);
2907
+                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
2908
+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
2909 2909
                 
2910 2910
                 $dataPos += $dl;
2911 2911
                 $eccPos += $el;
2912 2912
                 $blockNo++;
2913 2913
             }
2914 2914
 
2915
-            if(QRspec::rsBlockNum2($spec) == 0)
2915
+            if (QRspec::rsBlockNum2($spec) == 0)
2916 2916
                 return 0;
2917 2917
 
2918 2918
             $dl = QRspec::rsDataCodes2($spec);
2919 2919
             $el = QRspec::rsEccCodes2($spec);
2920 2920
             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
2921 2921
             
2922
-            if($rs == null) return -1;
2922
+            if ($rs == null) return -1;
2923 2923
             
2924
-            for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
2925
-                $ecc = array_slice($this->ecccode,$eccPos);
2924
+            for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {
2925
+                $ecc = array_slice($this->ecccode, $eccPos);
2926 2926
                 $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);
2927
-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);
2927
+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);
2928 2928
                 
2929 2929
                 $dataPos += $dl;
2930 2930
                 $eccPos += $el;
@@ -2939,14 +2939,14 @@  discard block
 block discarded – undo
2939 2939
         {
2940 2940
             $ret = 0;
2941 2941
 
2942
-            if($this->count < $this->dataLength) {
2942
+            if ($this->count < $this->dataLength) {
2943 2943
                 $row = $this->count % $this->blocks;
2944 2944
                 $col = $this->count / $this->blocks;
2945
-                if($col >= $this->rsblocks[0]->dataLength) {
2945
+                if ($col >= $this->rsblocks[0]->dataLength) {
2946 2946
                     $row += $this->b1;
2947 2947
                 }
2948 2948
                 $ret = $this->rsblocks[$row]->data[$col];
2949
-            } else if($this->count < $this->dataLength + $this->eccLength) {
2949
+            } else if ($this->count < $this->dataLength + $this->eccLength) {
2950 2950
                 $row = ($this->count - $this->dataLength) % $this->blocks;
2951 2951
                 $col = ($this->count - $this->dataLength) / $this->blocks;
2952 2952
                 $ret = $this->rsblocks[$row]->ecc[$col];
@@ -2970,10 +2970,10 @@  discard block
 block discarded – undo
2970 2970
         //----------------------------------------------------------------------
2971 2971
         public function encodeMask(QRinput $input, $mask)
2972 2972
         {
2973
-            if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
2973
+            if ($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {
2974 2974
                 throw new Exception('wrong version');
2975 2975
             }
2976
-            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
2976
+            if ($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {
2977 2977
                 throw new Exception('wrong level');
2978 2978
             }
2979 2979
 
@@ -2986,15 +2986,15 @@  discard block
 block discarded – undo
2986 2986
             $frame = QRspec::newFrame($version);
2987 2987
             
2988 2988
             $filler = new FrameFiller($width, $frame);
2989
-            if(is_null($filler)) {
2989
+            if (is_null($filler)) {
2990 2990
                 return null;
2991 2991
             }
2992 2992
 
2993 2993
             // inteleaved data and ecc codes
2994
-            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {
2994
+            for ($i = 0; $i < $raw->dataLength + $raw->eccLength; $i++) {
2995 2995
                 $code = $raw->getCode();
2996 2996
                 $bit = 0x80;
2997
-                for($j=0; $j<8; $j++) {
2997
+                for ($j = 0; $j < 8; $j++) {
2998 2998
                     $addr = $filler->next();
2999 2999
                     $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));
3000 3000
                     $bit = $bit >> 1;
@@ -3007,7 +3007,7 @@  discard block
 block discarded – undo
3007 3007
             
3008 3008
             // remainder bits
3009 3009
             $j = QRspec::getRemainder($version);
3010
-            for($i=0; $i<$j; $i++) {
3010
+            for ($i = 0; $i < $j; $i++) {
3011 3011
                 $addr = $filler->next();
3012 3012
                 $filler->setFrameAt($addr, 0x02);
3013 3013
             }
@@ -3018,7 +3018,7 @@  discard block
 block discarded – undo
3018 3018
             
3019 3019
             // masking
3020 3020
             $maskObj = new QRmask();
3021
-            if($mask < 0) {
3021
+            if ($mask < 0) {
3022 3022
             
3023 3023
                 if (QR_FIND_BEST_MASK) {
3024 3024
                     $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());
@@ -3029,7 +3029,7 @@  discard block
 block discarded – undo
3029 3029
                 $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());
3030 3030
             }
3031 3031
             
3032
-            if($masked == null) {
3032
+            if ($masked == null) {
3033 3033
                 return null;
3034 3034
             }
3035 3035
             
@@ -3051,16 +3051,16 @@  discard block
 block discarded – undo
3051 3051
         //----------------------------------------------------------------------
3052 3052
         public function encodeString8bit($string, $version, $level)
3053 3053
         {
3054
-            if(string == null) {
3054
+            if (string == null) {
3055 3055
                 throw new Exception('empty string!');
3056 3056
                 return null;
3057 3057
             }
3058 3058
 
3059 3059
             $input = new QRinput($version, $level);
3060
-            if($input == null) return null;
3060
+            if ($input == null) return null;
3061 3061
 
3062 3062
             $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));
3063
-            if($ret < 0) {
3063
+            if ($ret < 0) {
3064 3064
                 unset($input);
3065 3065
                 return null;
3066 3066
             }
@@ -3071,16 +3071,16 @@  discard block
 block discarded – undo
3071 3071
         public function encodeString($string, $version, $level, $hint, $casesensitive)
3072 3072
         {
3073 3073
 
3074
-            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
3074
+            if ($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {
3075 3075
                 throw new Exception('bad hint');
3076 3076
                 return null;
3077 3077
             }
3078 3078
 
3079 3079
             $input = new QRinput($version, $level);
3080
-            if($input == null) return null;
3080
+            if ($input == null) return null;
3081 3081
 
3082 3082
             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
3083
-            if($ret < 0) {
3083
+            if ($ret < 0) {
3084 3084
                 return null;
3085 3085
             }
3086 3086
 
@@ -3088,10 +3088,10 @@  discard block
 block discarded – undo
3088 3088
         }
3089 3089
         
3090 3090
         //----------------------------------------------------------------------
3091
-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 
3091
+        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint = false) 
3092 3092
         {
3093 3093
             $enc = QRencode::factory($level, $size, $margin);
3094
-            return $enc->encodePNG($text, $outfile, $saveandprint=false);
3094
+            return $enc->encodePNG($text, $outfile, $saveandprint = false);
3095 3095
         }
3096 3096
 
3097 3097
         //----------------------------------------------------------------------
@@ -3148,7 +3148,7 @@  discard block
 block discarded – undo
3148 3148
         {
3149 3149
             do {
3150 3150
             
3151
-                if($this->bit == -1) {
3151
+                if ($this->bit == -1) {
3152 3152
                     $this->bit = 0;
3153 3153
                     return array('x'=>$this->x, 'y'=>$this->y);
3154 3154
                 }
@@ -3157,7 +3157,7 @@  discard block
 block discarded – undo
3157 3157
                 $y = $this->y;
3158 3158
                 $w = $this->width;
3159 3159
 
3160
-                if($this->bit == 0) {
3160
+                if ($this->bit == 0) {
3161 3161
                     $x--;
3162 3162
                     $this->bit++;
3163 3163
                 } else {
@@ -3166,33 +3166,33 @@  discard block
 block discarded – undo
3166 3166
                     $this->bit--;
3167 3167
                 }
3168 3168
 
3169
-                if($this->dir < 0) {
3170
-                    if($y < 0) {
3169
+                if ($this->dir < 0) {
3170
+                    if ($y < 0) {
3171 3171
                         $y = 0;
3172 3172
                         $x -= 2;
3173 3173
                         $this->dir = 1;
3174
-                        if($x == 6) {
3174
+                        if ($x == 6) {
3175 3175
                             $x--;
3176 3176
                             $y = 9;
3177 3177
                         }
3178 3178
                     }
3179 3179
                 } else {
3180
-                    if($y == $w) {
3180
+                    if ($y == $w) {
3181 3181
                         $y = $w - 1;
3182 3182
                         $x -= 2;
3183 3183
                         $this->dir = -1;
3184
-                        if($x == 6) {
3184
+                        if ($x == 6) {
3185 3185
                             $x--;
3186 3186
                             $y -= 8;
3187 3187
                         }
3188 3188
                     }
3189 3189
                 }
3190
-                if($x < 0 || $y < 0) return null;
3190
+                if ($x < 0 || $y < 0) return null;
3191 3191
 
3192 3192
                 $this->x = $x;
3193 3193
                 $this->y = $y;
3194 3194
 
3195
-            } while(ord($this->frame[$y][$x]) & 0x80);
3195
+            } while (ord($this->frame[$y][$x]) & 0x80);
3196 3196
                         
3197 3197
             return array('x'=>$x, 'y'=>$y);
3198 3198
         }
@@ -3255,7 +3255,7 @@  discard block
 block discarded – undo
3255 3255
         {
3256 3256
             $code = new QRcode();
3257 3257
 
3258
-            if($this->eightbit) {
3258
+            if ($this->eightbit) {
3259 3259
                 $code->encodeString8bit($intext, $this->version, $this->level);
3260 3260
             } else {
3261 3261
                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
@@ -3269,7 +3269,7 @@  discard block
 block discarded – undo
3269 3269
         {
3270 3270
             $code = new QRcode();
3271 3271
 
3272
-            if($this->eightbit) {
3272
+            if ($this->eightbit) {
3273 3273
                 $code->encodeString8bit($intext, $this->version, $this->level);
3274 3274
             } else {
3275 3275
                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);
@@ -3277,7 +3277,7 @@  discard block
 block discarded – undo
3277 3277
             
3278 3278
             QRtools::markTime('after_encode');
3279 3279
             
3280
-            if ($outfile!== false) {
3280
+            if ($outfile !== false) {
3281 3281
                 file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));
3282 3282
             } else {
3283 3283
                 return QRtools::binarize($code->data);
@@ -3285,7 +3285,7 @@  discard block
 block discarded – undo
3285 3285
         }
3286 3286
         
3287 3287
         //----------------------------------------------------------------------
3288
-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 
3288
+        public function encodePNG($intext, $outfile = false, $saveandprint = false) 
3289 3289
         {
3290 3290
             try {
3291 3291
             
@@ -3297,9 +3297,9 @@  discard block
 block discarded – undo
3297 3297
                 if ($err != '')
3298 3298
                     QRtools::log($outfile, $err);
3299 3299
                 
3300
-                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
3300
+                $maxSize = (int) (QR_PNG_MAXIMUM_SIZE / (count($tab) + 2 * $this->margin));
3301 3301
                 
3302
-                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);
3302
+                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin, $saveandprint);
3303 3303
             
3304 3304
             } catch (Exception $e) {
3305 3305
             
Please login to merge, or discard this patch.
Braces   +194 added lines, -109 removed lines patch added patch discarded remove patch
@@ -176,8 +176,9 @@  discard block
 block discarded – undo
176 176
         {
177 177
             $barcode_array = array();
178 178
             
179
-            if (!is_array($mode))
180
-                $mode = explode(',', $mode);
179
+            if (!is_array($mode)) {
180
+                            $mode = explode(',', $mode);
181
+            }
181 182
                 
182 183
             $eccLevel = 'L';
183 184
                 
@@ -194,8 +195,9 @@  discard block
 block discarded – undo
194 195
                 
195 196
             foreach ($qrTab as $line) {
196 197
                 $arrAdd = array();
197
-                foreach(str_split($line) as $char)
198
-                    $arrAdd[] = ($char=='1')?1:0;
198
+                foreach(str_split($line) as $char) {
199
+                                    $arrAdd[] = ($char=='1')?1:0;
200
+                }
199 201
                 $barcode_array['bcode'][] = $arrAdd;
200 202
             }
201 203
                     
@@ -223,8 +225,9 @@  discard block
 block discarded – undo
223 225
 				
224 226
 				$width = count($frame);
225 227
 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
226
-				for ($maskNo=0; $maskNo<8; $maskNo++)
227
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
228
+				for ($maskNo=0; $maskNo<8; $maskNo++) {
229
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
230
+				}
228 231
             }
229 232
 			
230 233
 			QRtools::markTime('after_build_cache');
@@ -261,8 +264,9 @@  discard block
 block discarded – undo
261 264
             list($usec, $sec) = explode(" ", microtime());
262 265
             $time = ((float)$usec + (float)$sec);
263 266
             
264
-            if (!isset($GLOBALS['qr_time_bench']))
265
-                $GLOBALS['qr_time_bench'] = array();
267
+            if (!isset($GLOBALS['qr_time_bench'])) {
268
+                            $GLOBALS['qr_time_bench'] = array();
269
+            }
266 270
             
267 271
             $GLOBALS['qr_time_bench'][$markerId] = $time;
268 272
         }
@@ -427,8 +431,9 @@  discard block
 block discarded – undo
427 431
 
428 432
             for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {
429 433
                 $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];
430
-                if($words >= $size) 
431
-                    return $i;
434
+                if($words >= $size) {
435
+                                    return $i;
436
+                }
432 437
             }
433 438
 
434 439
             return -1;
@@ -446,8 +451,9 @@  discard block
 block discarded – undo
446 451
         //----------------------------------------------------------------------
447 452
         public static function lengthIndicator($mode, $version)
448 453
         {
449
-            if ($mode == QR_MODE_STRUCTURE)
450
-                return 0;
454
+            if ($mode == QR_MODE_STRUCTURE) {
455
+                            return 0;
456
+            }
451 457
                 
452 458
             if ($version <= 9) {
453 459
                 $l = 0;
@@ -463,8 +469,9 @@  discard block
 block discarded – undo
463 469
         //----------------------------------------------------------------------
464 470
         public static function maximumWords($mode, $version)
465 471
         {
466
-            if($mode == QR_MODE_STRUCTURE) 
467
-                return 3;
472
+            if($mode == QR_MODE_STRUCTURE) {
473
+                            return 3;
474
+            }
468 475
                 
469 476
             if($version <= 9) {
470 477
                 $l = 0;
@@ -610,8 +617,9 @@  discard block
 block discarded – undo
610 617
         //----------------------------------------------------------------------
611 618
         public static function putAlignmentPattern($version, &$frame, $width)
612 619
         {
613
-            if($version < 2)
614
-                return;
620
+            if($version < 2) {
621
+                            return;
622
+            }
615 623
 
616 624
             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];
617 625
             if($d < 0) {
@@ -663,8 +671,9 @@  discard block
 block discarded – undo
663 671
         //----------------------------------------------------------------------
664 672
         public static function getVersionPattern($version)
665 673
         {
666
-            if($version < 7 || $version > QRSPEC_VERSION_MAX)
667
-                return 0;
674
+            if($version < 7 || $version > QRSPEC_VERSION_MAX) {
675
+                            return 0;
676
+            }
668 677
 
669 678
             return self::$versionPattern[$version -7];
670 679
         }
@@ -681,11 +690,13 @@  discard block
 block discarded – undo
681 690
 
682 691
         public static function getFormatInfo($mask, $level)
683 692
         {
684
-            if($mask < 0 || $mask > 7)
685
-                return 0;
693
+            if($mask < 0 || $mask > 7) {
694
+                            return 0;
695
+            }
686 696
                 
687
-            if($level < 0 || $level > 3)
688
-                return 0;                
697
+            if($level < 0 || $level > 3) {
698
+                            return 0;
699
+            }
689 700
 
690 701
             return self::$formatInfo[$level][$mask];
691 702
         }
@@ -865,8 +876,9 @@  discard block
 block discarded – undo
865 876
         //----------------------------------------------------------------------
866 877
         public static function newFrame($version)
867 878
         {
868
-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 
869
-                return null;
879
+            if($version < 1 || $version > QRSPEC_VERSION_MAX) {
880
+                            return null;
881
+            }
870 882
 
871 883
             if(!isset(self::$frames[$version])) {
872 884
                 
@@ -884,8 +896,9 @@  discard block
 block discarded – undo
884 896
                 }
885 897
             }
886 898
             
887
-            if(is_null(self::$frames[$version]))
888
-                return null;
899
+            if(is_null(self::$frames[$version])) {
900
+                            return null;
901
+            }
889 902
 
890 903
             return self::$frames[$version];
891 904
         }
@@ -950,7 +963,7 @@  discard block
 block discarded – undo
950 963
                     ImagePng($image, $filename);
951 964
                     header("Content-type: image/png");
952 965
                     ImagePng($image);
953
-                }else{
966
+                } else{
954 967
                     ImagePng($image, $filename);
955 968
                 }
956 969
             }
@@ -1210,8 +1223,9 @@  discard block
 block discarded – undo
1210 1223
         {
1211 1224
             $bits = 0;
1212 1225
 
1213
-            if($version == 0) 
1214
-                $version = 1;
1226
+            if($version == 0) {
1227
+                            $version = 1;
1228
+            }
1215 1229
 
1216 1230
             switch($this->mode) {
1217 1231
                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;
@@ -1270,8 +1284,9 @@  discard block
 block discarded – undo
1270 1284
                             break;
1271 1285
                     }
1272 1286
                     
1273
-                    if($ret < 0)
1274
-                        return -1;
1287
+                    if($ret < 0) {
1288
+                                            return -1;
1289
+                    }
1275 1290
                 }
1276 1291
 
1277 1292
                 return $this->bstream->size();
@@ -1488,8 +1503,9 @@  discard block
 block discarded – undo
1488 1503
         //----------------------------------------------------------------------
1489 1504
         public static function checkModeKanji($size, $data)
1490 1505
         {
1491
-            if($size & 1)
1492
-                return false;
1506
+            if($size & 1) {
1507
+                            return false;
1508
+            }
1493 1509
 
1494 1510
             for($i=0; $i<$size; $i+=2) {
1495 1511
                 $val = (ord($data[$i]) << 8) | ord($data[$i+1]);
@@ -1509,8 +1525,9 @@  discard block
 block discarded – undo
1509 1525
 
1510 1526
         public static function check($mode, $size, $data)
1511 1527
         {
1512
-            if($size <= 0) 
1513
-                return false;
1528
+            if($size <= 0) {
1529
+                            return false;
1530
+            }
1514 1531
 
1515 1532
             switch($mode) {
1516 1533
                 case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;
@@ -1575,8 +1592,9 @@  discard block
 block discarded – undo
1575 1592
                     $chunks = (int)($payload / 11);
1576 1593
                     $remain = $payload - $chunks * 11;
1577 1594
                     $size = $chunks * 2;
1578
-                    if($remain >= 6) 
1579
-                        $size++;
1595
+                    if($remain >= 6) {
1596
+                                            $size++;
1597
+                    }
1580 1598
                     break;
1581 1599
                 case QR_MODE_8:
1582 1600
                     $size = (int)($payload / 8);
@@ -1593,8 +1611,12 @@  discard block
 block discarded – undo
1593 1611
             }
1594 1612
             
1595 1613
             $maxsize = QRspec::maximumWords($mode, $version);
1596
-            if($size < 0) $size = 0;
1597
-            if($size > $maxsize) $size = $maxsize;
1614
+            if($size < 0) {
1615
+                $size = 0;
1616
+            }
1617
+            if($size > $maxsize) {
1618
+                $size = $maxsize;
1619
+            }
1598 1620
 
1599 1621
             return $size;
1600 1622
         }
@@ -1607,8 +1629,9 @@  discard block
 block discarded – undo
1607 1629
             foreach($this->items as $item) {
1608 1630
                 $bits = $item->encodeBitStream($this->version);
1609 1631
                 
1610
-                if($bits < 0) 
1611
-                    return -1;
1632
+                if($bits < 0) {
1633
+                                    return -1;
1634
+                }
1612 1635
                     
1613 1636
                 $total += $bits;
1614 1637
             }
@@ -1627,8 +1650,9 @@  discard block
 block discarded – undo
1627 1650
             for(;;) {
1628 1651
                 $bits = $this->createBitStream();
1629 1652
                 
1630
-                if($bits < 0) 
1631
-                    return -1;
1653
+                if($bits < 0) {
1654
+                                    return -1;
1655
+                }
1632 1656
                     
1633 1657
                 $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);
1634 1658
                 if($ver < 0) {
@@ -1665,8 +1689,9 @@  discard block
 block discarded – undo
1665 1689
             $padding = new QRbitstream();
1666 1690
             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);
1667 1691
             
1668
-            if($ret < 0) 
1669
-                return $ret;
1692
+            if($ret < 0) {
1693
+                            return $ret;
1694
+            }
1670 1695
 
1671 1696
             $padlen = $maxwords - $words;
1672 1697
             
@@ -1679,8 +1704,9 @@  discard block
 block discarded – undo
1679 1704
                 
1680 1705
                 $ret = $padding->appendBytes($padlen, $padbuf);
1681 1706
                 
1682
-                if($ret < 0)
1683
-                    return $ret;
1707
+                if($ret < 0) {
1708
+                                    return $ret;
1709
+                }
1684 1710
                 
1685 1711
             }
1686 1712
 
@@ -1857,13 +1883,15 @@  discard block
 block discarded – undo
1857 1883
         //----------------------------------------------------------------------
1858 1884
         public function appendNum($bits, $num)
1859 1885
         {
1860
-            if ($bits == 0) 
1861
-                return 0;
1886
+            if ($bits == 0) {
1887
+                            return 0;
1888
+            }
1862 1889
 
1863 1890
             $b = QRbitstream::newFromNum($bits, $num);
1864 1891
             
1865
-            if(is_null($b))
1866
-                return -1;
1892
+            if(is_null($b)) {
1893
+                            return -1;
1894
+            }
1867 1895
 
1868 1896
             $ret = $this->append($b);
1869 1897
             unset($b);
@@ -1874,13 +1902,15 @@  discard block
 block discarded – undo
1874 1902
         //----------------------------------------------------------------------
1875 1903
         public function appendBytes($size, $data)
1876 1904
         {
1877
-            if ($size == 0) 
1878
-                return 0;
1905
+            if ($size == 0) {
1906
+                            return 0;
1907
+            }
1879 1908
 
1880 1909
             $b = QRbitstream::newFromBytes($size, $data);
1881 1910
             
1882
-            if(is_null($b))
1883
-                return -1;
1911
+            if(is_null($b)) {
1912
+                            return -1;
1913
+            }
1884 1914
 
1885 1915
             $ret = $this->append($b);
1886 1916
             unset($b);
@@ -1984,8 +2014,9 @@  discard block
 block discarded – undo
1984 2014
         //----------------------------------------------------------------------
1985 2015
         public static function isdigitat($str, $pos)
1986 2016
         {    
1987
-            if ($pos >= strlen($str))
1988
-                return false;
2017
+            if ($pos >= strlen($str)) {
2018
+                            return false;
2019
+            }
1989 2020
             
1990 2021
             return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));
1991 2022
         }
@@ -1993,8 +2024,9 @@  discard block
 block discarded – undo
1993 2024
         //----------------------------------------------------------------------
1994 2025
         public static function isalnumat($str, $pos)
1995 2026
         {
1996
-            if ($pos >= strlen($str))
1997
-                return false;
2027
+            if ($pos >= strlen($str)) {
2028
+                            return false;
2029
+            }
1998 2030
                 
1999 2031
             return (QRinput::lookAnTable(ord($str[$pos])) >= 0);
2000 2032
         }
@@ -2002,8 +2034,9 @@  discard block
 block discarded – undo
2002 2034
         //----------------------------------------------------------------------
2003 2035
         public function identifyMode($pos)
2004 2036
         {
2005
-            if ($pos >= strlen($this->dataStr)) 
2006
-                return QR_MODE_NUL;
2037
+            if ($pos >= strlen($this->dataStr)) {
2038
+                            return QR_MODE_NUL;
2039
+            }
2007 2040
                 
2008 2041
             $c = $this->dataStr[$pos];
2009 2042
             
@@ -2057,8 +2090,9 @@  discard block
 block discarded – undo
2057 2090
             }
2058 2091
             
2059 2092
             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));
2060
-            if($ret < 0)
2061
-                return -1;
2093
+            if($ret < 0) {
2094
+                            return -1;
2095
+            }
2062 2096
 
2063 2097
             return $run;
2064 2098
         }
@@ -2104,8 +2138,9 @@  discard block
 block discarded – undo
2104 2138
             }
2105 2139
 
2106 2140
             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));
2107
-            if($ret < 0)
2108
-                return -1;
2141
+            if($ret < 0) {
2142
+                            return -1;
2143
+            }
2109 2144
 
2110 2145
             return $run;
2111 2146
         }
@@ -2120,8 +2155,9 @@  discard block
 block discarded – undo
2120 2155
             }
2121 2156
             
2122 2157
             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));
2123
-            if($ret < 0)
2124
-                return -1;
2158
+            if($ret < 0) {
2159
+                            return -1;
2160
+            }
2125 2161
 
2126 2162
             return $run;
2127 2163
         }
@@ -2175,8 +2211,9 @@  discard block
 block discarded – undo
2175 2211
             $run = $p;
2176 2212
             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));
2177 2213
             
2178
-            if($ret < 0)
2179
-                return -1;
2214
+            if($ret < 0) {
2215
+                            return -1;
2216
+            }
2180 2217
 
2181 2218
             return $run;
2182 2219
         }
@@ -2186,8 +2223,9 @@  discard block
 block discarded – undo
2186 2223
         {
2187 2224
             while (strlen($this->dataStr) > 0)
2188 2225
             {
2189
-                if($this->dataStr == '')
2190
-                    return 0;
2226
+                if($this->dataStr == '') {
2227
+                                    return 0;
2228
+                }
2191 2229
 
2192 2230
                 $mode = $this->identifyMode(0);
2193 2231
                 
@@ -2195,16 +2233,22 @@  discard block
 block discarded – undo
2195 2233
                     case QR_MODE_NUM: $length = $this->eatNum(); break;
2196 2234
                     case QR_MODE_AN:  $length = $this->eatAn(); break;
2197 2235
                     case QR_MODE_KANJI:
2198
-                        if ($this->modeHint == QR_MODE_KANJI)
2199
-                                $length = $this->eatKanji();
2200
-                        else    $length = $this->eat8();
2236
+                        if ($this->modeHint == QR_MODE_KANJI) {
2237
+                                                        $length = $this->eatKanji();
2238
+                        } else {
2239
+                            $length = $this->eat8();
2240
+                        }
2201 2241
                         break;
2202 2242
                     default: $length = $this->eat8(); break;
2203 2243
                 
2204 2244
                 }
2205 2245
 
2206
-                if($length == 0) return 0;
2207
-                if($length < 0)  return -1;
2246
+                if($length == 0) {
2247
+                    return 0;
2248
+                }
2249
+                if($length < 0) {
2250
+                    return -1;
2251
+                }
2208 2252
                 
2209 2253
                 $this->dataStr = substr($this->dataStr, $length);
2210 2254
             }
@@ -2240,8 +2284,9 @@  discard block
 block discarded – undo
2240 2284
 
2241 2285
             $split = new QRsplit($string, $input, $modeHint);
2242 2286
             
2243
-            if(!$casesensitive)
2244
-                $split->toUpper();
2287
+            if(!$casesensitive) {
2288
+                            $split->toUpper();
2289
+            }
2245 2290
                 
2246 2291
             return $split->splitString();
2247 2292
         }
@@ -2318,11 +2363,23 @@  discard block
 block discarded – undo
2318 2363
             $rs = null;
2319 2364
             
2320 2365
             // Check parameter ranges
2321
-            if($symsize < 0 || $symsize > 8)                     return $rs;
2322
-            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;
2323
-            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;
2324
-            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!
2325
-            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
2326 2383
 
2327 2384
             $rs = new QRrsItem();
2328 2385
             $rs->mm = $symsize;
@@ -2388,8 +2445,9 @@  discard block
 block discarded – undo
2388 2445
             }
2389 2446
             
2390 2447
             // convert rs->genpoly[] to index form for quicker encoding
2391
-            for ($i = 0; $i <= $nroots; $i++)
2392
-                $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
2448
+            for ($i = 0; $i <= $nroots; $i++) {
2449
+                            $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
2450
+            }
2393 2451
 
2394 2452
             return $rs;
2395 2453
         }
@@ -2447,12 +2505,24 @@  discard block
 block discarded – undo
2447 2505
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)
2448 2506
         {
2449 2507
             foreach(self::$items as $rs) {
2450
-                if($rs->pad != $pad)       continue;
2451
-                if($rs->nroots != $nroots) continue;
2452
-                if($rs->mm != $symsize)    continue;
2453
-                if($rs->gfpoly != $gfpoly) continue;
2454
-                if($rs->fcr != $fcr)       continue;
2455
-                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
+                }
2456 2526
 
2457 2527
                 return $rs;
2458 2528
             }
@@ -2591,8 +2661,9 @@  discard block
 block discarded – undo
2591 2661
         {
2592 2662
             $codeArr = array();
2593 2663
             
2594
-            foreach ($bitFrame as $line)
2595
-                $codeArr[] = join('', $line);
2664
+            foreach ($bitFrame as $line) {
2665
+                            $codeArr[] = join('', $line);
2666
+            }
2596 2667
                 
2597 2668
             return gzcompress(join("\n", $codeArr), 9);
2598 2669
         }
@@ -2603,8 +2674,9 @@  discard block
 block discarded – undo
2603 2674
             $codeArr = array();
2604 2675
             
2605 2676
             $codeLines = explode("\n", gzuncompress($code));
2606
-            foreach ($codeLines as $line)
2607
-                $codeArr[] = str_split($line);
2677
+            foreach ($codeLines as $line) {
2678
+                            $codeArr[] = str_split($line);
2679
+            }
2608 2680
             
2609 2681
             return $codeArr;
2610 2682
         }
@@ -2622,16 +2694,18 @@  discard block
 block discarded – undo
2622 2694
                     $bitMask = self::unserial(file_get_contents($fileName));
2623 2695
                 } else {
2624 2696
                     $bitMask = $this->generateMaskNo($maskNo, $width, $s);
2625
-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
2626
-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
2697
+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
2698
+                                            mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
2699
+                    }
2627 2700
                     file_put_contents($fileName, self::serial($bitMask));
2628 2701
                 }
2629 2702
             } else {
2630 2703
                 $bitMask = $this->generateMaskNo($maskNo, $width, $s);
2631 2704
             }
2632 2705
 
2633
-            if ($maskGenOnly)
2634
-                return;
2706
+            if ($maskGenOnly) {
2707
+                            return;
2708
+            }
2635 2709
                 
2636 2710
             $d = $s;
2637 2711
 
@@ -2698,8 +2772,9 @@  discard block
 block discarded – undo
2698 2772
                 
2699 2773
                 $frameY = $frame[$y];
2700 2774
                 
2701
-                if ($y>0)
2702
-                    $frameYM = $frame[$y-1];
2775
+                if ($y>0) {
2776
+                                    $frameYM = $frame[$y-1];
2777
+                }
2703 2778
                 
2704 2779
                 for($x=0; $x<$width; $x++) {
2705 2780
                     if(($x > 0) && ($y > 0)) {
@@ -2912,14 +2987,17 @@  discard block
 block discarded – undo
2912 2987
                 $blockNo++;
2913 2988
             }
2914 2989
 
2915
-            if(QRspec::rsBlockNum2($spec) == 0)
2916
-                return 0;
2990
+            if(QRspec::rsBlockNum2($spec) == 0) {
2991
+                            return 0;
2992
+            }
2917 2993
 
2918 2994
             $dl = QRspec::rsDataCodes2($spec);
2919 2995
             $el = QRspec::rsEccCodes2($spec);
2920 2996
             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);
2921 2997
             
2922
-            if($rs == null) return -1;
2998
+            if($rs == null) {
2999
+                return -1;
3000
+            }
2923 3001
             
2924 3002
             for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {
2925 3003
                 $ecc = array_slice($this->ecccode,$eccPos);
@@ -3057,7 +3135,9 @@  discard block
 block discarded – undo
3057 3135
             }
3058 3136
 
3059 3137
             $input = new QRinput($version, $level);
3060
-            if($input == null) return null;
3138
+            if($input == null) {
3139
+                return null;
3140
+            }
3061 3141
 
3062 3142
             $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));
3063 3143
             if($ret < 0) {
@@ -3077,7 +3157,9 @@  discard block
 block discarded – undo
3077 3157
             }
3078 3158
 
3079 3159
             $input = new QRinput($version, $level);
3080
-            if($input == null) return null;
3160
+            if($input == null) {
3161
+                return null;
3162
+            }
3081 3163
 
3082 3164
             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);
3083 3165
             if($ret < 0) {
@@ -3187,7 +3269,9 @@  discard block
 block discarded – undo
3187 3269
                         }
3188 3270
                     }
3189 3271
                 }
3190
-                if($x < 0 || $y < 0) return null;
3272
+                if($x < 0 || $y < 0) {
3273
+                    return null;
3274
+                }
3191 3275
 
3192 3276
                 $this->x = $x;
3193 3277
                 $this->y = $y;
@@ -3294,8 +3378,9 @@  discard block
 block discarded – undo
3294 3378
                 $err = ob_get_contents();
3295 3379
                 ob_end_clean();
3296 3380
                 
3297
-                if ($err != '')
3298
-                    QRtools::log($outfile, $err);
3381
+                if ($err != '') {
3382
+                                    QRtools::log($outfile, $err);
3383
+                }
3299 3384
                 
3300 3385
                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));
3301 3386
                 
Please login to merge, or discard this patch.
lib/phpqrcode/qrmask.php 3 patches
Spacing   +61 added lines, -61 removed lines patch added patch discarded remove patch
@@ -44,10 +44,10 @@  discard block
 block discarded – undo
44 44
         public function writeFormatInformation($width, &$frame, $mask, $level)
45 45
         {
46 46
             $blacks = 0;
47
-            $format =  QRspec::getFormatInfo($mask, $level);
47
+            $format = QRspec::getFormatInfo($mask, $level);
48 48
 
49
-            for($i=0; $i<8; $i++) {
50
-                if($format & 1) {
49
+            for ($i = 0; $i < 8; $i++) {
50
+                if ($format & 1) {
51 51
                     $blacks += 2;
52 52
                     $v = 0x85;
53 53
                 } else {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
                 }
56 56
                 
57 57
                 $frame[8][$width - 1 - $i] = chr($v);
58
-                if($i < 6) {
58
+                if ($i < 6) {
59 59
                     $frame[$i][8] = chr($v);
60 60
                 } else {
61 61
                     $frame[$i + 1][8] = chr($v);
@@ -63,8 +63,8 @@  discard block
 block discarded – undo
63 63
                 $format = $format >> 1;
64 64
             }
65 65
             
66
-            for($i=0; $i<7; $i++) {
67
-                if($format & 1) {
66
+            for ($i = 0; $i < 7; $i++) {
67
+                if ($format & 1) {
68 68
                     $blacks += 2;
69 69
                     $v = 0x85;
70 70
                 } else {
@@ -72,7 +72,7 @@  discard block
 block discarded – undo
72 72
                 }
73 73
                 
74 74
                 $frame[$width - 7 + $i][8] = chr($v);
75
-                if($i == 0) {
75
+                if ($i == 0) {
76 76
                     $frame[8][7] = chr($v);
77 77
                 } else {
78 78
                     $frame[8][6 - $i] = chr($v);
@@ -85,27 +85,27 @@  discard block
 block discarded – undo
85 85
         }
86 86
         
87 87
         //----------------------------------------------------------------------
88
-        public function mask0($x, $y) { return ($x+$y)&1;                       }
89
-        public function mask1($x, $y) { return ($y&1);                          }
90
-        public function mask2($x, $y) { return ($x%3);                          }
91
-        public function mask3($x, $y) { return ($x+$y)%3;                       }
92
-        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }
93
-        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }
94
-        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }
95
-        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }
88
+        public function mask0($x, $y) { return ($x + $y) & 1; }
89
+        public function mask1($x, $y) { return ($y & 1); }
90
+        public function mask2($x, $y) { return ($x % 3); }
91
+        public function mask3($x, $y) { return ($x + $y) % 3; }
92
+        public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3))) & 1; }
93
+        public function mask5($x, $y) { return (($x * $y) & 1) + ($x * $y) % 3; }
94
+        public function mask6($x, $y) { return ((($x * $y) & 1) + ($x * $y) % 3) & 1; }
95
+        public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y) & 1)) & 1; }
96 96
         
97 97
         //----------------------------------------------------------------------
98 98
         private function generateMaskNo($maskNo, $width, $frame)
99 99
         {
100 100
             $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
101 101
             
102
-            for($y=0; $y<$width; $y++) {
103
-                for($x=0; $x<$width; $x++) {
104
-                    if(ord($frame[$y][$x]) & 0x80) {
102
+            for ($y = 0; $y < $width; $y++) {
103
+                for ($x = 0; $x < $width; $x++) {
104
+                    if (ord($frame[$y][$x]) & 0x80) {
105 105
                         $bitMask[$y][$x] = 0;
106 106
                     } else {
107 107
                         $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);
108
-                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;
108
+                        $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;
109 109
                     }
110 110
                     
111 111
                 }
@@ -163,12 +163,12 @@  discard block
 block discarded – undo
163 163
                 
164 164
             $d = $s;
165 165
 
166
-            for($y=0; $y<$width; $y++) {
167
-                for($x=0; $x<$width; $x++) {
168
-                    if($bitMask[$y][$x] == 1) {
169
-                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
166
+            for ($y = 0; $y < $width; $y++) {
167
+                for ($x = 0; $x < $width; $x++) {
168
+                    if ($bitMask[$y][$x] == 1) {
169
+                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);
170 170
                     }
171
-                    $b += (int)(ord($d[$y][$x]) & 1);
171
+                    $b += (int) (ord($d[$y][$x]) & 1);
172 172
                 }
173 173
             }
174 174
 
@@ -190,21 +190,21 @@  discard block
 block discarded – undo
190 190
         {
191 191
             $demerit = 0;
192 192
 
193
-            for($i=0; $i<$length; $i++) {
193
+            for ($i = 0; $i < $length; $i++) {
194 194
                 
195
-                if($this->runLength[$i] >= 5) {
195
+                if ($this->runLength[$i] >= 5) {
196 196
                     $demerit += (N1 + ($this->runLength[$i] - 5));
197 197
                 }
198
-                if($i & 1) {
199
-                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {
200
-                        $fact = (int)($this->runLength[$i] / 3);
201
-                        if(($this->runLength[$i-2] == $fact) &&
202
-                           ($this->runLength[$i-1] == $fact) &&
203
-                           ($this->runLength[$i+1] == $fact) &&
204
-                           ($this->runLength[$i+2] == $fact)) {
205
-                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {
198
+                if ($i & 1) {
199
+                    if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) {
200
+                        $fact = (int) ($this->runLength[$i] / 3);
201
+                        if (($this->runLength[$i - 2] == $fact) &&
202
+                           ($this->runLength[$i - 1] == $fact) &&
203
+                           ($this->runLength[$i + 1] == $fact) &&
204
+                           ($this->runLength[$i + 2] == $fact)) {
205
+                            if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) {
206 206
                                 $demerit += N3;
207
-                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {
207
+                            } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) {
208 208
                                 $demerit += N3;
209 209
                             }
210 210
                         }
@@ -220,30 +220,30 @@  discard block
 block discarded – undo
220 220
             $head = 0;
221 221
             $demerit = 0;
222 222
 
223
-            for($y=0; $y<$width; $y++) {
223
+            for ($y = 0; $y < $width; $y++) {
224 224
                 $head = 0;
225 225
                 $this->runLength[0] = 1;
226 226
                 
227 227
                 $frameY = $frame[$y];
228 228
                 
229
-                if ($y>0)
230
-                    $frameYM = $frame[$y-1];
229
+                if ($y > 0)
230
+                    $frameYM = $frame[$y - 1];
231 231
                 
232
-                for($x=0; $x<$width; $x++) {
233
-                    if(($x > 0) && ($y > 0)) {
234
-                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);
235
-                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);
232
+                for ($x = 0; $x < $width; $x++) {
233
+                    if (($x > 0) && ($y > 0)) {
234
+                        $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);
235
+                        $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);
236 236
                         
237
-                        if(($b22 | ($w22 ^ 1))&1) {                                                                     
237
+                        if (($b22 | ($w22 ^ 1)) & 1) {                                                                     
238 238
                             $demerit += N2;
239 239
                         }
240 240
                     }
241
-                    if(($x == 0) && (ord($frameY[$x]) & 1)) {
241
+                    if (($x == 0) && (ord($frameY[$x]) & 1)) {
242 242
                         $this->runLength[0] = -1;
243 243
                         $head = 1;
244 244
                         $this->runLength[$head] = 1;
245
-                    } else if($x > 0) {
246
-                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {
245
+                    } else if ($x > 0) {
246
+                        if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {
247 247
                             $head++;
248 248
                             $this->runLength[$head] = 1;
249 249
                         } else {
@@ -252,20 +252,20 @@  discard block
 block discarded – undo
252 252
                     }
253 253
                 }
254 254
     
255
-                $demerit += $this->calcN1N3($head+1);
255
+                $demerit += $this->calcN1N3($head + 1);
256 256
             }
257 257
 
258
-            for($x=0; $x<$width; $x++) {
258
+            for ($x = 0; $x < $width; $x++) {
259 259
                 $head = 0;
260 260
                 $this->runLength[0] = 1;
261 261
                 
262
-                for($y=0; $y<$width; $y++) {
263
-                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {
262
+                for ($y = 0; $y < $width; $y++) {
263
+                    if ($y == 0 && (ord($frame[$y][$x]) & 1)) {
264 264
                         $this->runLength[0] = -1;
265 265
                         $head = 1;
266 266
                         $this->runLength[$head] = 1;
267
-                    } else if($y > 0) {
268
-                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {
267
+                    } else if ($y > 0) {
268
+                        if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {
269 269
                             $head++;
270 270
                             $this->runLength[$head] = 1;
271 271
                         } else {
@@ -274,7 +274,7 @@  discard block
 block discarded – undo
274 274
                     }
275 275
                 }
276 276
             
277
-                $demerit += $this->calcN1N3($head+1);
277
+                $demerit += $this->calcN1N3($head + 1);
278 278
             }
279 279
 
280 280
             return $demerit;
@@ -288,13 +288,13 @@  discard block
 block discarded – undo
288 288
             $bestMaskNum = 0;
289 289
             $bestMask = array();
290 290
             
291
-            $checked_masks = array(0,1,2,3,4,5,6,7);
291
+            $checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);
292 292
             
293 293
             if (QR_FIND_FROM_RANDOM !== false) {
294 294
             
295
-                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);
296
-                for ($i = 0; $i <  $howManuOut; $i++) {
297
-                    $remPos = rand (0, count($checked_masks)-1);
295
+                $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);
296
+                for ($i = 0; $i < $howManuOut; $i++) {
297
+                    $remPos = rand(0, count($checked_masks) - 1);
298 298
                     unset($checked_masks[$remPos]);
299 299
                     $checked_masks = array_values($checked_masks);
300 300
                 }
@@ -303,18 +303,18 @@  discard block
 block discarded – undo
303 303
             
304 304
             $bestMask = $frame;
305 305
              
306
-            foreach($checked_masks as $i) {
306
+            foreach ($checked_masks as $i) {
307 307
                 $mask = array_fill(0, $width, str_repeat("\0", $width));
308 308
 
309 309
                 $demerit = 0;
310 310
                 $blacks = 0;
311 311
                 $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);
312 312
                 $blacks += $this->writeFormatInformation($width, $mask, $i, $level);
313
-                $blacks  = (int)(100 * $blacks / ($width * $width));
314
-                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);
313
+                $blacks  = (int) (100 * $blacks / ($width * $width));
314
+                $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);
315 315
                 $demerit += $this->evaluateSymbol($width, $mask);
316 316
                 
317
-                if($demerit < $minDemerit) {
317
+                if ($demerit < $minDemerit) {
318 318
                     $minDemerit = $demerit;
319 319
                     $bestMask = $mask;
320 320
                     $bestMaskNum = $i;
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -119,8 +119,9 @@  discard block
 block discarded – undo
119 119
         {
120 120
             $codeArr = array();
121 121
             
122
-            foreach ($bitFrame as $line)
123
-                $codeArr[] = join('', $line);
122
+            foreach ($bitFrame as $line) {
123
+                            $codeArr[] = join('', $line);
124
+            }
124 125
                 
125 126
             return gzcompress(join("\n", $codeArr), 9);
126 127
         }
@@ -131,8 +132,9 @@  discard block
 block discarded – undo
131 132
             $codeArr = array();
132 133
             
133 134
             $codeLines = explode("\n", gzuncompress($code));
134
-            foreach ($codeLines as $line)
135
-                $codeArr[] = str_split($line);
135
+            foreach ($codeLines as $line) {
136
+                            $codeArr[] = str_split($line);
137
+            }
136 138
             
137 139
             return $codeArr;
138 140
         }
@@ -150,16 +152,18 @@  discard block
 block discarded – undo
150 152
                     $bitMask = self::unserial(file_get_contents($fileName));
151 153
                 } else {
152 154
                     $bitMask = $this->generateMaskNo($maskNo, $width, $s);
153
-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))
154
-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
155
+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
156
+                                            mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
157
+                    }
155 158
                     file_put_contents($fileName, self::serial($bitMask));
156 159
                 }
157 160
             } else {
158 161
                 $bitMask = $this->generateMaskNo($maskNo, $width, $s);
159 162
             }
160 163
 
161
-            if ($maskGenOnly)
162
-                return;
164
+            if ($maskGenOnly) {
165
+                            return;
166
+            }
163 167
                 
164 168
             $d = $s;
165 169
 
@@ -226,8 +230,9 @@  discard block
 block discarded – undo
226 230
                 
227 231
                 $frameY = $frame[$y];
228 232
                 
229
-                if ($y>0)
230
-                    $frameYM = $frame[$y-1];
233
+                if ($y>0) {
234
+                                    $frameYM = $frame[$y-1];
235
+                }
231 236
                 
232 237
                 for($x=0; $x<$width; $x++) {
233 238
                     if(($x > 0) && ($y > 0)) {
Please login to merge, or discard this patch.
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -25,17 +25,17 @@
 block discarded – undo
25 25
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
26 26
  */
27 27
  
28
-	define('N1', 3);
29
-	define('N2', 3);
30
-	define('N3', 40);
31
-	define('N4', 10);
28
+    define('N1', 3);
29
+    define('N2', 3);
30
+    define('N3', 40);
31
+    define('N4', 10);
32 32
 
33
-	class QRmask {
33
+    class QRmask {
34 34
 	
35
-		public $runLength = array();
35
+        public $runLength = array();
36 36
 		
37
-		//----------------------------------------------------------------------
38
-		public function __construct() 
37
+        //----------------------------------------------------------------------
38
+        public function __construct() 
39 39
         {
40 40
             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);
41 41
         }
Please login to merge, or discard this patch.
lib/phpqrcode/qrconfig.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -5,13 +5,13 @@
 block discarded – undo
5 5
  * Config file, feel free to modify
6 6
  */
7 7
      
8
-    define('QR_CACHEABLE', true);                                                               // use cache - more disk reads but less CPU power, masks and format templates are stored there
9
-    define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR);  // used when QR_CACHEABLE === true
10
-    define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR);                                // default error logs dir   
8
+    define('QR_CACHEABLE', true); // use cache - more disk reads but less CPU power, masks and format templates are stored there
9
+    define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR); // used when QR_CACHEABLE === true
10
+    define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR); // default error logs dir   
11 11
     
12
-    define('QR_FIND_BEST_MASK', true);                                                          // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
13
-    define('QR_FIND_FROM_RANDOM', false);                                                       // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
14
-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false
12
+    define('QR_FIND_BEST_MASK', true); // if true, estimates best mask (spec. default, but extremally slow; set to false to significant performance boost but (propably) worst quality code
13
+    define('QR_FIND_FROM_RANDOM', false); // if false, checks all masks available, otherwise value tells count of masks need to be checked, mask id are got randomly
14
+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false
15 15
                                                   
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
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 17
                                                   
18 18
\ No newline at end of file
Please login to merge, or discard this 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/index.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -42,12 +42,12 @@  discard block
 block discarded – undo
42 42
     //processing form input
43 43
     //remember to sanitize user input in real-life solution !!!
44 44
     $errorCorrectionLevel = 'L';
45
-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))
45
+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L', 'M', 'Q', 'H')))
46 46
         $errorCorrectionLevel = $_REQUEST['level'];    
47 47
 
48 48
     $matrixPointSize = 4;
49 49
     if (isset($_REQUEST['size']))
50
-        $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);
50
+        $matrixPointSize = min(max((int) $_REQUEST['size'], 1), 10);
51 51
 
52 52
 
53 53
     if (isset($_REQUEST['data'])) { 
@@ -73,17 +73,17 @@  discard block
 block discarded – undo
73 73
     
74 74
     //config form
75 75
     echo '<form action="index.php" method="post">
76
-        Data:&nbsp;<input name="data" value="'.(isset($_REQUEST['data'])?htmlspecialchars($_REQUEST['data']):'PHP QR Code :)').'" />&nbsp;
76
+        Data:&nbsp;<input name="data" value="'.(isset($_REQUEST['data']) ?htmlspecialchars($_REQUEST['data']) : 'PHP QR Code :)').'" />&nbsp;
77 77
         ECC:&nbsp;<select name="level">
78
-            <option value="L"'.(($errorCorrectionLevel=='L')?' selected':'').'>L - smallest</option>
79
-            <option value="M"'.(($errorCorrectionLevel=='M')?' selected':'').'>M</option>
80
-            <option value="Q"'.(($errorCorrectionLevel=='Q')?' selected':'').'>Q</option>
81
-            <option value="H"'.(($errorCorrectionLevel=='H')?' selected':'').'>H - best</option>
78
+            <option value="L"'.(($errorCorrectionLevel == 'L') ? ' selected' : '').'>L - smallest</option>
79
+            <option value="M"'.(($errorCorrectionLevel == 'M') ? ' selected' : '').'>M</option>
80
+            <option value="Q"'.(($errorCorrectionLevel == 'Q') ? ' selected' : '').'>Q</option>
81
+            <option value="H"'.(($errorCorrectionLevel == 'H') ? ' selected' : '').'>H - best</option>
82 82
         </select>&nbsp;
83 83
         Size:&nbsp;<select name="size">';
84 84
         
85
-    for($i=1;$i<=10;$i++)
86
-        echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';
85
+    for ($i = 1; $i <= 10; $i++)
86
+        echo '<option value="'.$i.'"'.(($matrixPointSize == $i) ? ' selected' : '').'>'.$i.'</option>';
87 87
         
88 88
     echo '</select>&nbsp;
89 89
         <input type="submit" value="GENERATE"></form><hr/>';
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -33,8 +33,9 @@  discard block
 block discarded – undo
33 33
     include "qrlib.php";    
34 34
     
35 35
     //ofcourse we need rights to create temp dir
36
-    if (!file_exists($PNG_TEMP_DIR))
37
-        mkdir($PNG_TEMP_DIR);
36
+    if (!file_exists($PNG_TEMP_DIR)) {
37
+            mkdir($PNG_TEMP_DIR);
38
+    }
38 39
     
39 40
     
40 41
     $filename = $PNG_TEMP_DIR.'test.png';
@@ -42,19 +43,22 @@  discard block
 block discarded – undo
42 43
     //processing form input
43 44
     //remember to sanitize user input in real-life solution !!!
44 45
     $errorCorrectionLevel = 'L';
45
-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))
46
-        $errorCorrectionLevel = $_REQUEST['level'];    
46
+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H'))) {
47
+            $errorCorrectionLevel = $_REQUEST['level'];
48
+    }
47 49
 
48 50
     $matrixPointSize = 4;
49
-    if (isset($_REQUEST['size']))
50
-        $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);
51
+    if (isset($_REQUEST['size'])) {
52
+            $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);
53
+    }
51 54
 
52 55
 
53 56
     if (isset($_REQUEST['data'])) { 
54 57
     
55 58
         //it's very important!
56
-        if (trim($_REQUEST['data']) == '')
57
-            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
+        }
58 62
             
59 63
         // user data
60 64
         $filename = $PNG_TEMP_DIR.'test'.md5($_REQUEST['data'].'|'.$errorCorrectionLevel.'|'.$matrixPointSize).'.png';
@@ -82,8 +86,9 @@  discard block
 block discarded – undo
82 86
         </select>&nbsp;
83 87
         Size:&nbsp;<select name="size">';
84 88
         
85
-    for($i=1;$i<=10;$i++)
86
-        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
+    }
87 92
         
88 93
     echo '</select>&nbsp;
89 94
         <input type="submit" value="GENERATE"></form><hr/>';
Please login to merge, or discard this patch.
lib/phpqrcode/qrtools.php 3 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -30,8 +30,8 @@  discard block
 block discarded – undo
30 30
             $len = count($frame);
31 31
             foreach ($frame as &$frameLine) {
32 32
                 
33
-                for($i=0; $i<$len; $i++) {
34
-                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';
33
+                for ($i = 0; $i < $len; $i++) {
34
+                    $frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';
35 35
                 }
36 36
             }
37 37
             
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
                 
62 62
             foreach ($qrTab as $line) {
63 63
                 $arrAdd = array();
64
-                foreach(str_split($line) as $char)
65
-                    $arrAdd[] = ($char=='1')?1:0;
64
+                foreach (str_split($line) as $char)
65
+                    $arrAdd[] = ($char == '1') ? 1 : 0;
66 66
                 $barcode_array['bcode'][] = $arrAdd;
67 67
             }
68 68
                     
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 			QRtools::markTime('before_build_cache');
82 82
 			
83 83
 			$mask = new QRmask();
84
-            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
84
+            for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {
85 85
                 $frame = QRspec::newFrame($a);
86 86
                 if (QR_IMAGE) {
87 87
                     $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
90 90
 				
91 91
 				$width = count($frame);
92 92
 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
93
-				for ($maskNo=0; $maskNo<8; $maskNo++)
93
+				for ($maskNo = 0; $maskNo < 8; $maskNo++)
94 94
 					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
95 95
             }
96 96
 			
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
         public static function dumpMask($frame) 
116 116
         {
117 117
             $width = count($frame);
118
-            for($y=0;$y<$width;$y++) {
119
-                for($x=0;$x<$width;$x++) {
118
+            for ($y = 0; $y < $width; $y++) {
119
+                for ($x = 0; $x < $width; $x++) {
120 120
                     echo ord($frame[$y][$x]).',';
121 121
                 }
122 122
             }
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
         public static function markTime($markerId)
127 127
         {
128 128
             list($usec, $sec) = explode(" ", microtime());
129
-            $time = ((float)$usec + (float)$sec);
129
+            $time = ((float) $usec + (float) $sec);
130 130
             
131 131
             if (!isset($GLOBALS['qr_time_bench']))
132 132
                 $GLOBALS['qr_time_bench'] = array();
@@ -147,9 +147,9 @@  discard block
 block discarded – undo
147 147
                     <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>
148 148
                     <tbody>';
149 149
 
150
-            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
150
+            foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {
151 151
                 if ($p > 0) {
152
-                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';
152
+                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime - $lastTime, 6).'s</td></tr>';
153 153
                 } else {
154 154
                     $startTime = $thisTime;
155 155
                 }
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
             }
160 160
             
161 161
             echo '</tbody><tfoot>
162
-                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>
162
+                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6).'s</td></tr>
163 163
             </tfoot>
164 164
             </table>';
165 165
         }
Please login to merge, or discard this patch.
Braces   +12 added lines, -8 removed lines patch added patch discarded remove patch
@@ -43,8 +43,9 @@  discard block
 block discarded – undo
43 43
         {
44 44
             $barcode_array = array();
45 45
             
46
-            if (!is_array($mode))
47
-                $mode = explode(',', $mode);
46
+            if (!is_array($mode)) {
47
+                            $mode = explode(',', $mode);
48
+            }
48 49
                 
49 50
             $eccLevel = 'L';
50 51
                 
@@ -61,8 +62,9 @@  discard block
 block discarded – undo
61 62
                 
62 63
             foreach ($qrTab as $line) {
63 64
                 $arrAdd = array();
64
-                foreach(str_split($line) as $char)
65
-                    $arrAdd[] = ($char=='1')?1:0;
65
+                foreach(str_split($line) as $char) {
66
+                                    $arrAdd[] = ($char=='1')?1:0;
67
+                }
66 68
                 $barcode_array['bcode'][] = $arrAdd;
67 69
             }
68 70
                     
@@ -90,8 +92,9 @@  discard block
 block discarded – undo
90 92
 				
91 93
 				$width = count($frame);
92 94
 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
93
-				for ($maskNo=0; $maskNo<8; $maskNo++)
94
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
95
+				for ($maskNo=0; $maskNo<8; $maskNo++) {
96
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
97
+				}
95 98
             }
96 99
 			
97 100
 			QRtools::markTime('after_build_cache');
@@ -128,8 +131,9 @@  discard block
 block discarded – undo
128 131
             list($usec, $sec) = explode(" ", microtime());
129 132
             $time = ((float)$usec + (float)$sec);
130 133
             
131
-            if (!isset($GLOBALS['qr_time_bench']))
132
-                $GLOBALS['qr_time_bench'] = array();
134
+            if (!isset($GLOBALS['qr_time_bench'])) {
135
+                            $GLOBALS['qr_time_bench'] = array();
136
+            }
133 137
             
134 138
             $GLOBALS['qr_time_bench'][$markerId] = $time;
135 139
         }
Please login to merge, or discard this patch.
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -78,9 +78,9 @@  discard block
 block discarded – undo
78 78
         //----------------------------------------------------------------------
79 79
         public static function buildCache()
80 80
         {
81
-			QRtools::markTime('before_build_cache');
81
+            QRtools::markTime('before_build_cache');
82 82
 			
83
-			$mask = new QRmask();
83
+            $mask = new QRmask();
84 84
             for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {
85 85
                 $frame = QRspec::newFrame($a);
86 86
                 if (QR_IMAGE) {
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
88 88
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);
89 89
                 }
90 90
 				
91
-				$width = count($frame);
92
-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));
93
-				for ($maskNo=0; $maskNo<8; $maskNo++)
94
-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
91
+                $width = count($frame);
92
+                $bitMask = array_fill(0, $width, array_fill(0, $width, 0));
93
+                for ($maskNo=0; $maskNo<8; $maskNo++)
94
+                    $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
95 95
             }
96 96
 			
97
-			QRtools::markTime('after_build_cache');
97
+            QRtools::markTime('after_build_cache');
98 98
         }
99 99
 
100 100
         //----------------------------------------------------------------------
Please login to merge, or discard this patch.
lib/phpqrcode/qrimage.php 2 patches
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@
 block discarded – undo
39 39
                     ImagePng($image, $filename);
40 40
                     header("Content-type: image/png");
41 41
                     ImagePng($image);
42
-                }else{
42
+                } else{
43 43
                     ImagePng($image, $filename);
44 44
                 }
45 45
             }
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
     class QRimage {
28 28
     
29 29
         //----------------------------------------------------------------------
30
-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=false) 
30
+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = false) 
31 31
         {
32 32
             $image = self::image($frame, $pixelPerPoint, $outerFrame);
33 33
             
@@ -35,11 +35,11 @@  discard block
 block discarded – undo
35 35
                 Header("Content-type: image/png");
36 36
                 ImagePng($image);
37 37
             } else {
38
-                if($saveandprint===true){
38
+                if ($saveandprint === true) {
39 39
                     ImagePng($image, $filename);
40 40
                     header("Content-type: image/png");
41 41
                     ImagePng($image);
42
-                }else{
42
+                } else {
43 43
                     ImagePng($image, $filename);
44 44
                 }
45 45
             }
@@ -68,25 +68,25 @@  discard block
 block discarded – undo
68 68
             $h = count($frame);
69 69
             $w = strlen($frame[0]);
70 70
             
71
-            $imgW = $w + 2*$outerFrame;
72
-            $imgH = $h + 2*$outerFrame;
71
+            $imgW = $w + 2 * $outerFrame;
72
+            $imgH = $h + 2 * $outerFrame;
73 73
             
74
-            $base_image =ImageCreate($imgW, $imgH);
74
+            $base_image = ImageCreate($imgW, $imgH);
75 75
             
76
-            $col[0] = ImageColorAllocate($base_image,255,255,255);
77
-            $col[1] = ImageColorAllocate($base_image,0,0,0);
76
+            $col[0] = ImageColorAllocate($base_image, 255, 255, 255);
77
+            $col[1] = ImageColorAllocate($base_image, 0, 0, 0);
78 78
 
79 79
             imagefill($base_image, 0, 0, $col[0]);
80 80
 
81
-            for($y=0; $y<$h; $y++) {
82
-                for($x=0; $x<$w; $x++) {
81
+            for ($y = 0; $y < $h; $y++) {
82
+                for ($x = 0; $x < $w; $x++) {
83 83
                     if ($frame[$y][$x] == '1') {
84
-                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 
84
+                        ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); 
85 85
                     }
86 86
                 }
87 87
             }
88 88
             
89
-            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);
89
+            $target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);
90 90
             ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);
91 91
             ImageDestroy($base_image);
92 92
             
Please login to merge, or discard this patch.
lib/gettext/gettext.inc 3 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 // LC_MESSAGES is not available if php-gettext is not loaded
36 36
 // while the other constants are already available from session extension.
37 37
 if (!defined('LC_MESSAGES')) {
38
-  define('LC_MESSAGES',	5);
38
+  define('LC_MESSAGES', 5);
39 39
 }
40 40
 
41 41
 require('streams.php');
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
78 78
                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
79 79
                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
80
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
80
+                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
81 81
                    $locale, $matches)) {
82 82
 
83 83
       if (isset($matches["lang"])) $lang = $matches["lang"];
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 /**
114 114
  * Utility function to get a StreamReader for the given text domain.
115 115
  */
116
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
116
+function _get_reader($domain = null, $category = 5, $enable_cache = true) {
117 117
     global $text_domains, $default_domain, $LC_CATEGORIES;
118 118
     if (!isset($domain)) $domain = $default_domain;
119 119
     if (!isset($text_domains[$domain]->l10n)) {
@@ -121,12 +121,12 @@  discard block
 block discarded – undo
121 121
         $locale = _setlocale(LC_MESSAGES, 0);
122 122
         $bound_path = isset($text_domains[$domain]->path) ?
123 123
           $text_domains[$domain]->path : './';
124
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
124
+        $subpath = $LC_CATEGORIES[$category]."/$domain.mo";
125 125
 
126 126
         $locale_names = get_list_of_locales($locale);
127 127
         $input = null;
128 128
         foreach ($locale_names as $locale) {
129
-          $full_path = $bound_path . $locale . "/" . $subpath;
129
+          $full_path = $bound_path.$locale."/".$subpath;
130 130
           if (file_exists($full_path)) {
131 131
             $input = new FileReader($full_path);
132 132
             break;
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 /**
155 155
  * Checks if the current locale is supported on this system.
156 156
  */
157
-function _check_locale_and_function($function=false) {
157
+function _check_locale_and_function($function = false) {
158 158
     global $EMULATEGETTEXT;
159 159
     if ($function and !function_exists($function))
160 160
         return false;
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
164 164
 /**
165 165
  * Get the codeset for the given domain.
166 166
  */
167
-function _get_codeset($domain=null) {
167
+function _get_codeset($domain = null) {
168 168
     global $text_domains, $default_domain, $LC_CATEGORIES;
169 169
     if (!isset($domain)) $domain = $default_domain;
170
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
170
+    return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
171 171
 }
172 172
 
173 173
 /**
@@ -241,10 +241,10 @@  discard block
 block discarded – undo
241 241
     global $text_domains;
242 242
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
243 243
     if (substr(php_uname(), 0, 7) == "Windows") {
244
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
244
+      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
245 245
         $path .= '\\';
246 246
     } else {
247
-      if ($path[strlen($path)-1] != '/')
247
+      if ($path[strlen($path) - 1] != '/')
248 248
         $path .= '/';
249 249
     }
250 250
     if (!array_key_exists($domain, $text_domains)) {
Please login to merge, or discard this patch.
Braces   +149 added lines, -95 removed lines patch added patch discarded remove patch
@@ -80,32 +80,45 @@  discard block
 block discarded – undo
80 80
                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
81 81
                    $locale, $matches)) {
82 82
 
83
-      if (isset($matches["lang"])) $lang = $matches["lang"];
84
-      if (isset($matches["country"])) $country = $matches["country"];
85
-      if (isset($matches["charset"])) $charset = $matches["charset"];
86
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
83
+      if (isset($matches["lang"])) {
84
+          $lang = $matches["lang"];
85
+      }
86
+      if (isset($matches["country"])) {
87
+          $country = $matches["country"];
88
+      }
89
+      if (isset($matches["charset"])) {
90
+          $charset = $matches["charset"];
91
+      }
92
+      if (isset($matches["modifier"])) {
93
+          $modifier = $matches["modifier"];
94
+      }
87 95
 
88 96
       if ($modifier) {
89 97
         if ($country) {
90
-          if ($charset)
91
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
98
+          if ($charset) {
99
+                      array_push($locale_names, "${lang}_$country.$charset@$modifier");
100
+          }
92 101
           array_push($locale_names, "${lang}_$country@$modifier");
93
-        } elseif ($charset)
94
-            array_push($locale_names, "${lang}.$charset@$modifier");
102
+        } elseif ($charset) {
103
+                    array_push($locale_names, "${lang}.$charset@$modifier");
104
+        }
95 105
         array_push($locale_names, "$lang@$modifier");
96 106
       }
97 107
       if ($country) {
98
-        if ($charset)
99
-          array_push($locale_names, "${lang}_$country.$charset");
108
+        if ($charset) {
109
+                  array_push($locale_names, "${lang}_$country.$charset");
110
+        }
100 111
         array_push($locale_names, "${lang}_$country");
101
-      } elseif ($charset)
102
-          array_push($locale_names, "${lang}.$charset");
112
+      } elseif ($charset) {
113
+                array_push($locale_names, "${lang}.$charset");
114
+      }
103 115
       array_push($locale_names, $lang);
104 116
     }
105 117
 
106 118
     // If the locale name doesn't match POSIX style, just include it as-is.
107
-    if (!in_array($locale, $locale_names))
108
-      array_push($locale_names, $locale);
119
+    if (!in_array($locale, $locale_names)) {
120
+          array_push($locale_names, $locale);
121
+    }
109 122
   }
110 123
   return $locale_names;
111 124
 }
@@ -115,7 +128,9 @@  discard block
 block discarded – undo
115 128
  */
116 129
 function _get_reader($domain=null, $category=5, $enable_cache=true) {
117 130
     global $text_domains, $default_domain, $LC_CATEGORIES;
118
-    if (!isset($domain)) $domain = $default_domain;
131
+    if (!isset($domain)) {
132
+        $domain = $default_domain;
133
+    }
119 134
     if (!isset($text_domains[$domain]->l10n)) {
120 135
         // get the current locale
121 136
         $locale = _setlocale(LC_MESSAGES, 0);
@@ -156,8 +171,9 @@  discard block
 block discarded – undo
156 171
  */
157 172
 function _check_locale_and_function($function=false) {
158 173
     global $EMULATEGETTEXT;
159
-    if ($function and !function_exists($function))
160
-        return false;
174
+    if ($function and !function_exists($function)) {
175
+            return false;
176
+    }
161 177
     return !$EMULATEGETTEXT;
162 178
 }
163 179
 
@@ -166,7 +182,9 @@  discard block
 block discarded – undo
166 182
  */
167 183
 function _get_codeset($domain=null) {
168 184
     global $text_domains, $default_domain, $LC_CATEGORIES;
169
-    if (!isset($domain)) $domain = $default_domain;
185
+    if (!isset($domain)) {
186
+        $domain = $default_domain;
187
+    }
170 188
     return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
171 189
 }
172 190
 
@@ -177,8 +195,9 @@  discard block
 block discarded – undo
177 195
   $target_encoding = _get_codeset();
178 196
   if (function_exists("mb_detect_encoding")) {
179 197
     $source_encoding = mb_detect_encoding($text);
180
-    if ($source_encoding != $target_encoding)
181
-      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
198
+    if ($source_encoding != $target_encoding) {
199
+          $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
200
+    }
182 201
   }
183 202
   return $text;
184 203
 }
@@ -190,11 +209,13 @@  discard block
 block discarded – undo
190 209
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
191 210
  */
192 211
 function _get_default_locale($locale) {
193
-  if ($locale == '') // emulate variable support
212
+  if ($locale == '') {
213
+      // emulate variable support
194 214
     return getenv('LANG');
195
-  else
196
-    return $locale;
197
-}
215
+  } else {
216
+      return $locale;
217
+  }
218
+  }
198 219
 
199 220
 /**
200 221
  * Sets a requested locale, if needed emulates it.
@@ -202,12 +223,13 @@  discard block
 block discarded – undo
202 223
 function _setlocale($category, $locale) {
203 224
     global $CURRENTLOCALE, $EMULATEGETTEXT;
204 225
     if ($locale === 0) { // use === to differentiate between string "0"
205
-        if ($CURRENTLOCALE != '')
206
-            return $CURRENTLOCALE;
207
-        else
208
-            // obey LANG variable, maybe extend to support all of LC_* vars
226
+        if ($CURRENTLOCALE != '') {
227
+                    return $CURRENTLOCALE;
228
+        } else {
229
+                    // obey LANG variable, maybe extend to support all of LC_* vars
209 230
             // even if we tried to read locale without setting it first
210 231
             return _setlocale($category, $CURRENTLOCALE);
232
+        }
211 233
     } else {
212 234
         if (function_exists('setlocale')) {
213 235
           $ret = setlocale($category, $locale);
@@ -241,11 +263,13 @@  discard block
 block discarded – undo
241 263
     global $text_domains;
242 264
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
243 265
     if (substr(php_uname(), 0, 7) == "Windows") {
244
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
245
-        $path .= '\\';
266
+      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') {
267
+              $path .= '\\';
268
+      }
246 269
     } else {
247
-      if ($path[strlen($path)-1] != '/')
248
-        $path .= '/';
270
+      if ($path[strlen($path)-1] != '/') {
271
+              $path .= '/';
272
+      }
249 273
     }
250 274
     if (!array_key_exists($domain, $text_domains)) {
251 275
       // Initialize an empty domain object.
@@ -384,96 +408,126 @@  discard block
 block discarded – undo
384 408
 }
385 409
 
386 410
 function T_bindtextdomain($domain, $path) {
387
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
388
-    else return _bindtextdomain($domain, $path);
389
-}
411
+    if (_check_locale_and_function()) {
412
+        return bindtextdomain($domain, $path);
413
+    } else {
414
+        return _bindtextdomain($domain, $path);
415
+    }
416
+    }
390 417
 function T_bind_textdomain_codeset($domain, $codeset) {
391 418
     // bind_textdomain_codeset is available only in PHP 4.2.0+
392
-    if (_check_locale_and_function('bind_textdomain_codeset'))
393
-        return bind_textdomain_codeset($domain, $codeset);
394
-    else return _bind_textdomain_codeset($domain, $codeset);
395
-}
419
+    if (_check_locale_and_function('bind_textdomain_codeset')) {
420
+            return bind_textdomain_codeset($domain, $codeset);
421
+    } else {
422
+        return _bind_textdomain_codeset($domain, $codeset);
423
+    }
424
+    }
396 425
 function T_textdomain($domain) {
397
-    if (_check_locale_and_function()) return textdomain($domain);
398
-    else return _textdomain($domain);
399
-}
426
+    if (_check_locale_and_function()) {
427
+        return textdomain($domain);
428
+    } else {
429
+        return _textdomain($domain);
430
+    }
431
+    }
400 432
 function T_gettext($msgid) {
401
-    if (_check_locale_and_function()) return gettext($msgid);
402
-    else return _gettext($msgid);
403
-}
433
+    if (_check_locale_and_function()) {
434
+        return gettext($msgid);
435
+    } else {
436
+        return _gettext($msgid);
437
+    }
438
+    }
404 439
 function T_($msgid) {
405
-    if (_check_locale_and_function()) return _($msgid);
440
+    if (_check_locale_and_function()) {
441
+        return _($msgid);
442
+    }
406 443
     return __($msgid);
407 444
 }
408 445
 function T_ngettext($singular, $plural, $number) {
409
-    if (_check_locale_and_function())
410
-        return ngettext($singular, $plural, $number);
411
-    else return _ngettext($singular, $plural, $number);
412
-}
446
+    if (_check_locale_and_function()) {
447
+            return ngettext($singular, $plural, $number);
448
+    } else {
449
+        return _ngettext($singular, $plural, $number);
450
+    }
451
+    }
413 452
 function T_dgettext($domain, $msgid) {
414
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
415
-    else return _dgettext($domain, $msgid);
416
-}
453
+    if (_check_locale_and_function()) {
454
+        return dgettext($domain, $msgid);
455
+    } else {
456
+        return _dgettext($domain, $msgid);
457
+    }
458
+    }
417 459
 function T_dngettext($domain, $singular, $plural, $number) {
418
-    if (_check_locale_and_function())
419
-        return dngettext($domain, $singular, $plural, $number);
420
-    else return _dngettext($domain, $singular, $plural, $number);
421
-}
460
+    if (_check_locale_and_function()) {
461
+            return dngettext($domain, $singular, $plural, $number);
462
+    } else {
463
+        return _dngettext($domain, $singular, $plural, $number);
464
+    }
465
+    }
422 466
 function T_dcgettext($domain, $msgid, $category) {
423
-    if (_check_locale_and_function())
424
-        return dcgettext($domain, $msgid, $category);
425
-    else return _dcgettext($domain, $msgid, $category);
426
-}
467
+    if (_check_locale_and_function()) {
468
+            return dcgettext($domain, $msgid, $category);
469
+    } else {
470
+        return _dcgettext($domain, $msgid, $category);
471
+    }
472
+    }
427 473
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
428
-    if (_check_locale_and_function())
429
-      return dcngettext($domain, $singular, $plural, $number, $category);
430
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
431
-}
474
+    if (_check_locale_and_function()) {
475
+          return dcngettext($domain, $singular, $plural, $number, $category);
476
+    } else {
477
+        return _dcngettext($domain, $singular, $plural, $number, $category);
478
+    }
479
+    }
432 480
 
433 481
 function T_pgettext($context, $msgid) {
434
-  if (_check_locale_and_function('pgettext'))
435
-      return pgettext($context, $msgid);
436
-  else
437
-      return _pgettext($context, $msgid);
438
-}
482
+  if (_check_locale_and_function('pgettext')) {
483
+        return pgettext($context, $msgid);
484
+  } else {
485
+        return _pgettext($context, $msgid);
486
+  }
487
+  }
439 488
 
440 489
 function T_dpgettext($domain, $context, $msgid) {
441
-  if (_check_locale_and_function('dpgettext'))
442
-      return dpgettext($domain, $context, $msgid);
443
-  else
444
-      return _dpgettext($domain, $context, $msgid);
445
-}
490
+  if (_check_locale_and_function('dpgettext')) {
491
+        return dpgettext($domain, $context, $msgid);
492
+  } else {
493
+        return _dpgettext($domain, $context, $msgid);
494
+  }
495
+  }
446 496
 
447 497
 function T_dcpgettext($domain, $context, $msgid, $category) {
448
-  if (_check_locale_and_function('dcpgettext'))
449
-      return dcpgettext($domain, $context, $msgid, $category);
450
-  else
451
-      return _dcpgettext($domain, $context, $msgid, $category);
452
-}
498
+  if (_check_locale_and_function('dcpgettext')) {
499
+        return dcpgettext($domain, $context, $msgid, $category);
500
+  } else {
501
+        return _dcpgettext($domain, $context, $msgid, $category);
502
+  }
503
+  }
453 504
 
454 505
 function T_npgettext($context, $singular, $plural, $number) {
455
-    if (_check_locale_and_function('npgettext'))
456
-        return npgettext($context, $singular, $plural, $number);
457
-    else
458
-        return _npgettext($context, $singular, $plural, $number);
459
-}
506
+    if (_check_locale_and_function('npgettext')) {
507
+            return npgettext($context, $singular, $plural, $number);
508
+    } else {
509
+            return _npgettext($context, $singular, $plural, $number);
510
+    }
511
+    }
460 512
 
461 513
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
462
-  if (_check_locale_and_function('dnpgettext'))
463
-      return dnpgettext($domain, $context, $singular, $plural, $number);
464
-  else
465
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
466
-}
514
+  if (_check_locale_and_function('dnpgettext')) {
515
+        return dnpgettext($domain, $context, $singular, $plural, $number);
516
+  } else {
517
+        return _dnpgettext($domain, $context, $singular, $plural, $number);
518
+  }
519
+  }
467 520
 
468 521
 function T_dcnpgettext($domain, $context, $singular, $plural,
469 522
                        $number, $category) {
470
-    if (_check_locale_and_function('dcnpgettext'))
471
-        return dcnpgettext($domain, $context, $singular,
523
+    if (_check_locale_and_function('dcnpgettext')) {
524
+            return dcnpgettext($domain, $context, $singular,
472 525
                            $plural, $number, $category);
473
-    else
474
-        return _dcnpgettext($domain, $context, $singular,
526
+    } else {
527
+            return _dcnpgettext($domain, $context, $singular,
475 528
                             $plural, $number, $category);
476
-}
529
+    }
530
+    }
477 531
 
478 532
 
479 533
 
Please login to merge, or discard this patch.
Indentation   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 // LC_MESSAGES is not available if php-gettext is not loaded
36 36
 // while the other constants are already available from session extension.
37 37
 if (!defined('LC_MESSAGES')) {
38
-  define('LC_MESSAGES',	5);
38
+    define('LC_MESSAGES',	5);
39 39
 }
40 40
 
41 41
 require('streams.php');
@@ -53,9 +53,9 @@  discard block
 block discarded – undo
53 53
 
54 54
 /* Class to hold a single domain included in $text_domains. */
55 55
 class domain {
56
-  var $l10n;
57
-  var $path;
58
-  var $codeset;
56
+    var $l10n;
57
+    var $path;
58
+    var $codeset;
59 59
 }
60 60
 
61 61
 // Utility functions
@@ -64,50 +64,50 @@  discard block
 block discarded – undo
64 64
  * Return a list of locales to try for any POSIX-style locale specification.
65 65
  */
66 66
 function get_list_of_locales($locale) {
67
-  /* Figure out all possible locale names and start with the most
67
+    /* Figure out all possible locale names and start with the most
68 68
    * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
69 69
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
70 70
    */
71
-  $locale_names = array();
72
-  $lang = null;
73
-  $country = null;
74
-  $charset = null;
75
-  $modifier = null;
76
-  if ($locale) {
71
+    $locale_names = array();
72
+    $lang = null;
73
+    $country = null;
74
+    $charset = null;
75
+    $modifier = null;
76
+    if ($locale) {
77 77
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
78
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
79
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
80
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
81
-                   $locale, $matches)) {
78
+                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
79
+                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
80
+                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
81
+                    $locale, $matches)) {
82 82
 
83
-      if (isset($matches["lang"])) $lang = $matches["lang"];
84
-      if (isset($matches["country"])) $country = $matches["country"];
85
-      if (isset($matches["charset"])) $charset = $matches["charset"];
86
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
83
+        if (isset($matches["lang"])) $lang = $matches["lang"];
84
+        if (isset($matches["country"])) $country = $matches["country"];
85
+        if (isset($matches["charset"])) $charset = $matches["charset"];
86
+        if (isset($matches["modifier"])) $modifier = $matches["modifier"];
87 87
 
88
-      if ($modifier) {
88
+        if ($modifier) {
89 89
         if ($country) {
90
-          if ($charset)
90
+            if ($charset)
91 91
             array_push($locale_names, "${lang}_$country.$charset@$modifier");
92
-          array_push($locale_names, "${lang}_$country@$modifier");
92
+            array_push($locale_names, "${lang}_$country@$modifier");
93 93
         } elseif ($charset)
94 94
             array_push($locale_names, "${lang}.$charset@$modifier");
95 95
         array_push($locale_names, "$lang@$modifier");
96
-      }
97
-      if ($country) {
96
+        }
97
+        if ($country) {
98 98
         if ($charset)
99
-          array_push($locale_names, "${lang}_$country.$charset");
99
+            array_push($locale_names, "${lang}_$country.$charset");
100 100
         array_push($locale_names, "${lang}_$country");
101
-      } elseif ($charset)
102
-          array_push($locale_names, "${lang}.$charset");
103
-      array_push($locale_names, $lang);
101
+        } elseif ($charset)
102
+            array_push($locale_names, "${lang}.$charset");
103
+        array_push($locale_names, $lang);
104 104
     }
105 105
 
106 106
     // If the locale name doesn't match POSIX style, just include it as-is.
107 107
     if (!in_array($locale, $locale_names))
108
-      array_push($locale_names, $locale);
109
-  }
110
-  return $locale_names;
108
+        array_push($locale_names, $locale);
109
+    }
110
+    return $locale_names;
111 111
 }
112 112
 
113 113
 /**
@@ -126,19 +126,19 @@  discard block
 block discarded – undo
126 126
         $locale_names = get_list_of_locales($locale);
127 127
         $input = null;
128 128
         foreach ($locale_names as $locale) {
129
-          $full_path = $bound_path . $locale . "/" . $subpath;
130
-          if (file_exists($full_path)) {
129
+            $full_path = $bound_path . $locale . "/" . $subpath;
130
+            if (file_exists($full_path)) {
131 131
             $input = new FileReader($full_path);
132 132
             break;
133
-          }
133
+            }
134 134
         }
135 135
 
136 136
         if (!array_key_exists($domain, $text_domains)) {
137
-          // Initialize an empty domain object.
138
-          $text_domains[$domain] = new domain();
137
+            // Initialize an empty domain object.
138
+            $text_domains[$domain] = new domain();
139 139
         }
140 140
         $text_domains[$domain]->l10n = new gettext_reader($input,
141
-                                                          $enable_cache);
141
+                                                            $enable_cache);
142 142
     }
143 143
     return $text_domains[$domain]->l10n;
144 144
 }
@@ -174,13 +174,13 @@  discard block
 block discarded – undo
174 174
  * Convert the given string to the encoding set by bind_textdomain_codeset.
175 175
  */
176 176
 function _encode($text) {
177
-  $target_encoding = _get_codeset();
178
-  if (function_exists("mb_detect_encoding")) {
177
+    $target_encoding = _get_codeset();
178
+    if (function_exists("mb_detect_encoding")) {
179 179
     $source_encoding = mb_detect_encoding($text);
180 180
     if ($source_encoding != $target_encoding)
181
-      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
182
-  }
183
-  return $text;
181
+        $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
182
+    }
183
+    return $text;
184 184
 }
185 185
 
186 186
 
@@ -190,9 +190,9 @@  discard block
 block discarded – undo
190 190
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
191 191
  */
192 192
 function _get_default_locale($locale) {
193
-  if ($locale == '') // emulate variable support
193
+    if ($locale == '') // emulate variable support
194 194
     return getenv('LANG');
195
-  else
195
+    else
196 196
     return $locale;
197 197
 }
198 198
 
@@ -210,20 +210,20 @@  discard block
 block discarded – undo
210 210
             return _setlocale($category, $CURRENTLOCALE);
211 211
     } else {
212 212
         if (function_exists('setlocale')) {
213
-          $ret = setlocale($category, $locale);
214
-          if (($locale == '' and !$ret) or // failed setting it by env
213
+            $ret = setlocale($category, $locale);
214
+            if (($locale == '' and !$ret) or // failed setting it by env
215 215
               ($locale != '' and $ret != $locale)) { // failed setting it
216 216
             // Failed setting it according to environment.
217 217
             $CURRENTLOCALE = _get_default_locale($locale);
218 218
             $EMULATEGETTEXT = 1;
219
-          } else {
219
+            } else {
220 220
             $CURRENTLOCALE = $ret;
221 221
             $EMULATEGETTEXT = 0;
222
-          }
222
+            }
223 223
         } else {
224
-          // No function setlocale(), emulate it all.
225
-          $CURRENTLOCALE = _get_default_locale($locale);
226
-          $EMULATEGETTEXT = 1;
224
+            // No function setlocale(), emulate it all.
225
+            $CURRENTLOCALE = _get_default_locale($locale);
226
+            $EMULATEGETTEXT = 1;
227 227
         }
228 228
         // Allow locale to be changed on the go for one translation domain.
229 229
         global $text_domains, $default_domain;
@@ -241,15 +241,15 @@  discard block
 block discarded – undo
241 241
     global $text_domains;
242 242
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
243 243
     if (substr(php_uname(), 0, 7) == "Windows") {
244
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
244
+        if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
245 245
         $path .= '\\';
246 246
     } else {
247
-      if ($path[strlen($path)-1] != '/')
247
+        if ($path[strlen($path)-1] != '/')
248 248
         $path .= '/';
249 249
     }
250 250
     if (!array_key_exists($domain, $text_domains)) {
251
-      // Initialize an empty domain object.
252
-      $text_domains[$domain] = new domain();
251
+        // Initialize an empty domain object.
252
+        $text_domains[$domain] = new domain();
253 253
     }
254 254
     $text_domains[$domain]->path = $path;
255 255
 }
@@ -426,29 +426,29 @@  discard block
 block discarded – undo
426 426
 }
427 427
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
428 428
     if (_check_locale_and_function())
429
-      return dcngettext($domain, $singular, $plural, $number, $category);
429
+        return dcngettext($domain, $singular, $plural, $number, $category);
430 430
     else return _dcngettext($domain, $singular, $plural, $number, $category);
431 431
 }
432 432
 
433 433
 function T_pgettext($context, $msgid) {
434
-  if (_check_locale_and_function('pgettext'))
435
-      return pgettext($context, $msgid);
436
-  else
437
-      return _pgettext($context, $msgid);
434
+    if (_check_locale_and_function('pgettext'))
435
+        return pgettext($context, $msgid);
436
+    else
437
+        return _pgettext($context, $msgid);
438 438
 }
439 439
 
440 440
 function T_dpgettext($domain, $context, $msgid) {
441
-  if (_check_locale_and_function('dpgettext'))
442
-      return dpgettext($domain, $context, $msgid);
443
-  else
444
-      return _dpgettext($domain, $context, $msgid);
441
+    if (_check_locale_and_function('dpgettext'))
442
+        return dpgettext($domain, $context, $msgid);
443
+    else
444
+        return _dpgettext($domain, $context, $msgid);
445 445
 }
446 446
 
447 447
 function T_dcpgettext($domain, $context, $msgid, $category) {
448
-  if (_check_locale_and_function('dcpgettext'))
449
-      return dcpgettext($domain, $context, $msgid, $category);
450
-  else
451
-      return _dcpgettext($domain, $context, $msgid, $category);
448
+    if (_check_locale_and_function('dcpgettext'))
449
+        return dcpgettext($domain, $context, $msgid, $category);
450
+    else
451
+        return _dcpgettext($domain, $context, $msgid, $category);
452 452
 }
453 453
 
454 454
 function T_npgettext($context, $singular, $plural, $number) {
@@ -459,17 +459,17 @@  discard block
 block discarded – undo
459 459
 }
460 460
 
461 461
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
462
-  if (_check_locale_and_function('dnpgettext'))
463
-      return dnpgettext($domain, $context, $singular, $plural, $number);
464
-  else
465
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
462
+    if (_check_locale_and_function('dnpgettext'))
463
+        return dnpgettext($domain, $context, $singular, $plural, $number);
464
+    else
465
+        return _dnpgettext($domain, $context, $singular, $plural, $number);
466 466
 }
467 467
 
468 468
 function T_dcnpgettext($domain, $context, $singular, $plural,
469
-                       $number, $category) {
469
+                        $number, $category) {
470 470
     if (_check_locale_and_function('dcnpgettext'))
471 471
         return dcnpgettext($domain, $context, $singular,
472
-                           $plural, $number, $category);
472
+                            $plural, $number, $category);
473 473
     else
474 474
         return _dcnpgettext($domain, $context, $singular,
475 475
                             $plural, $number, $category);
@@ -526,9 +526,9 @@  discard block
 block discarded – undo
526 526
         return _dcpgettext($domain, $context, $msgid, $category);
527 527
     }
528 528
     function dcnpgettext($domain, $context, $singular, $plural,
529
-                         $number, $category) {
530
-      return _dcnpgettext($domain, $context, $singular, $plural,
531
-                          $number, $category);
529
+                            $number, $category) {
530
+        return _dcnpgettext($domain, $context, $singular, $plural,
531
+                            $number, $category);
532 532
     }
533 533
 }
534 534
 
Please login to merge, or discard this patch.