codysnider / tt-rss

lib/phpqrcode/qrencode.php

Switch Indentation +22 added lines, -22 removed lines

@@ -415,28 +415,28 @@
             $enc->margin = $margin;

             

             switch ($level.'') {

-                case '0':

-                case '1':

-                case '2':

-                case '3':

-                        $enc->level = $level;

-                    break;

-                case 'l':

-                case 'L':

-                        $enc->level = QR_ECLEVEL_L;

-                    break;

-                case 'm':

-                case 'M':

-                        $enc->level = QR_ECLEVEL_M;

-                    break;

-                case 'q':

-                case 'Q':

-                        $enc->level = QR_ECLEVEL_Q;

-                    break;

-                case 'h':

-                case 'H':

-                        $enc->level = QR_ECLEVEL_H;

-                    break;

+            case '0':

+            case '1':

+            case '2':

+            case '3':

+                    $enc->level = $level;

+                break;

+            case 'l':

+            case 'L':

+                    $enc->level = QR_ECLEVEL_L;

+                break;

+            case 'm':

+            case 'M':

+                    $enc->level = QR_ECLEVEL_M;

+                break;

+            case 'q':

+            case 'Q':

+                    $enc->level = QR_ECLEVEL_Q;

+                break;

+            case 'h':

+            case 'H':

+                    $enc->level = QR_ECLEVEL_H;

+                break;

             }

             

             return $enc;

Spacing +46 added lines, -46 removed lines

@@ -58,10 +58,10 @@ 
         //----------------------------------------------------------------------

         public function __construct(QRinput $input)

         {

-            $spec = array(0,0,0,0,0);

+            $spec = array(0, 0, 0, 0, 0);

             

             $this->datacode = $input->getByteStream();

-            if(is_null($this->datacode)) {

+            if (is_null($this->datacode)) {

                 throw new Exception('null imput string');

             }

 

@@ -75,7 +75,7 @@ 
             $this->blocks = QRspec::rsBlockNum($spec);

             

             $ret = $this->init($spec);

-            if($ret < 0) {

+            if ($ret < 0) {

                 throw new Exception('block alloc error');

                 return null;

             }

@@ -94,29 +94,29 @@ 
             $blockNo = 0;

             $dataPos = 0;

             $eccPos = 0;

-            for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {

-                $ecc = array_slice($this->ecccode,$eccPos);

-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);

-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

+            for ($i = 0; $i < QRspec::rsBlockNum1($spec); $i++) {

+                $ecc = array_slice($this->ecccode, $eccPos);

+                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);

                 

                 $dataPos += $dl;

                 $eccPos += $el;

                 $blockNo++;

             }

 

-            if(QRspec::rsBlockNum2($spec) == 0)

+            if (QRspec::rsBlockNum2($spec) == 0)

                 return 0;

 

             $dl = QRspec::rsDataCodes2($spec);

             $el = QRspec::rsEccCodes2($spec);

             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

-            if($rs == null) return -1;

+            if ($rs == null) return -1;

             

-            for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

-                $ecc = array_slice($this->ecccode,$eccPos);

+            for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {

+                $ecc = array_slice($this->ecccode, $eccPos);

                 $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);

                 

                 $dataPos += $dl;

                 $eccPos += $el;

@@ -131,14 +131,14 @@ 
         {

             $ret = 0;

 

-            if($this->count < $this->dataLength) {

+            if ($this->count < $this->dataLength) {

                 $row = $this->count % $this->blocks;

                 $col = $this->count / $this->blocks;

-                if($col >= $this->rsblocks[0]->dataLength) {

+                if ($col >= $this->rsblocks[0]->dataLength) {

                     $row += $this->b1;

                 }

                 $ret = $this->rsblocks[$row]->data[$col];

-            } else if($this->count < $this->dataLength + $this->eccLength) {

+            } else if ($this->count < $this->dataLength + $this->eccLength) {

                 $row = ($this->count - $this->dataLength) % $this->blocks;

                 $col = ($this->count - $this->dataLength) / $this->blocks;

                 $ret = $this->rsblocks[$row]->ecc[$col];

@@ -162,10 +162,10 @@ 
         //----------------------------------------------------------------------

         public function encodeMask(QRinput $input, $mask)

         {

-            if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

+            if ($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

                 throw new Exception('wrong version');

             }

-            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

+            if ($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

                 throw new Exception('wrong level');

             }

 

@@ -178,15 +178,15 @@ 
             $frame = QRspec::newFrame($version);

             

             $filler = new FrameFiller($width, $frame);

-            if(is_null($filler)) {

+            if (is_null($filler)) {

                 return null;

             }

 

             // inteleaved data and ecc codes

-            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {

+            for ($i = 0; $i < $raw->dataLength + $raw->eccLength; $i++) {

                 $code = $raw->getCode();

                 $bit = 0x80;

-                for($j=0; $j<8; $j++) {

+                for ($j = 0; $j < 8; $j++) {

                     $addr = $filler->next();

                     $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));

                     $bit = $bit >> 1;

@@ -199,7 +199,7 @@ 
             

             // remainder bits

             $j = QRspec::getRemainder($version);

-            for($i=0; $i<$j; $i++) {

+            for ($i = 0; $i < $j; $i++) {

                 $addr = $filler->next();

                 $filler->setFrameAt($addr, 0x02);

             }

@@ -210,7 +210,7 @@ 
             

             // masking

             $maskObj = new QRmask();

-            if($mask < 0) {

+            if ($mask < 0) {

             

                 if (QR_FIND_BEST_MASK) {

                     $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());

@@ -221,7 +221,7 @@ 
                 $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());

             }

             

-            if($masked == null) {

+            if ($masked == null) {

                 return null;

             }

             

@@ -243,16 +243,16 @@ 
         //----------------------------------------------------------------------

         public function encodeString8bit($string, $version, $level)

         {

-            if(string == null) {

+            if (string == null) {

                 throw new Exception('empty string!');

                 return null;

             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if ($input == null) return null;

 

             $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));

-            if($ret < 0) {

+            if ($ret < 0) {

                 unset($input);

                 return null;

             }

@@ -263,16 +263,16 @@ 
         public function encodeString($string, $version, $level, $hint, $casesensitive)

         {

 

-            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

+            if ($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

                 throw new Exception('bad hint');

                 return null;

             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if ($input == null) return null;

 

             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

-            if($ret < 0) {

+            if ($ret < 0) {

                 return null;

             }

 

@@ -280,10 +280,10 @@ 
         }

         

         //----------------------------------------------------------------------

-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 

+        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint = false) 

         {

             $enc = QRencode::factory($level, $size, $margin);

-            return $enc->encodePNG($text, $outfile, $saveandprint=false);

+            return $enc->encodePNG($text, $outfile, $saveandprint = false);

         }

 

         //----------------------------------------------------------------------

@@ -340,7 +340,7 @@ 
         {

             do {

             

-                if($this->bit == -1) {

+                if ($this->bit == -1) {

                     $this->bit = 0;

                     return array('x'=>$this->x, 'y'=>$this->y);

                 }

@@ -349,7 +349,7 @@ 
                 $y = $this->y;

                 $w = $this->width;

 

-                if($this->bit == 0) {

+                if ($this->bit == 0) {

                     $x--;

                     $this->bit++;

                 } else {

@@ -358,33 +358,33 @@ 
                     $this->bit--;

                 }

 

-                if($this->dir < 0) {

-                    if($y < 0) {

+                if ($this->dir < 0) {

+                    if ($y < 0) {

                         $y = 0;

                         $x -= 2;

                         $this->dir = 1;

-                        if($x == 6) {

+                        if ($x == 6) {

                             $x--;

                             $y = 9;

                         }

                     }

                 } else {

-                    if($y == $w) {

+                    if ($y == $w) {

                         $y = $w - 1;

                         $x -= 2;

                         $this->dir = -1;

-                        if($x == 6) {

+                        if ($x == 6) {

                             $x--;

                             $y -= 8;

                         }

                     }

                 }

-                if($x < 0 || $y < 0) return null;

+                if ($x < 0 || $y < 0) return null;

 

                 $this->x = $x;

                 $this->y = $y;

 

-            } while(ord($this->frame[$y][$x]) & 0x80);

+            } while (ord($this->frame[$y][$x]) & 0x80);

                         

             return array('x'=>$x, 'y'=>$y);

         }

@@ -447,7 +447,7 @@ 
         {

             $code = new QRcode();

 

-            if($this->eightbit) {

+            if ($this->eightbit) {

                 $code->encodeString8bit($intext, $this->version, $this->level);

             } else {

                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

@@ -461,7 +461,7 @@ 
         {

             $code = new QRcode();

 

-            if($this->eightbit) {

+            if ($this->eightbit) {

                 $code->encodeString8bit($intext, $this->version, $this->level);

             } else {

                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

@@ -469,7 +469,7 @@ 
             

             QRtools::markTime('after_encode');

             

-            if ($outfile!== false) {

+            if ($outfile !== false) {

                 file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));

             } else {

                 return QRtools::binarize($code->data);

@@ -477,7 +477,7 @@ 
         }

         

         //----------------------------------------------------------------------

-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 

+        public function encodePNG($intext, $outfile = false, $saveandprint = false) 

         {

             try {

             

@@ -489,9 +489,9 @@ 
                 if ($err != '')

                     QRtools::log($outfile, $err);

                 

-                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

+                $maxSize = (int) (QR_PNG_MAXIMUM_SIZE / (count($tab) + 2 * $this->margin));

                 

-                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);

+                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin, $saveandprint);

             

             } catch (Exception $e) {

             

Braces +18 added lines, -8 removed lines

@@ -104,14 +104,17 @@ 
                 $blockNo++;

             }

 

-            if(QRspec::rsBlockNum2($spec) == 0)

-                return 0;

+            if(QRspec::rsBlockNum2($spec) == 0) {
+                            return 0;
+            }
 

             $dl = QRspec::rsDataCodes2($spec);

             $el = QRspec::rsEccCodes2($spec);

             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

-            if($rs == null) return -1;

+            if($rs == null) {
+                return -1;
+            }
             

             for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

                 $ecc = array_slice($this->ecccode,$eccPos);

@@ -249,7 +252,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if($input == null) {
+                return null;
+            }
 

             $ret = $input->append($input, QR_MODE_8, strlen($string), str_split($string));

             if($ret < 0) {

@@ -269,7 +274,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if($input == null) {
+                return null;
+            }
 

             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

             if($ret < 0) {

@@ -379,7 +386,9 @@ 
                         }

                     }

                 }

-                if($x < 0 || $y < 0) return null;

+                if($x < 0 || $y < 0) {
+                    return null;
+                }
 

                 $this->x = $x;

                 $this->y = $y;

@@ -486,8 +495,9 @@ 
                 $err = ob_get_contents();

                 ob_end_clean();

                 

-                if ($err != '')

-                    QRtools::log($outfile, $err);

+                if ($err != '') {
+                                    QRtools::log($outfile, $err);
+                }
                 

                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

                 

lib/phpqrcode/qrspec.php

Spacing +154 added lines, -154 removed lines

@@ -32,57 +32,57 @@ 
  */

  

     define('QRSPEC_VERSION_MAX', 40);

-    define('QRSPEC_WIDTH_MAX',   177);

+    define('QRSPEC_WIDTH_MAX', 177);

 

-    define('QRCAP_WIDTH',        0);

-    define('QRCAP_WORDS',        1);

-    define('QRCAP_REMINDER',     2);

-    define('QRCAP_EC',           3);

+    define('QRCAP_WIDTH', 0);

+    define('QRCAP_WORDS', 1);

+    define('QRCAP_REMINDER', 2);

+    define('QRCAP_EC', 3);

 

     class QRspec {

     

         public static $capacity = array(

-            array(  0,    0, 0, array(   0,    0,    0,    0)),

-            array( 21,   26, 0, array(   7,   10,   13,   17)), // 1

-            array( 25,   44, 7, array(  10,   16,   22,   28)),

-            array( 29,   70, 7, array(  15,   26,   36,   44)),

-            array( 33,  100, 7, array(  20,   36,   52,   64)),

-            array( 37,  134, 7, array(  26,   48,   72,   88)), // 5

-            array( 41,  172, 7, array(  36,   64,   96,  112)),

-            array( 45,  196, 0, array(  40,   72,  108,  130)),

-            array( 49,  242, 0, array(  48,   88,  132,  156)),

-            array( 53,  292, 0, array(  60,  110,  160,  192)),

-            array( 57,  346, 0, array(  72,  130,  192,  224)), //10

-            array( 61,  404, 0, array(  80,  150,  224,  264)),

-            array( 65,  466, 0, array(  96,  176,  260,  308)),

-            array( 69,  532, 0, array( 104,  198,  288,  352)),

-            array( 73,  581, 3, array( 120,  216,  320,  384)),

-            array( 77,  655, 3, array( 132,  240,  360,  432)), //15

-            array( 81,  733, 3, array( 144,  280,  408,  480)),

-            array( 85,  815, 3, array( 168,  308,  448,  532)),

-            array( 89,  901, 3, array( 180,  338,  504,  588)),

-            array( 93,  991, 3, array( 196,  364,  546,  650)),

-            array( 97, 1085, 3, array( 224,  416,  600,  700)), //20

-            array(101, 1156, 4, array( 224,  442,  644,  750)),

-            array(105, 1258, 4, array( 252,  476,  690,  816)),

-            array(109, 1364, 4, array( 270,  504,  750,  900)),

-            array(113, 1474, 4, array( 300,  560,  810,  960)),

-            array(117, 1588, 4, array( 312,  588,  870, 1050)), //25

-            array(121, 1706, 4, array( 336,  644,  952, 1110)),

-            array(125, 1828, 4, array( 360,  700, 1020, 1200)),

-            array(129, 1921, 3, array( 390,  728, 1050, 1260)),

-            array(133, 2051, 3, array( 420,  784, 1140, 1350)),

-            array(137, 2185, 3, array( 450,  812, 1200, 1440)), //30

-            array(141, 2323, 3, array( 480,  868, 1290, 1530)),

-            array(145, 2465, 3, array( 510,  924, 1350, 1620)),

-            array(149, 2611, 3, array( 540,  980, 1440, 1710)),

-            array(153, 2761, 3, array( 570, 1036, 1530, 1800)),

-            array(157, 2876, 0, array( 570, 1064, 1590, 1890)), //35

-            array(161, 3034, 0, array( 600, 1120, 1680, 1980)),

-            array(165, 3196, 0, array( 630, 1204, 1770, 2100)),

-            array(169, 3362, 0, array( 660, 1260, 1860, 2220)),

-            array(173, 3532, 0, array( 720, 1316, 1950, 2310)),

-            array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40

+            array(0, 0, 0, array(0, 0, 0, 0)),

+            array(21, 26, 0, array(7, 10, 13, 17)), // 1

+            array(25, 44, 7, array(10, 16, 22, 28)),

+            array(29, 70, 7, array(15, 26, 36, 44)),

+            array(33, 100, 7, array(20, 36, 52, 64)),

+            array(37, 134, 7, array(26, 48, 72, 88)), // 5

+            array(41, 172, 7, array(36, 64, 96, 112)),

+            array(45, 196, 0, array(40, 72, 108, 130)),

+            array(49, 242, 0, array(48, 88, 132, 156)),

+            array(53, 292, 0, array(60, 110, 160, 192)),

+            array(57, 346, 0, array(72, 130, 192, 224)), //10

+            array(61, 404, 0, array(80, 150, 224, 264)),

+            array(65, 466, 0, array(96, 176, 260, 308)),

+            array(69, 532, 0, array(104, 198, 288, 352)),

+            array(73, 581, 3, array(120, 216, 320, 384)),

+            array(77, 655, 3, array(132, 240, 360, 432)), //15

+            array(81, 733, 3, array(144, 280, 408, 480)),

+            array(85, 815, 3, array(168, 308, 448, 532)),

+            array(89, 901, 3, array(180, 338, 504, 588)),

+            array(93, 991, 3, array(196, 364, 546, 650)),

+            array(97, 1085, 3, array(224, 416, 600, 700)), //20

+            array(101, 1156, 4, array(224, 442, 644, 750)),

+            array(105, 1258, 4, array(252, 476, 690, 816)),

+            array(109, 1364, 4, array(270, 504, 750, 900)),

+            array(113, 1474, 4, array(300, 560, 810, 960)),

+            array(117, 1588, 4, array(312, 588, 870, 1050)), //25

+            array(121, 1706, 4, array(336, 644, 952, 1110)),

+            array(125, 1828, 4, array(360, 700, 1020, 1200)),

+            array(129, 1921, 3, array(390, 728, 1050, 1260)),

+            array(133, 2051, 3, array(420, 784, 1140, 1350)),

+            array(137, 2185, 3, array(450, 812, 1200, 1440)), //30

+            array(141, 2323, 3, array(480, 868, 1290, 1530)),

+            array(145, 2465, 3, array(510, 924, 1350, 1620)),

+            array(149, 2611, 3, array(540, 980, 1440, 1710)),

+            array(153, 2761, 3, array(570, 1036, 1530, 1800)),

+            array(157, 2876, 0, array(570, 1064, 1590, 1890)), //35

+            array(161, 3034, 0, array(600, 1120, 1680, 1980)),

+            array(165, 3196, 0, array(630, 1204, 1770, 2100)),

+            array(169, 3362, 0, array(660, 1260, 1860, 2220)),

+            array(173, 3532, 0, array(720, 1316, 1950, 2310)),

+            array(177, 3706, 0, array(750, 1372, 2040, 2430)) //40

         );

         

         //----------------------------------------------------------------------

@@ -113,9 +113,9 @@ 
         public static function getMinimumVersion($size, $level)

         {

 

-            for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {

-                $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if($words >= $size) 

+            for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {

+                $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

+                if ($words >= $size) 

                     return $i;

             }

 

@@ -126,9 +126,9 @@ 
         

         public static $lengthTableBits = array(

             array(10, 12, 14),

-            array( 9, 11, 13),

-            array( 8, 16, 16),

-            array( 8, 10, 12)

+            array(9, 11, 13),

+            array(8, 16, 16),

+            array(8, 10, 12)

         );

         

         //----------------------------------------------------------------------

@@ -151,12 +151,12 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

+            if ($mode == QR_MODE_STRUCTURE) 

                 return 3;

                 

-            if($version <= 9) {

+            if ($version <= 9) {

                 $l = 0;

-            } else if($version <= 26) {

+            } else if ($version <= 26) {

                 $l = 1;

             } else {

                 $l = 2;

@@ -165,7 +165,7 @@ 
             $bits = self::$lengthTableBits[$mode][$l];

             $words = (1 << $bits) - 1;

             

-            if($mode == QR_MODE_KANJI) {

+            if ($mode == QR_MODE_KANJI) {

                 $words *= 2; // the number of bytes is required

             }

 

@@ -177,47 +177,47 @@ 
         // See Table 12-16 (pp.30-36), JIS X0510:2004.

 

         public static $eccTable = array(

-            array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)),

-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), // 1

-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)),

-            array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)),

-            array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)),

-            array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), // 5

-            array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)),

-            array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)),

-            array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)),

-            array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)),

-            array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), //10

-            array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)),

-            array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)),

-            array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)),

-            array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)),

-            array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), //15

-            array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)),

-            array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)),

-            array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)),

-            array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)),

-            array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), //20

-            array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)),

-            array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)),

-            array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)),

-            array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)),

-            array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), //25

-            array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)),

-            array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)),

-            array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)),

-            array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)),

-            array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), //30

-            array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)),

-            array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)),

-            array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)),

-            array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)),

-            array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), //35

-            array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)),

-            array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)),

-            array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)),

-            array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)),

-            array(array(19,  6), array(18, 31), array(34, 34), array(20, 61)),//40

+            array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)),

+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), // 1

+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)),

+            array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)),

+            array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)),

+            array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), // 5

+            array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)),

+            array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)),

+            array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)),

+            array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)),

+            array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), //10

+            array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)),

+            array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)),

+            array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)),

+            array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)),

+            array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), //15

+            array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)),

+            array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)),

+            array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)),

+            array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)),

+            array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), //20

+            array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)),

+            array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)),

+            array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)),

+            array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)),

+            array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), //25

+            array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)),

+            array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)),

+            array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)),

+            array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)),

+            array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), //30

+            array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)),

+            array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)),

+            array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)),

+            array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)),

+            array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), //35

+            array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)),

+            array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)),

+            array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)),

+            array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)),

+            array(array(19, 6), array(18, 31), array(34, 34), array(20, 61)), //40

         );                                                                       

 

         //----------------------------------------------------------------------

@@ -226,7 +226,7 @@ 
         public static function getEccSpec($version, $level, array &$spec)

         {

             if (count($spec) < 5) {

-                $spec = array(0,0,0,0,0);

+                $spec = array(0, 0, 0, 0, 0);

             }

 

             $b1   = self::$eccTable[$version][$level][0];

@@ -234,16 +234,16 @@ 
             $data = self::getDataLength($version, $level);

             $ecc  = self::getECCLength($version, $level);

 

-            if($b2 == 0) {

+            if ($b2 == 0) {

                 $spec[0] = $b1;

-                $spec[1] = (int)($data / $b1);

-                $spec[2] = (int)($ecc / $b1);

+                $spec[1] = (int) ($data / $b1);

+                $spec[2] = (int) ($ecc / $b1);

                 $spec[3] = 0; 

                 $spec[4] = 0;

             } else {

                 $spec[0] = $b1;

-                $spec[1] = (int)($data / ($b1 + $b2));

-                $spec[2] = (int)($ecc  / ($b1 + $b2));

+                $spec[1] = (int) ($data / ($b1 + $b2));

+                $spec[2] = (int) ($ecc / ($b1 + $b2));

                 $spec[3] = $b2;

                 $spec[4] = $spec[1] + 1;

             }

@@ -259,9 +259,9 @@ 
         // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.

          

         public static $alignmentPattern = array(      

-            array( 0,  0),

-            array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), // 1- 5

-            array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10

+            array(0, 0),

+            array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), // 1- 5

+            array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10

             array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), //11-15

             array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), //16-20

             array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), //21-25

@@ -287,28 +287,28 @@ 
                 "\xa1\xa1\xa1\xa1\xa1"

             );                        

             

-            $yStart = $oy-2;         

-            $xStart = $ox-2;

+            $yStart = $oy - 2;         

+            $xStart = $ox - 2;

             

-            for($y=0; $y<5; $y++) {

-                QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);

+            for ($y = 0; $y < 5; $y++) {

+                QRstr::set($frame, $xStart, $yStart + $y, $finder[$y]);

             }

         }

 

         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if($version < 2)

+            if ($version < 2)

                 return;

 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

-            if($d < 0) {

+            if ($d < 0) {

                 $w = 2;

             } else {

-                $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2);

+                $w = (int) (($width - self::$alignmentPattern[$version][0]) / $d + 2);

             }

 

-            if($w * $w - 3 == 1) {

+            if ($w * $w - 3 == 1) {

                 $x = self::$alignmentPattern[$version][0];

                 $y = self::$alignmentPattern[$version][0];

                 self::putAlignmentMarker($frame, $x, $y);

@@ -316,16 +316,16 @@ 
             }

 

             $cx = self::$alignmentPattern[$version][0];

-            for($x=1; $x<$w - 1; $x++) {

+            for ($x = 1; $x < $w - 1; $x++) {

                 self::putAlignmentMarker($frame, 6, $cx);

-                self::putAlignmentMarker($frame, $cx,  6);

+                self::putAlignmentMarker($frame, $cx, 6);

                 $cx += $d;

             }

 

             $cy = self::$alignmentPattern[$version][0];

-            for($y=0; $y<$w-1; $y++) {

+            for ($y = 0; $y < $w - 1; $y++) {

                 $cx = self::$alignmentPattern[$version][0];

-                for($x=0; $x<$w-1; $x++) {

+                for ($x = 0; $x < $w - 1; $x++) {

                     self::putAlignmentMarker($frame, $cx, $cy);

                     $cx += $d;

                 }

@@ -351,10 +351,10 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if($version < 7 || $version > QRSPEC_VERSION_MAX)

+            if ($version < 7 || $version > QRSPEC_VERSION_MAX)

                 return 0;

 

-            return self::$versionPattern[$version -7];

+            return self::$versionPattern[$version - 7];

         }

 

         // Format information --------------------------------------------------

@@ -369,10 +369,10 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if($mask < 0 || $mask > 7)

+            if ($mask < 0 || $mask > 7)

                 return 0;

                 

-            if($level < 0 || $level > 3)

+            if ($level < 0 || $level > 3)

                 return 0;                

 

             return self::$formatInfo[$level][$mask];

@@ -401,8 +401,8 @@ 
                 "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"

             );                            

             

-            for($y=0; $y<7; $y++) {

-                QRstr::set($frame, $ox, $oy+$y, $finder[$y]);

+            for ($y = 0; $y < 7; $y++) {

+                QRstr::set($frame, $ox, $oy + $y, $finder[$y]);

             }

         }

 

@@ -410,7 +410,7 @@ 
         public static function createFrame($version)

         {

             $width = self::$capacity[$version][QRCAP_WIDTH];

-            $frameLine = str_repeat ("\0", $width);

+            $frameLine = str_repeat("\0", $width);

             $frame = array_fill(0, $width, $frameLine);

 

             // Finder pattern

@@ -421,7 +421,7 @@ 
             // Separator

             $yOffset = $width - 7;

             

-            for($y=0; $y<7; $y++) {

+            for ($y = 0; $y < 7; $y++) {

                 $frame[$y][7] = "\xc0";

                 $frame[$y][$width - 8] = "\xc0";

                 $frame[$yOffset][7] = "\xc0";

@@ -431,7 +431,7 @@ 
             $setPattern = str_repeat("\xc0", 8);

             

             QRstr::set($frame, 0, 7, $setPattern);

-            QRstr::set($frame, $width-8, 7, $setPattern);

+            QRstr::set($frame, $width - 8, 7, $setPattern);

             QRstr::set($frame, 0, $width - 8, $setPattern);

         

             // Format info

@@ -441,38 +441,38 @@ 
             

             $yOffset = $width - 8;

 

-            for($y=0; $y<8; $y++,$yOffset++) {

+            for ($y = 0; $y < 8; $y++, $yOffset++) {

                 $frame[$y][8] = "\x84";

                 $frame[$yOffset][8] = "\x84";

             }

 

             // Timing pattern  

             

-            for($i=1; $i<$width-15; $i++) {

-                $frame[6][7+$i] = chr(0x90 | ($i & 1));

-                $frame[7+$i][6] = chr(0x90 | ($i & 1));

+            for ($i = 1; $i < $width - 15; $i++) {

+                $frame[6][7 + $i] = chr(0x90 | ($i & 1));

+                $frame[7 + $i][6] = chr(0x90 | ($i & 1));

             }

             

             // Alignment pattern  

             self::putAlignmentPattern($version, $frame, $width);

             

             // Version information 

-            if($version >= 7) {

+            if ($version >= 7) {

                 $vinf = self::getVersionPattern($version);

 

                 $v = $vinf;

                 

-                for($x=0; $x<6; $x++) {

-                    for($y=0; $y<3; $y++) {

-                        $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));

+                for ($x = 0; $x < 6; $x++) {

+                    for ($y = 0; $y < 3; $y++) {

+                        $frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));

                         $v = $v >> 1;

                     }

                 }

 

                 $v = $vinf;

-                for($y=0; $y<6; $y++) {

-                    for($x=0; $x<3; $x++) {

-                        $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));

+                for ($y = 0; $y < 6; $y++) {

+                    for ($x = 0; $x < 3; $x++) {

+                        $frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));

                         $v = $v >> 1;

                     }

                 }

@@ -506,16 +506,16 @@ 
             } else {

             

                 foreach ($frame as &$frameLine) {

-                    $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));

+                    $frameLine = join('<span class="m">&nbsp;</span>', explode("\xc0", $frameLine));

                     $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));

-                    $frameLine = join('<span class="p">&nbsp;</span>',  explode("\xa0", $frameLine));

+                    $frameLine = join('<span class="p">&nbsp;</span>', explode("\xa0", $frameLine));

                     $frameLine = join('<span class="p">&#9618;</span>', explode("\xa1", $frameLine));

                     $frameLine = join('<span class="s">&#9671;</span>', explode("\x84", $frameLine)); //format 0

                     $frameLine = join('<span class="s">&#9670;</span>', explode("\x85", $frameLine)); //format 1

                     $frameLine = join('<span class="x">&#9762;</span>', explode("\x81", $frameLine)); //special bit

-                    $frameLine = join('<span class="c">&nbsp;</span>',  explode("\x90", $frameLine)); //clock 0

+                    $frameLine = join('<span class="c">&nbsp;</span>', explode("\x90", $frameLine)); //clock 0

                     $frameLine = join('<span class="c">&#9719;</span>', explode("\x91", $frameLine)); //clock 1

-                    $frameLine = join('<span class="f">&nbsp;</span>',  explode("\x88", $frameLine)); //version

+                    $frameLine = join('<span class="f">&nbsp;</span>', explode("\x88", $frameLine)); //version

                     $frameLine = join('<span class="f">&#9618;</span>', explode("\x89", $frameLine)); //version

                     $frameLine = join('&#9830;', explode("\x01", $frameLine));

                     $frameLine = join('&#8901;', explode("\0", $frameLine));

@@ -553,10 +553,10 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 

+            if ($version < 1 || $version > QRSPEC_VERSION_MAX) 

                 return null;

 

-            if(!isset(self::$frames[$version])) {

+            if (!isset(self::$frames[$version])) {

                 

                 $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';

                 

@@ -572,21 +572,21 @@ 
                 }

             }

             

-            if(is_null(self::$frames[$version]))

+            if (is_null(self::$frames[$version]))

                 return null;

 

             return self::$frames[$version];

         }

 

         //----------------------------------------------------------------------

-        public static function rsBlockNum($spec)     { return $spec[0] + $spec[3]; }

-        public static function rsBlockNum1($spec)    { return $spec[0]; }

-        public static function rsDataCodes1($spec)   { return $spec[1]; }

-        public static function rsEccCodes1($spec)    { return $spec[2]; }

-        public static function rsBlockNum2($spec)    { return $spec[3]; }

-        public static function rsDataCodes2($spec)   { return $spec[4]; }

-        public static function rsEccCodes2($spec)    { return $spec[2]; }

-        public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }

-        public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }

+        public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; }

+        public static function rsBlockNum1($spec) { return $spec[0]; }

+        public static function rsDataCodes1($spec) { return $spec[1]; }

+        public static function rsEccCodes1($spec) { return $spec[2]; }

+        public static function rsBlockNum2($spec) { return $spec[3]; }

+        public static function rsDataCodes2($spec) { return $spec[4]; }

+        public static function rsEccCodes2($spec) { return $spec[2]; }

+        public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); }

+        public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; }

         

     }
\ No newline at end of file

Braces +27 added lines, -18 removed lines

@@ -115,8 +115,9 @@ 
 

             for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {

                 $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if($words >= $size) 

-                    return $i;

+                if($words >= $size) {
+                                    return $i;
+                }
             }

 

             return -1;

@@ -134,8 +135,9 @@ 
         //----------------------------------------------------------------------

         public static function lengthIndicator($mode, $version)

         {

-            if ($mode == QR_MODE_STRUCTURE)

-                return 0;

+            if ($mode == QR_MODE_STRUCTURE) {
+                            return 0;
+            }
                 

             if ($version <= 9) {

                 $l = 0;

@@ -151,8 +153,9 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

-                return 3;

+            if($mode == QR_MODE_STRUCTURE) {
+                            return 3;
+            }
                 

             if($version <= 9) {

                 $l = 0;

@@ -298,8 +301,9 @@ 
         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if($version < 2)

-                return;

+            if($version < 2) {
+                            return;
+            }
 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

             if($d < 0) {

@@ -351,8 +355,9 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if($version < 7 || $version > QRSPEC_VERSION_MAX)

-                return 0;

+            if($version < 7 || $version > QRSPEC_VERSION_MAX) {
+                            return 0;
+            }
 

             return self::$versionPattern[$version -7];

         }

@@ -369,11 +374,13 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if($mask < 0 || $mask > 7)

-                return 0;

+            if($mask < 0 || $mask > 7) {
+                            return 0;
+            }
                 

-            if($level < 0 || $level > 3)

-                return 0;                

+            if($level < 0 || $level > 3) {
+                            return 0;
+            }
 

             return self::$formatInfo[$level][$mask];

         }

@@ -553,8 +560,9 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 

-                return null;

+            if($version < 1 || $version > QRSPEC_VERSION_MAX) {
+                            return null;
+            }
 

             if(!isset(self::$frames[$version])) {

                 

@@ -572,8 +580,9 @@ 
                 }

             }

             

-            if(is_null(self::$frames[$version]))

-                return null;

+            if(is_null(self::$frames[$version])) {
+                            return null;
+            }
 

             return self::$frames[$version];

         }

Indentation +2 added lines, -2 removed lines

@@ -335,10 +335,10 @@
 

         // Version information pattern -----------------------------------------

 

-		// Version information pattern (BCH coded).

+        // Version information pattern (BCH coded).

         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.

         

-		// size: [QRSPEC_VERSION_MAX - 6]

+        // size: [QRSPEC_VERSION_MAX - 6]

 		

         public static $versionPattern = array(

             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,

lib/phpqrcode/phpqrcode.php

Switch Indentation +88 added lines, -88 removed lines

@@ -1214,13 +1214,13 @@ 
                 $version = 1;

 

             switch($this->mode) {

-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

-                case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

-                default:

-                    return 0;

+            case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

+            case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

+            case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

+            case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+            case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

+            default:

+                return 0;

             }

 

             $l = QRspec::lengthIndicator($this->mode, $version);

@@ -1260,14 +1260,14 @@ 
                     $ret = 0;

                     

                     switch($this->mode) {

-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+                    case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

+                    case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

+                    case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

+                    case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

+                    case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

                         

-                        default:

-                            break;

+                    default:

+                        break;

                     }

                     

                     if($ret < 0)

@@ -1417,14 +1417,14 @@ 
             $bits = $w * 10;

             

             switch($size - $w * 3) {

-                case 1:

-                    $bits += 4;

-                    break;

-                case 2:

-                    $bits += 7;

-                    break;

-                default:

-                    break;

+            case 1:

+                $bits += 4;

+                break;

+            case 2:

+                $bits += 7;

+                break;

+            default:

+                break;

             }

 

             return $bits;

@@ -1513,14 +1513,14 @@ 
                 return false;

 

             switch($mode) {

-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

-                case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

-                case QR_MODE_8:         return true; break;

-                case QR_MODE_STRUCTURE: return true; break;

+            case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

+            case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+            case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

+            case QR_MODE_8:         return true; break;

+            case QR_MODE_STRUCTURE: return true; break;

                 

-                default:

-                    break;

+            default:

+                break;

             }

 

             return false;

@@ -1561,35 +1561,35 @@ 
         {

             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

             switch($mode) {

-                case QR_MODE_NUM:

-                    $chunks = (int)($payload / 10);

-                    $remain = $payload - $chunks * 10;

-                    $size = $chunks * 3;

-                    if($remain >= 7) {

-                        $size += 2;

-                    } else if($remain >= 4) {

-                        $size += 1;

-                    }

-                    break;

-                case QR_MODE_AN:

-                    $chunks = (int)($payload / 11);

-                    $remain = $payload - $chunks * 11;

-                    $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

-                    break;

-                case QR_MODE_8:

-                    $size = (int)($payload / 8);

-                    break;

-                case QR_MODE_KANJI:

-                    $size = (int)(($payload / 13) * 2);

-                    break;

-                case QR_MODE_STRUCTURE:

-                    $size = (int)($payload / 8);

-                    break;

-                default:

-                    $size = 0;

-                    break;

+            case QR_MODE_NUM:

+                $chunks = (int)($payload / 10);

+                $remain = $payload - $chunks * 10;

+                $size = $chunks * 3;

+                if($remain >= 7) {

+                    $size += 2;

+                } else if($remain >= 4) {

+                    $size += 1;

+                }

+                break;

+            case QR_MODE_AN:

+                $chunks = (int)($payload / 11);

+                $remain = $payload - $chunks * 11;

+                $size = $chunks * 2;

+                if($remain >= 6) 

+                    $size++;

+                break;

+            case QR_MODE_8:

+                $size = (int)($payload / 8);

+                break;

+            case QR_MODE_KANJI:

+                $size = (int)(($payload / 13) * 2);

+                break;

+            case QR_MODE_STRUCTURE:

+                $size = (int)($payload / 8);

+                break;

+            default:

+                $size = 0;

+                break;

             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

@@ -2192,14 +2192,14 @@ 
                 $mode = $this->identifyMode(0);

                 

                 switch ($mode) {

-                    case QR_MODE_NUM: $length = $this->eatNum(); break;

-                    case QR_MODE_AN:  $length = $this->eatAn(); break;

-                    case QR_MODE_KANJI:

-                        if ($this->modeHint == QR_MODE_KANJI)

-                                $length = $this->eatKanji();

-                        else    $length = $this->eat8();

-                        break;

-                    default: $length = $this->eat8(); break;

+                case QR_MODE_NUM: $length = $this->eatNum(); break;

+                case QR_MODE_AN:  $length = $this->eatAn(); break;

+                case QR_MODE_KANJI:

+                    if ($this->modeHint == QR_MODE_KANJI)

+                            $length = $this->eatKanji();

+                    else    $length = $this->eat8();

+                    break;

+                default: $length = $this->eat8(); break;

                 

                 }

 

@@ -3223,28 +3223,28 @@ 
             $enc->margin = $margin;

             

             switch ($level.'') {

-                case '0':

-                case '1':

-                case '2':

-                case '3':

-                        $enc->level = $level;

-                    break;

-                case 'l':

-                case 'L':

-                        $enc->level = QR_ECLEVEL_L;

-                    break;

-                case 'm':

-                case 'M':

-                        $enc->level = QR_ECLEVEL_M;

-                    break;

-                case 'q':

-                case 'Q':

-                        $enc->level = QR_ECLEVEL_Q;

-                    break;

-                case 'h':

-                case 'H':

-                        $enc->level = QR_ECLEVEL_H;

-                    break;

+            case '0':

+            case '1':

+            case '2':

+            case '3':

+                    $enc->level = $level;

+                break;

+            case 'l':

+            case 'L':

+                    $enc->level = QR_ECLEVEL_L;

+                break;

+            case 'm':

+            case 'M':

+                    $enc->level = QR_ECLEVEL_M;

+                break;

+            case 'q':

+            case 'Q':

+                    $enc->level = QR_ECLEVEL_Q;

+                break;

+            case 'h':

+            case 'H':

+                    $enc->level = QR_ECLEVEL_H;

+                break;

             }

             

             return $enc;

Indentation +40 added lines, -40 removed lines

@@ -74,32 +74,32 @@ 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	// Encoding modes

+    // Encoding modes

 	 

-	define('QR_MODE_NUL', -1);

-	define('QR_MODE_NUM', 0);

-	define('QR_MODE_AN', 1);

-	define('QR_MODE_8', 2);

-	define('QR_MODE_KANJI', 3);

-	define('QR_MODE_STRUCTURE', 4);

-

-	// Levels of error correction.

-

-	define('QR_ECLEVEL_L', 0);

-	define('QR_ECLEVEL_M', 1);

-	define('QR_ECLEVEL_Q', 2);

-	define('QR_ECLEVEL_H', 3);

+    define('QR_MODE_NUL', -1);

+    define('QR_MODE_NUM', 0);

+    define('QR_MODE_AN', 1);

+    define('QR_MODE_8', 2);

+    define('QR_MODE_KANJI', 3);

+    define('QR_MODE_STRUCTURE', 4);

+

+    // Levels of error correction.

+

+    define('QR_ECLEVEL_L', 0);

+    define('QR_ECLEVEL_M', 1);

+    define('QR_ECLEVEL_Q', 2);

+    define('QR_ECLEVEL_H', 3);

 	

-	// Supported output formats

+    // Supported output formats

 	

-	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+    define('QR_FORMAT_TEXT', 0);

+    define('QR_FORMAT_PNG',  1);

 	

-	class qrstr {

-		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

-		}

-	}	
+    class qrstr {

+        public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

+            $srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

+        }

+    }	
 
 
 
@@ -211,9 +211,9 @@ 
         //----------------------------------------------------------------------

         public static function buildCache()

         {

-			QRtools::markTime('before_build_cache');

+            QRtools::markTime('before_build_cache');

 			

-			$mask = new QRmask();

+            $mask = new QRmask();

             for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

@@ -221,13 +221,13 @@ 
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);

                 }

 				

-				$width = count($frame);

-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+                $width = count($frame);

+                $bitMask = array_fill(0, $width, array_fill(0, $width, 0));

+                for ($maskNo=0; $maskNo<8; $maskNo++)

+                    $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

             }

 			

-			QRtools::markTime('after_build_cache');

+            QRtools::markTime('after_build_cache');

         }

 

         //----------------------------------------------------------------------

@@ -647,10 +647,10 @@ 
 

         // Version information pattern -----------------------------------------

 

-		// Version information pattern (BCH coded).

+        // Version information pattern (BCH coded).

         // See Table 1 in Appendix D (pp.68) of JIS X0510:2004.

         

-		// size: [QRSPEC_VERSION_MAX - 6]

+        // size: [QRSPEC_VERSION_MAX - 6]

 		

         public static $versionPattern = array(

             0x07c94, 0x085bc, 0x09a99, 0x0a4d3, 0x0bbf6, 0x0c762, 0x0d847, 0x0e60d,

@@ -1435,7 +1435,7 @@ 
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

+                0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

@@ -2497,17 +2497,17 @@ 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	define('N1', 3);

-	define('N2', 3);

-	define('N3', 40);

-	define('N4', 10);

+    define('N1', 3);

+    define('N2', 3);

+    define('N3', 40);

+    define('N4', 10);

 

-	class QRmask {

+    class QRmask {

 	

-		public $runLength = array();

+        public $runLength = array();

 		

-		//----------------------------------------------------------------------

-		public function __construct() 

+        //----------------------------------------------------------------------

+        public function __construct() 

         {

             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);

         }

Spacing +502 added lines, -502 removed lines

@@ -93,11 +93,11 @@ 
 	// Supported output formats

 	

 	define('QR_FORMAT_TEXT', 0);

-	define('QR_FORMAT_PNG',  1);

+	define('QR_FORMAT_PNG', 1);

 	

 	class qrstr {

 		public static function set(&$srctab, $x, $y, $repl, $replLen = false) {

-			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false)?substr($repl,0,$replLen):$repl, $x, ($replLen !== false)?$replLen:strlen($repl));

+			$srctab[$y] = substr_replace($srctab[$y], ($replLen !== false) ?substr($repl, 0, $replLen) : $repl, $x, ($replLen !== false) ? $replLen : strlen($repl));

 		}

 	}	
 
@@ -114,15 +114,15 @@ 
  * Config file, tuned-up for merged verion

  */

      

-    define('QR_CACHEABLE', false);       // use cache - more disk reads but less CPU power, masks and format templates are stored there

-    define('QR_CACHE_DIR', false);       // used when QR_CACHEABLE === true

-    define('QR_LOG_DIR', false);         // default error logs dir   

+    define('QR_CACHEABLE', false); // use cache - more disk reads but less CPU power, masks and format templates are stored there

+    define('QR_CACHE_DIR', false); // used when QR_CACHEABLE === true

+    define('QR_LOG_DIR', false); // default error logs dir   

     

-    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

-    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

-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

+    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

+    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

+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false

                                                   

-    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

+    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

                                                   
 
 
@@ -163,8 +163,8 @@ 
             $len = count($frame);

             foreach ($frame as &$frameLine) {

                 

-                for($i=0; $i<$len; $i++) {

-                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';

+                for ($i = 0; $i < $len; $i++) {

+                    $frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';

                 }

             }

             

@@ -194,8 +194,8 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach (str_split($line) as $char)

+                    $arrAdd[] = ($char == '1') ? 1 : 0;

                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -214,7 +214,7 @@ 
 			QRtools::markTime('before_build_cache');

 			

 			$mask = new QRmask();

-            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {

+            for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

                     $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';

@@ -223,7 +223,7 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

+				for ($maskNo = 0; $maskNo < 8; $maskNo++)

 					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

             }

 			

@@ -248,8 +248,8 @@ 
         public static function dumpMask($frame) 

         {

             $width = count($frame);

-            for($y=0;$y<$width;$y++) {

-                for($x=0;$x<$width;$x++) {

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

                     echo ord($frame[$y][$x]).',';

                 }

             }

@@ -259,7 +259,7 @@ 
         public static function markTime($markerId)

         {

             list($usec, $sec) = explode(" ", microtime());

-            $time = ((float)$usec + (float)$sec);

+            $time = ((float) $usec + (float) $sec);

             

             if (!isset($GLOBALS['qr_time_bench']))

                 $GLOBALS['qr_time_bench'] = array();

@@ -280,9 +280,9 @@ 
                     <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>

                     <tbody>';

 

-            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

+            foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

                 if ($p > 0) {

-                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';

+                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime - $lastTime, 6).'s</td></tr>';

                 } else {

                     $startTime = $thisTime;

                 }

@@ -292,7 +292,7 @@ 
             }

             

             echo '</tbody><tfoot>

-                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>

+                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6).'s</td></tr>

             </tfoot>

             </table>';

         }

@@ -344,57 +344,57 @@ 
  */

  

     define('QRSPEC_VERSION_MAX', 40);

-    define('QRSPEC_WIDTH_MAX',   177);

+    define('QRSPEC_WIDTH_MAX', 177);

 

-    define('QRCAP_WIDTH',        0);

-    define('QRCAP_WORDS',        1);

-    define('QRCAP_REMINDER',     2);

-    define('QRCAP_EC',           3);

+    define('QRCAP_WIDTH', 0);

+    define('QRCAP_WORDS', 1);

+    define('QRCAP_REMINDER', 2);

+    define('QRCAP_EC', 3);

 

     class QRspec {

     

         public static $capacity = array(

-            array(  0,    0, 0, array(   0,    0,    0,    0)),

-            array( 21,   26, 0, array(   7,   10,   13,   17)), // 1

-            array( 25,   44, 7, array(  10,   16,   22,   28)),

-            array( 29,   70, 7, array(  15,   26,   36,   44)),

-            array( 33,  100, 7, array(  20,   36,   52,   64)),

-            array( 37,  134, 7, array(  26,   48,   72,   88)), // 5

-            array( 41,  172, 7, array(  36,   64,   96,  112)),

-            array( 45,  196, 0, array(  40,   72,  108,  130)),

-            array( 49,  242, 0, array(  48,   88,  132,  156)),

-            array( 53,  292, 0, array(  60,  110,  160,  192)),

-            array( 57,  346, 0, array(  72,  130,  192,  224)), //10

-            array( 61,  404, 0, array(  80,  150,  224,  264)),

-            array( 65,  466, 0, array(  96,  176,  260,  308)),

-            array( 69,  532, 0, array( 104,  198,  288,  352)),

-            array( 73,  581, 3, array( 120,  216,  320,  384)),

-            array( 77,  655, 3, array( 132,  240,  360,  432)), //15

-            array( 81,  733, 3, array( 144,  280,  408,  480)),

-            array( 85,  815, 3, array( 168,  308,  448,  532)),

-            array( 89,  901, 3, array( 180,  338,  504,  588)),

-            array( 93,  991, 3, array( 196,  364,  546,  650)),

-            array( 97, 1085, 3, array( 224,  416,  600,  700)), //20

-            array(101, 1156, 4, array( 224,  442,  644,  750)),

-            array(105, 1258, 4, array( 252,  476,  690,  816)),

-            array(109, 1364, 4, array( 270,  504,  750,  900)),

-            array(113, 1474, 4, array( 300,  560,  810,  960)),

-            array(117, 1588, 4, array( 312,  588,  870, 1050)), //25

-            array(121, 1706, 4, array( 336,  644,  952, 1110)),

-            array(125, 1828, 4, array( 360,  700, 1020, 1200)),

-            array(129, 1921, 3, array( 390,  728, 1050, 1260)),

-            array(133, 2051, 3, array( 420,  784, 1140, 1350)),

-            array(137, 2185, 3, array( 450,  812, 1200, 1440)), //30

-            array(141, 2323, 3, array( 480,  868, 1290, 1530)),

-            array(145, 2465, 3, array( 510,  924, 1350, 1620)),

-            array(149, 2611, 3, array( 540,  980, 1440, 1710)),

-            array(153, 2761, 3, array( 570, 1036, 1530, 1800)),

-            array(157, 2876, 0, array( 570, 1064, 1590, 1890)), //35

-            array(161, 3034, 0, array( 600, 1120, 1680, 1980)),

-            array(165, 3196, 0, array( 630, 1204, 1770, 2100)),

-            array(169, 3362, 0, array( 660, 1260, 1860, 2220)),

-            array(173, 3532, 0, array( 720, 1316, 1950, 2310)),

-            array(177, 3706, 0, array( 750, 1372, 2040, 2430)) //40

+            array(0, 0, 0, array(0, 0, 0, 0)),

+            array(21, 26, 0, array(7, 10, 13, 17)), // 1

+            array(25, 44, 7, array(10, 16, 22, 28)),

+            array(29, 70, 7, array(15, 26, 36, 44)),

+            array(33, 100, 7, array(20, 36, 52, 64)),

+            array(37, 134, 7, array(26, 48, 72, 88)), // 5

+            array(41, 172, 7, array(36, 64, 96, 112)),

+            array(45, 196, 0, array(40, 72, 108, 130)),

+            array(49, 242, 0, array(48, 88, 132, 156)),

+            array(53, 292, 0, array(60, 110, 160, 192)),

+            array(57, 346, 0, array(72, 130, 192, 224)), //10

+            array(61, 404, 0, array(80, 150, 224, 264)),

+            array(65, 466, 0, array(96, 176, 260, 308)),

+            array(69, 532, 0, array(104, 198, 288, 352)),

+            array(73, 581, 3, array(120, 216, 320, 384)),

+            array(77, 655, 3, array(132, 240, 360, 432)), //15

+            array(81, 733, 3, array(144, 280, 408, 480)),

+            array(85, 815, 3, array(168, 308, 448, 532)),

+            array(89, 901, 3, array(180, 338, 504, 588)),

+            array(93, 991, 3, array(196, 364, 546, 650)),

+            array(97, 1085, 3, array(224, 416, 600, 700)), //20

+            array(101, 1156, 4, array(224, 442, 644, 750)),

+            array(105, 1258, 4, array(252, 476, 690, 816)),

+            array(109, 1364, 4, array(270, 504, 750, 900)),

+            array(113, 1474, 4, array(300, 560, 810, 960)),

+            array(117, 1588, 4, array(312, 588, 870, 1050)), //25

+            array(121, 1706, 4, array(336, 644, 952, 1110)),

+            array(125, 1828, 4, array(360, 700, 1020, 1200)),

+            array(129, 1921, 3, array(390, 728, 1050, 1260)),

+            array(133, 2051, 3, array(420, 784, 1140, 1350)),

+            array(137, 2185, 3, array(450, 812, 1200, 1440)), //30

+            array(141, 2323, 3, array(480, 868, 1290, 1530)),

+            array(145, 2465, 3, array(510, 924, 1350, 1620)),

+            array(149, 2611, 3, array(540, 980, 1440, 1710)),

+            array(153, 2761, 3, array(570, 1036, 1530, 1800)),

+            array(157, 2876, 0, array(570, 1064, 1590, 1890)), //35

+            array(161, 3034, 0, array(600, 1120, 1680, 1980)),

+            array(165, 3196, 0, array(630, 1204, 1770, 2100)),

+            array(169, 3362, 0, array(660, 1260, 1860, 2220)),

+            array(173, 3532, 0, array(720, 1316, 1950, 2310)),

+            array(177, 3706, 0, array(750, 1372, 2040, 2430)) //40

         );

         

         //----------------------------------------------------------------------

@@ -425,9 +425,9 @@ 
         public static function getMinimumVersion($size, $level)

         {

 

-            for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {

-                $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if($words >= $size) 

+            for ($i = 1; $i <= QRSPEC_VERSION_MAX; $i++) {

+                $words = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

+                if ($words >= $size) 

                     return $i;

             }

 

@@ -438,9 +438,9 @@ 
         

         public static $lengthTableBits = array(

             array(10, 12, 14),

-            array( 9, 11, 13),

-            array( 8, 16, 16),

-            array( 8, 10, 12)

+            array(9, 11, 13),

+            array(8, 16, 16),

+            array(8, 10, 12)

         );

         

         //----------------------------------------------------------------------

@@ -463,12 +463,12 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

+            if ($mode == QR_MODE_STRUCTURE) 

                 return 3;

                 

-            if($version <= 9) {

+            if ($version <= 9) {

                 $l = 0;

-            } else if($version <= 26) {

+            } else if ($version <= 26) {

                 $l = 1;

             } else {

                 $l = 2;

@@ -477,7 +477,7 @@ 
             $bits = self::$lengthTableBits[$mode][$l];

             $words = (1 << $bits) - 1;

             

-            if($mode == QR_MODE_KANJI) {

+            if ($mode == QR_MODE_KANJI) {

                 $words *= 2; // the number of bytes is required

             }

 

@@ -489,47 +489,47 @@ 
         // See Table 12-16 (pp.30-36), JIS X0510:2004.

 

         public static $eccTable = array(

-            array(array( 0,  0), array( 0,  0), array( 0,  0), array( 0,  0)),

-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)), // 1

-            array(array( 1,  0), array( 1,  0), array( 1,  0), array( 1,  0)),

-            array(array( 1,  0), array( 1,  0), array( 2,  0), array( 2,  0)),

-            array(array( 1,  0), array( 2,  0), array( 2,  0), array( 4,  0)),

-            array(array( 1,  0), array( 2,  0), array( 2,  2), array( 2,  2)), // 5

-            array(array( 2,  0), array( 4,  0), array( 4,  0), array( 4,  0)),

-            array(array( 2,  0), array( 4,  0), array( 2,  4), array( 4,  1)),

-            array(array( 2,  0), array( 2,  2), array( 4,  2), array( 4,  2)),

-            array(array( 2,  0), array( 3,  2), array( 4,  4), array( 4,  4)),

-            array(array( 2,  2), array( 4,  1), array( 6,  2), array( 6,  2)), //10

-            array(array( 4,  0), array( 1,  4), array( 4,  4), array( 3,  8)),

-            array(array( 2,  2), array( 6,  2), array( 4,  6), array( 7,  4)),

-            array(array( 4,  0), array( 8,  1), array( 8,  4), array(12,  4)),

-            array(array( 3,  1), array( 4,  5), array(11,  5), array(11,  5)),

-            array(array( 5,  1), array( 5,  5), array( 5,  7), array(11,  7)), //15

-            array(array( 5,  1), array( 7,  3), array(15,  2), array( 3, 13)),

-            array(array( 1,  5), array(10,  1), array( 1, 15), array( 2, 17)),

-            array(array( 5,  1), array( 9,  4), array(17,  1), array( 2, 19)),

-            array(array( 3,  4), array( 3, 11), array(17,  4), array( 9, 16)),

-            array(array( 3,  5), array( 3, 13), array(15,  5), array(15, 10)), //20

-            array(array( 4,  4), array(17,  0), array(17,  6), array(19,  6)),

-            array(array( 2,  7), array(17,  0), array( 7, 16), array(34,  0)),

-            array(array( 4,  5), array( 4, 14), array(11, 14), array(16, 14)),

-            array(array( 6,  4), array( 6, 14), array(11, 16), array(30,  2)),

-            array(array( 8,  4), array( 8, 13), array( 7, 22), array(22, 13)), //25

-            array(array(10,  2), array(19,  4), array(28,  6), array(33,  4)),

-            array(array( 8,  4), array(22,  3), array( 8, 26), array(12, 28)),

-            array(array( 3, 10), array( 3, 23), array( 4, 31), array(11, 31)),

-            array(array( 7,  7), array(21,  7), array( 1, 37), array(19, 26)),

-            array(array( 5, 10), array(19, 10), array(15, 25), array(23, 25)), //30

-            array(array(13,  3), array( 2, 29), array(42,  1), array(23, 28)),

-            array(array(17,  0), array(10, 23), array(10, 35), array(19, 35)),

-            array(array(17,  1), array(14, 21), array(29, 19), array(11, 46)),

-            array(array(13,  6), array(14, 23), array(44,  7), array(59,  1)),

-            array(array(12,  7), array(12, 26), array(39, 14), array(22, 41)), //35

-            array(array( 6, 14), array( 6, 34), array(46, 10), array( 2, 64)),

-            array(array(17,  4), array(29, 14), array(49, 10), array(24, 46)),

-            array(array( 4, 18), array(13, 32), array(48, 14), array(42, 32)),

-            array(array(20,  4), array(40,  7), array(43, 22), array(10, 67)),

-            array(array(19,  6), array(18, 31), array(34, 34), array(20, 61)),//40

+            array(array(0, 0), array(0, 0), array(0, 0), array(0, 0)),

+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)), // 1

+            array(array(1, 0), array(1, 0), array(1, 0), array(1, 0)),

+            array(array(1, 0), array(1, 0), array(2, 0), array(2, 0)),

+            array(array(1, 0), array(2, 0), array(2, 0), array(4, 0)),

+            array(array(1, 0), array(2, 0), array(2, 2), array(2, 2)), // 5

+            array(array(2, 0), array(4, 0), array(4, 0), array(4, 0)),

+            array(array(2, 0), array(4, 0), array(2, 4), array(4, 1)),

+            array(array(2, 0), array(2, 2), array(4, 2), array(4, 2)),

+            array(array(2, 0), array(3, 2), array(4, 4), array(4, 4)),

+            array(array(2, 2), array(4, 1), array(6, 2), array(6, 2)), //10

+            array(array(4, 0), array(1, 4), array(4, 4), array(3, 8)),

+            array(array(2, 2), array(6, 2), array(4, 6), array(7, 4)),

+            array(array(4, 0), array(8, 1), array(8, 4), array(12, 4)),

+            array(array(3, 1), array(4, 5), array(11, 5), array(11, 5)),

+            array(array(5, 1), array(5, 5), array(5, 7), array(11, 7)), //15

+            array(array(5, 1), array(7, 3), array(15, 2), array(3, 13)),

+            array(array(1, 5), array(10, 1), array(1, 15), array(2, 17)),

+            array(array(5, 1), array(9, 4), array(17, 1), array(2, 19)),

+            array(array(3, 4), array(3, 11), array(17, 4), array(9, 16)),

+            array(array(3, 5), array(3, 13), array(15, 5), array(15, 10)), //20

+            array(array(4, 4), array(17, 0), array(17, 6), array(19, 6)),

+            array(array(2, 7), array(17, 0), array(7, 16), array(34, 0)),

+            array(array(4, 5), array(4, 14), array(11, 14), array(16, 14)),

+            array(array(6, 4), array(6, 14), array(11, 16), array(30, 2)),

+            array(array(8, 4), array(8, 13), array(7, 22), array(22, 13)), //25

+            array(array(10, 2), array(19, 4), array(28, 6), array(33, 4)),

+            array(array(8, 4), array(22, 3), array(8, 26), array(12, 28)),

+            array(array(3, 10), array(3, 23), array(4, 31), array(11, 31)),

+            array(array(7, 7), array(21, 7), array(1, 37), array(19, 26)),

+            array(array(5, 10), array(19, 10), array(15, 25), array(23, 25)), //30

+            array(array(13, 3), array(2, 29), array(42, 1), array(23, 28)),

+            array(array(17, 0), array(10, 23), array(10, 35), array(19, 35)),

+            array(array(17, 1), array(14, 21), array(29, 19), array(11, 46)),

+            array(array(13, 6), array(14, 23), array(44, 7), array(59, 1)),

+            array(array(12, 7), array(12, 26), array(39, 14), array(22, 41)), //35

+            array(array(6, 14), array(6, 34), array(46, 10), array(2, 64)),

+            array(array(17, 4), array(29, 14), array(49, 10), array(24, 46)),

+            array(array(4, 18), array(13, 32), array(48, 14), array(42, 32)),

+            array(array(20, 4), array(40, 7), array(43, 22), array(10, 67)),

+            array(array(19, 6), array(18, 31), array(34, 34), array(20, 61)), //40

         );                                                                       

 

         //----------------------------------------------------------------------

@@ -538,7 +538,7 @@ 
         public static function getEccSpec($version, $level, array &$spec)

         {

             if (count($spec) < 5) {

-                $spec = array(0,0,0,0,0);

+                $spec = array(0, 0, 0, 0, 0);

             }

 

             $b1   = self::$eccTable[$version][$level][0];

@@ -546,16 +546,16 @@ 
             $data = self::getDataLength($version, $level);

             $ecc  = self::getECCLength($version, $level);

 

-            if($b2 == 0) {

+            if ($b2 == 0) {

                 $spec[0] = $b1;

-                $spec[1] = (int)($data / $b1);

-                $spec[2] = (int)($ecc / $b1);

+                $spec[1] = (int) ($data / $b1);

+                $spec[2] = (int) ($ecc / $b1);

                 $spec[3] = 0; 

                 $spec[4] = 0;

             } else {

                 $spec[0] = $b1;

-                $spec[1] = (int)($data / ($b1 + $b2));

-                $spec[2] = (int)($ecc  / ($b1 + $b2));

+                $spec[1] = (int) ($data / ($b1 + $b2));

+                $spec[2] = (int) ($ecc / ($b1 + $b2));

                 $spec[3] = $b2;

                 $spec[4] = $spec[1] + 1;

             }

@@ -571,9 +571,9 @@ 
         // See Table 1 in Appendix E (pp.71) of JIS X0510:2004.

          

         public static $alignmentPattern = array(      

-            array( 0,  0),

-            array( 0,  0), array(18,  0), array(22,  0), array(26,  0), array(30,  0), // 1- 5

-            array(34,  0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10

+            array(0, 0),

+            array(0, 0), array(18, 0), array(22, 0), array(26, 0), array(30, 0), // 1- 5

+            array(34, 0), array(22, 38), array(24, 42), array(26, 46), array(28, 50), // 6-10

             array(30, 54), array(32, 58), array(34, 62), array(26, 46), array(26, 48), //11-15

             array(26, 50), array(30, 54), array(30, 56), array(30, 58), array(34, 62), //16-20

             array(28, 50), array(26, 50), array(30, 54), array(28, 54), array(32, 58), //21-25

@@ -599,28 +599,28 @@ 
                 "\xa1\xa1\xa1\xa1\xa1"

             );                        

             

-            $yStart = $oy-2;         

-            $xStart = $ox-2;

+            $yStart = $oy - 2;         

+            $xStart = $ox - 2;

             

-            for($y=0; $y<5; $y++) {

-                QRstr::set($frame, $xStart, $yStart+$y, $finder[$y]);

+            for ($y = 0; $y < 5; $y++) {

+                QRstr::set($frame, $xStart, $yStart + $y, $finder[$y]);

             }

         }

 

         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if($version < 2)

+            if ($version < 2)

                 return;

 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

-            if($d < 0) {

+            if ($d < 0) {

                 $w = 2;

             } else {

-                $w = (int)(($width - self::$alignmentPattern[$version][0]) / $d + 2);

+                $w = (int) (($width - self::$alignmentPattern[$version][0]) / $d + 2);

             }

 

-            if($w * $w - 3 == 1) {

+            if ($w * $w - 3 == 1) {

                 $x = self::$alignmentPattern[$version][0];

                 $y = self::$alignmentPattern[$version][0];

                 self::putAlignmentMarker($frame, $x, $y);

@@ -628,16 +628,16 @@ 
             }

 

             $cx = self::$alignmentPattern[$version][0];

-            for($x=1; $x<$w - 1; $x++) {

+            for ($x = 1; $x < $w - 1; $x++) {

                 self::putAlignmentMarker($frame, 6, $cx);

-                self::putAlignmentMarker($frame, $cx,  6);

+                self::putAlignmentMarker($frame, $cx, 6);

                 $cx += $d;

             }

 

             $cy = self::$alignmentPattern[$version][0];

-            for($y=0; $y<$w-1; $y++) {

+            for ($y = 0; $y < $w - 1; $y++) {

                 $cx = self::$alignmentPattern[$version][0];

-                for($x=0; $x<$w-1; $x++) {

+                for ($x = 0; $x < $w - 1; $x++) {

                     self::putAlignmentMarker($frame, $cx, $cy);

                     $cx += $d;

                 }

@@ -663,10 +663,10 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if($version < 7 || $version > QRSPEC_VERSION_MAX)

+            if ($version < 7 || $version > QRSPEC_VERSION_MAX)

                 return 0;

 

-            return self::$versionPattern[$version -7];

+            return self::$versionPattern[$version - 7];

         }

 

         // Format information --------------------------------------------------

@@ -681,10 +681,10 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if($mask < 0 || $mask > 7)

+            if ($mask < 0 || $mask > 7)

                 return 0;

                 

-            if($level < 0 || $level > 3)

+            if ($level < 0 || $level > 3)

                 return 0;                

 

             return self::$formatInfo[$level][$mask];

@@ -713,8 +713,8 @@ 
                 "\xc1\xc1\xc1\xc1\xc1\xc1\xc1"

             );                            

             

-            for($y=0; $y<7; $y++) {

-                QRstr::set($frame, $ox, $oy+$y, $finder[$y]);

+            for ($y = 0; $y < 7; $y++) {

+                QRstr::set($frame, $ox, $oy + $y, $finder[$y]);

             }

         }

 

@@ -722,7 +722,7 @@ 
         public static function createFrame($version)

         {

             $width = self::$capacity[$version][QRCAP_WIDTH];

-            $frameLine = str_repeat ("\0", $width);

+            $frameLine = str_repeat("\0", $width);

             $frame = array_fill(0, $width, $frameLine);

 

             // Finder pattern

@@ -733,7 +733,7 @@ 
             // Separator

             $yOffset = $width - 7;

             

-            for($y=0; $y<7; $y++) {

+            for ($y = 0; $y < 7; $y++) {

                 $frame[$y][7] = "\xc0";

                 $frame[$y][$width - 8] = "\xc0";

                 $frame[$yOffset][7] = "\xc0";

@@ -743,7 +743,7 @@ 
             $setPattern = str_repeat("\xc0", 8);

             

             QRstr::set($frame, 0, 7, $setPattern);

-            QRstr::set($frame, $width-8, 7, $setPattern);

+            QRstr::set($frame, $width - 8, 7, $setPattern);

             QRstr::set($frame, 0, $width - 8, $setPattern);

         

             // Format info

@@ -753,38 +753,38 @@ 
             

             $yOffset = $width - 8;

 

-            for($y=0; $y<8; $y++,$yOffset++) {

+            for ($y = 0; $y < 8; $y++, $yOffset++) {

                 $frame[$y][8] = "\x84";

                 $frame[$yOffset][8] = "\x84";

             }

 

             // Timing pattern  

             

-            for($i=1; $i<$width-15; $i++) {

-                $frame[6][7+$i] = chr(0x90 | ($i & 1));

-                $frame[7+$i][6] = chr(0x90 | ($i & 1));

+            for ($i = 1; $i < $width - 15; $i++) {

+                $frame[6][7 + $i] = chr(0x90 | ($i & 1));

+                $frame[7 + $i][6] = chr(0x90 | ($i & 1));

             }

             

             // Alignment pattern  

             self::putAlignmentPattern($version, $frame, $width);

             

             // Version information 

-            if($version >= 7) {

+            if ($version >= 7) {

                 $vinf = self::getVersionPattern($version);

 

                 $v = $vinf;

                 

-                for($x=0; $x<6; $x++) {

-                    for($y=0; $y<3; $y++) {

-                        $frame[($width - 11)+$y][$x] = chr(0x88 | ($v & 1));

+                for ($x = 0; $x < 6; $x++) {

+                    for ($y = 0; $y < 3; $y++) {

+                        $frame[($width - 11) + $y][$x] = chr(0x88 | ($v & 1));

                         $v = $v >> 1;

                     }

                 }

 

                 $v = $vinf;

-                for($y=0; $y<6; $y++) {

-                    for($x=0; $x<3; $x++) {

-                        $frame[$y][$x+($width - 11)] = chr(0x88 | ($v & 1));

+                for ($y = 0; $y < 6; $y++) {

+                    for ($x = 0; $x < 3; $x++) {

+                        $frame[$y][$x + ($width - 11)] = chr(0x88 | ($v & 1));

                         $v = $v >> 1;

                     }

                 }

@@ -818,16 +818,16 @@ 
             } else {

             

                 foreach ($frame as &$frameLine) {

-                    $frameLine = join('<span class="m">&nbsp;</span>',  explode("\xc0", $frameLine));

+                    $frameLine = join('<span class="m">&nbsp;</span>', explode("\xc0", $frameLine));

                     $frameLine = join('<span class="m">&#9618;</span>', explode("\xc1", $frameLine));

-                    $frameLine = join('<span class="p">&nbsp;</span>',  explode("\xa0", $frameLine));

+                    $frameLine = join('<span class="p">&nbsp;</span>', explode("\xa0", $frameLine));

                     $frameLine = join('<span class="p">&#9618;</span>', explode("\xa1", $frameLine));

                     $frameLine = join('<span class="s">&#9671;</span>', explode("\x84", $frameLine)); //format 0

                     $frameLine = join('<span class="s">&#9670;</span>', explode("\x85", $frameLine)); //format 1

                     $frameLine = join('<span class="x">&#9762;</span>', explode("\x81", $frameLine)); //special bit

-                    $frameLine = join('<span class="c">&nbsp;</span>',  explode("\x90", $frameLine)); //clock 0

+                    $frameLine = join('<span class="c">&nbsp;</span>', explode("\x90", $frameLine)); //clock 0

                     $frameLine = join('<span class="c">&#9719;</span>', explode("\x91", $frameLine)); //clock 1

-                    $frameLine = join('<span class="f">&nbsp;</span>',  explode("\x88", $frameLine)); //version

+                    $frameLine = join('<span class="f">&nbsp;</span>', explode("\x88", $frameLine)); //version

                     $frameLine = join('<span class="f">&#9618;</span>', explode("\x89", $frameLine)); //version

                     $frameLine = join('&#9830;', explode("\x01", $frameLine));

                     $frameLine = join('&#8901;', explode("\0", $frameLine));

@@ -865,10 +865,10 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 

+            if ($version < 1 || $version > QRSPEC_VERSION_MAX) 

                 return null;

 

-            if(!isset(self::$frames[$version])) {

+            if (!isset(self::$frames[$version])) {

                 

                 $fileName = QR_CACHE_DIR.'frame_'.$version.'.dat';

                 

@@ -884,22 +884,22 @@ 
                 }

             }

             

-            if(is_null(self::$frames[$version]))

+            if (is_null(self::$frames[$version]))

                 return null;

 

             return self::$frames[$version];

         }

 

         //----------------------------------------------------------------------

-        public static function rsBlockNum($spec)     { return $spec[0] + $spec[3]; }

-        public static function rsBlockNum1($spec)    { return $spec[0]; }

-        public static function rsDataCodes1($spec)   { return $spec[1]; }

-        public static function rsEccCodes1($spec)    { return $spec[2]; }

-        public static function rsBlockNum2($spec)    { return $spec[3]; }

-        public static function rsDataCodes2($spec)   { return $spec[4]; }

-        public static function rsEccCodes2($spec)    { return $spec[2]; }

-        public static function rsDataLength($spec)   { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]);    }

-        public static function rsEccLength($spec)    { return ($spec[0] + $spec[3]) * $spec[2]; }

+        public static function rsBlockNum($spec) { return $spec[0] + $spec[3]; }

+        public static function rsBlockNum1($spec) { return $spec[0]; }

+        public static function rsDataCodes1($spec) { return $spec[1]; }

+        public static function rsEccCodes1($spec) { return $spec[2]; }

+        public static function rsBlockNum2($spec) { return $spec[3]; }

+        public static function rsDataCodes2($spec) { return $spec[4]; }

+        public static function rsEccCodes2($spec) { return $spec[2]; }

+        public static function rsDataLength($spec) { return ($spec[0] * $spec[1]) + ($spec[3] * $spec[4]); }

+        public static function rsEccLength($spec) { return ($spec[0] + $spec[3]) * $spec[2]; }

         

     }
 
@@ -938,7 +938,7 @@ 
     class QRimage {

     

         //----------------------------------------------------------------------

-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=false) 

+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = false) 

         {

             $image = self::image($frame, $pixelPerPoint, $outerFrame);

             

@@ -946,11 +946,11 @@ 
                 Header("Content-type: image/png");

                 ImagePng($image);

             } else {

-                if($saveandprint===true){

+                if ($saveandprint === true) {

                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else {

                     ImagePng($image, $filename);

                 }

             }

@@ -979,25 +979,25 @@ 
             $h = count($frame);

             $w = strlen($frame[0]);

             

-            $imgW = $w + 2*$outerFrame;

-            $imgH = $h + 2*$outerFrame;

+            $imgW = $w + 2 * $outerFrame;

+            $imgH = $h + 2 * $outerFrame;

             

-            $base_image =ImageCreate($imgW, $imgH);

+            $base_image = ImageCreate($imgW, $imgH);

             

-            $col[0] = ImageColorAllocate($base_image,255,255,255);

-            $col[1] = ImageColorAllocate($base_image,0,0,0);

+            $col[0] = ImageColorAllocate($base_image, 255, 255, 255);

+            $col[1] = ImageColorAllocate($base_image, 0, 0, 0);

 

             imagefill($base_image, 0, 0, $col[0]);

 

-            for($y=0; $y<$h; $y++) {

-                for($x=0; $x<$w; $x++) {

+            for ($y = 0; $y < $h; $y++) {

+                for ($x = 0; $x < $w; $x++) {

                     if ($frame[$y][$x] == '1') {

-                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 

+                        ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); 

                     }

                 }

             }

             

-            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

+            $target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

             ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);

             ImageDestroy($base_image);

             

@@ -1038,7 +1038,7 @@ 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-    define('STRUCTURE_HEADER_BITS',  20);

+    define('STRUCTURE_HEADER_BITS', 20);

     define('MAX_STRUCTURED_SYMBOLS', 16);

 

     class QRinputItem {

@@ -1053,11 +1053,11 @@ 
             $setData = array_slice($data, 0, $size);

             

             if (count($setData) < $size) {

-                $setData = array_merge($setData, array_fill(0,$size-count($setData),0));

+                $setData = array_merge($setData, array_fill(0, $size - count($setData), 0));

             }

         

-            if(!QRinput::check($mode, $size, $setData)) {

-                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));

+            if (!QRinput::check($mode, $size, $setData)) {

+                throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',', $setData));

                 return null;

             }

             

@@ -1072,26 +1072,26 @@ 
         {

             try {

             

-                $words = (int)($this->size / 3);

+                $words = (int) ($this->size / 3);

                 $bs = new QRbitstream();

                 

                 $val = 0x1;

                 $bs->appendNum(4, $val);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);

 

-                for($i=0; $i<$words; $i++) {

-                    $val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;

-                    $val += (ord($this->data[$i*3+1]) - ord('0')) * 10;

-                    $val += (ord($this->data[$i*3+2]) - ord('0'));

+                for ($i = 0; $i < $words; $i++) {

+                    $val  = (ord($this->data[$i * 3]) - ord('0')) * 100;

+                    $val += (ord($this->data[$i * 3 + 1]) - ord('0')) * 10;

+                    $val += (ord($this->data[$i * 3 + 2]) - ord('0'));

                     $bs->appendNum(10, $val);

                 }

 

-                if($this->size - $words * 3 == 1) {

-                    $val = ord($this->data[$words*3]) - ord('0');

+                if ($this->size - $words * 3 == 1) {

+                    $val = ord($this->data[$words * 3]) - ord('0');

                     $bs->appendNum(4, $val);

-                } else if($this->size - $words * 3 == 2) {

-                    $val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;

-                    $val += (ord($this->data[$words*3+1]) - ord('0'));

+                } else if ($this->size - $words * 3 == 2) {

+                    $val  = (ord($this->data[$words * 3]) - ord('0')) * 10;

+                    $val += (ord($this->data[$words * 3 + 1]) - ord('0'));

                     $bs->appendNum(7, $val);

                 }

 

@@ -1107,20 +1107,20 @@ 
         public function encodeModeAn($version)

         {

             try {

-                $words = (int)($this->size / 2);

+                $words = (int) ($this->size / 2);

                 $bs = new QRbitstream();

                 

                 $bs->appendNum(4, 0x02);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);

 

-                for($i=0; $i<$words; $i++) {

-                    $val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;

-                    $val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));

+                for ($i = 0; $i < $words; $i++) {

+                    $val  = (int) QRinput::lookAnTable(ord($this->data[$i * 2])) * 45;

+                    $val += (int) QRinput::lookAnTable(ord($this->data[$i * 2 + 1]));

 

                     $bs->appendNum(11, $val);

                 }

 

-                if($this->size & 1) {

+                if ($this->size & 1) {

                     $val = QRinput::lookAnTable(ord($this->data[$words * 2]));

                     $bs->appendNum(6, $val);

                 }

@@ -1142,7 +1142,7 @@ 
                 $bs->appendNum(4, 0x4);

                 $bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);

 

-                for($i=0; $i<$this->size; $i++) {

+                for ($i = 0; $i < $this->size; $i++) {

                     $bs->appendNum(8, ord($this->data[$i]));

                 }

 

@@ -1162,11 +1162,11 @@ 
                 $bs = new QRbitrtream();

                 

                 $bs->appendNum(4, 0x8);

-                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));

+                $bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int) ($this->size / 2));

 

-                for($i=0; $i<$this->size; $i+=2) {

-                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);

-                    if($val <= 0x9ffc) {

+                for ($i = 0; $i < $this->size; $i += 2) {

+                    $val = (ord($this->data[$i]) << 8) | ord($this->data[$i + 1]);

+                    if ($val <= 0x9ffc) {

                         $val -= 0x8140;

                     } else {

                         $val -= 0xc140;

@@ -1190,7 +1190,7 @@ 
         public function encodeModeStructure()

         {

             try {

-                $bs =  new QRbitstream();

+                $bs = new QRbitstream();

                 

                 $bs->appendNum(4, 0x03);

                 $bs->appendNum(4, ord($this->data[1]) - 1);

@@ -1210,14 +1210,14 @@ 
         {

             $bits = 0;

 

-            if($version == 0) 

+            if ($version == 0) 

                 $version = 1;

 

-            switch($this->mode) {

-                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

-                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+            switch ($this->mode) {

+                case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;

+                case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;

+                case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;

+                case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;

                 case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

                 default:

                     return 0;

@@ -1225,7 +1225,7 @@ 
 

             $l = QRspec::lengthIndicator($this->mode, $version);

             $m = 1 << $l;

-            $num = (int)(($this->size + $m - 1) / $m);

+            $num = (int) (($this->size + $m - 1) / $m);

 

             $bits += $num * (4 + $l);

 

@@ -1240,7 +1240,7 @@ 
                 unset($this->bstream);

                 $words = QRspec::maximumWords($this->mode, $version);

                 

-                if($this->size > $words) {

+                if ($this->size > $words) {

                 

                     $st1 = new QRinputItem($this->mode, $words, $this->data);

                     $st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));

@@ -1259,18 +1259,18 @@ 
                     

                     $ret = 0;

                     

-                    switch($this->mode) {

-                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-                        case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+                    switch ($this->mode) {

+                        case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;

+                        case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;

+                        case QR_MODE_8:            $ret = $this->encodeMode8($version); break;

+                        case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;

+                        case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;

                         

                         default:

                             break;

                     }

                     

-                    if($ret < 0)

+                    if ($ret < 0)

                         return -1;

                 }

 

@@ -1312,7 +1312,7 @@ 
         //----------------------------------------------------------------------

         public function setVersion($version)

         {

-            if($version < 0 || $version > QRSPEC_VERSION_MAX) {

+            if ($version < 0 || $version > QRSPEC_VERSION_MAX) {

                 throw new Exception('Invalid version no');

                 return -1;

             }

@@ -1331,7 +1331,7 @@ 
         //----------------------------------------------------------------------

         public function setErrorCorrectionLevel($level)

         {

-            if($level > QR_ECLEVEL_H) {

+            if ($level > QR_ECLEVEL_H) {

                 throw new Exception('Invalid ECLEVEL');

                 return -1;

             }

@@ -1363,11 +1363,11 @@ 
         

         public function insertStructuredAppendHeader($size, $index, $parity)

         {

-            if( $size > MAX_STRUCTURED_SYMBOLS ) {

+            if ($size > MAX_STRUCTURED_SYMBOLS) {

                 throw new Exception('insertStructuredAppendHeader wrong size');

             }

             

-            if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {

+            if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) {

                 throw new Exception('insertStructuredAppendHeader wrong index');

             }

 

@@ -1387,9 +1387,9 @@ 
         {

             $parity = 0;

             

-            foreach($this->items as $item) {

-                if($item->mode != QR_MODE_STRUCTURE) {

-                    for($i=$item->size-1; $i>=0; $i--) {

+            foreach ($this->items as $item) {

+                if ($item->mode != QR_MODE_STRUCTURE) {

+                    for ($i = $item->size - 1; $i >= 0; $i--) {

                         $parity ^= $item->data[$i];

                     }

                 }

@@ -1401,8 +1401,8 @@ 
         //----------------------------------------------------------------------

         public static function checkModeNum($size, $data)

         {

-            for($i=0; $i<$size; $i++) {

-                if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){

+            for ($i = 0; $i < $size; $i++) {

+                if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) {

                     return false;

                 }

             }

@@ -1413,10 +1413,10 @@ 
         //----------------------------------------------------------------------

         public static function estimateBitsModeNum($size)

         {

-            $w = (int)$size / 3;

+            $w = (int) $size / 3;

             $bits = $w * 10;

             

-            switch($size - $w * 3) {

+            switch ($size - $w * 3) {

                 case 1:

                     $bits += 4;

                     break;

@@ -1435,7 +1435,7 @@ 
             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

             36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

-             0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

+             0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,

             -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

             25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

             -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

@@ -1445,13 +1445,13 @@ 
         //----------------------------------------------------------------------

         public static function lookAnTable($c)

         {

-            return (($c > 127)?-1:self::$anTable[$c]);

+            return (($c > 127) ?-1 : self::$anTable[$c]);

         }

         

         //----------------------------------------------------------------------

         public static function checkModeAn($size, $data)

         {

-            for($i=0; $i<$size; $i++) {

+            for ($i = 0; $i < $size; $i++) {

                 if (self::lookAnTable(ord($data[$i])) == -1) {

                     return false;

                 }

@@ -1463,10 +1463,10 @@ 
         //----------------------------------------------------------------------

         public static function estimateBitsModeAn($size)

         {

-            $w = (int)($size / 2);

+            $w = (int) ($size / 2);

             $bits = $w * 11;

             

-            if($size & 1) {

+            if ($size & 1) {

                 $bits += 6;

             }

 

@@ -1482,18 +1482,18 @@ 
         //----------------------------------------------------------------------

         public function estimateBitsModeKanji($size)

         {

-            return (int)(($size / 2) * 13);

+            return (int) (($size / 2) * 13);

         }

         

         //----------------------------------------------------------------------

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

+            if ($size & 1)

                 return false;

 

-            for($i=0; $i<$size; $i+=2) {

-                $val = (ord($data[$i]) << 8) | ord($data[$i+1]);

-                if( $val < 0x8140 

+            for ($i = 0; $i < $size; $i += 2) {

+                $val = (ord($data[$i]) << 8) | ord($data[$i + 1]);

+                if ($val < 0x8140 

                 || ($val > 0x9ffc && $val < 0xe040) 

                 || $val > 0xebbf) {

                     return false;

@@ -1509,12 +1509,12 @@ 
 

         public static function check($mode, $size, $data)

         {

-            if($size <= 0) 

+            if ($size <= 0) 

                 return false;

 

-            switch($mode) {

-                case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

-                case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+            switch ($mode) {

+                case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;

+                case QR_MODE_AN:        return self::checkModeAn($size, $data); break;

                 case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

                 case QR_MODE_8:         return true; break;

                 case QR_MODE_STRUCTURE: return true; break;

@@ -1532,7 +1532,7 @@ 
         {

             $bits = 0;

 

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $bits += $item->estimateBitStreamSizeOfEntry($version);

             }

 

@@ -1547,7 +1547,7 @@ 
             do {

                 $prev = $version;

                 $bits = $this->estimateBitStreamSize($prev);

-                $version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

+                $version = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);

                 if ($version < 0) {

                     return -1;

                 }

@@ -1560,32 +1560,32 @@ 
         public static function lengthOfCode($mode, $version, $bits)

         {

             $payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

-            switch($mode) {

+            switch ($mode) {

                 case QR_MODE_NUM:

-                    $chunks = (int)($payload / 10);

+                    $chunks = (int) ($payload / 10);

                     $remain = $payload - $chunks * 10;

                     $size = $chunks * 3;

-                    if($remain >= 7) {

+                    if ($remain >= 7) {

                         $size += 2;

-                    } else if($remain >= 4) {

+                    } else if ($remain >= 4) {

                         $size += 1;

                     }

                     break;

                 case QR_MODE_AN:

-                    $chunks = (int)($payload / 11);

+                    $chunks = (int) ($payload / 11);

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

+                    if ($remain >= 6) 

                         $size++;

                     break;

                 case QR_MODE_8:

-                    $size = (int)($payload / 8);

+                    $size = (int) ($payload / 8);

                     break;

                 case QR_MODE_KANJI:

-                    $size = (int)(($payload / 13) * 2);

+                    $size = (int) (($payload / 13) * 2);

                     break;

                 case QR_MODE_STRUCTURE:

-                    $size = (int)($payload / 8);

+                    $size = (int) ($payload / 8);

                     break;

                 default:

                     $size = 0;

@@ -1593,8 +1593,8 @@ 
             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

-            if($size < 0) $size = 0;

-            if($size > $maxsize) $size = $maxsize;

+            if ($size < 0) $size = 0;

+            if ($size > $maxsize) $size = $maxsize;

 

             return $size;

         }

@@ -1604,10 +1604,10 @@ 
         {

             $total = 0;

 

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

+                if ($bits < 0) 

                     return -1;

                     

                 $total += $bits;

@@ -1620,21 +1620,21 @@ 
         public function convertData()

         {

             $ver = $this->estimateVersion();

-            if($ver > $this->getVersion()) {

+            if ($ver > $this->getVersion()) {

                 $this->setVersion($ver);

             }

 

-            for(;;) {

+            for (;;) {

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

+                if ($bits < 0) 

                     return -1;

                     

-                $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

-                if($ver < 0) {

+                $ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);

+                if ($ver < 0) {

                     throw new Exception('WRONG VERSION');

                     return -1;

-                } else if($ver > $this->getVersion()) {

+                } else if ($ver > $this->getVersion()) {

                     $this->setVersion($ver);

                 } else {

                     break;

@@ -1660,26 +1660,26 @@ 
             }

 

             $bits += 4;

-            $words = (int)(($bits + 7) / 8);

+            $words = (int) (($bits + 7) / 8);

 

             $padding = new QRbitstream();

             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-            if($ret < 0) 

+            if ($ret < 0) 

                 return $ret;

 

             $padlen = $maxwords - $words;

             

-            if($padlen > 0) {

+            if ($padlen > 0) {

                 

                 $padbuf = array();

-                for($i=0; $i<$padlen; $i++) {

-                    $padbuf[$i] = ($i&1)?0x11:0xec;

+                for ($i = 0; $i < $padlen; $i++) {

+                    $padbuf[$i] = ($i & 1) ? 0x11 : 0xec;

                 }

                 

                 $ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

+                if ($ret < 0)

                     return $ret;

                 

             }

@@ -1692,15 +1692,15 @@ 
         //----------------------------------------------------------------------

         public function mergeBitStream()

         {

-            if($this->convertData() < 0) {

+            if ($this->convertData() < 0) {

                 return null;

             }

 

             $bstream = new QRbitstream();

             

-            foreach($this->items as $item) {

+            foreach ($this->items as $item) {

                 $ret = $bstream->append($item->bstream);

-                if($ret < 0) {

+                if ($ret < 0) {

                     return null;

                 }

             }

@@ -1714,12 +1714,12 @@ 
 

             $bstream = $this->mergeBitStream();

             

-            if($bstream == null) {

+            if ($bstream == null) {

                 return null;

             }

             

             $ret = $this->appendPaddingBit($bstream);

-            if($ret < 0) {

+            if ($ret < 0) {

                 return null;

             }

 

@@ -1730,7 +1730,7 @@ 
         public function getByteStream()

         {

             $bstream = $this->getBitStream();

-            if($bstream == null) {

+            if ($bstream == null) {

                 return null;

             }

             

@@ -1798,8 +1798,8 @@ 
             $bstream->allocate($bits);

             

             $mask = 1 << ($bits - 1);

-            for($i=0; $i<$bits; $i++) {

-                if($num & $mask) {

+            for ($i = 0; $i < $bits; $i++) {

+                if ($num & $mask) {

                     $bstream->data[$i] = 1;

                 } else {

                     $bstream->data[$i] = 0;

@@ -1815,12 +1815,12 @@ 
         {

             $bstream = new QRbitstream();

             $bstream->allocate($size * 8);

-            $p=0;

+            $p = 0;

 

-            for($i=0; $i<$size; $i++) {

+            for ($i = 0; $i < $size; $i++) {

                 $mask = 0x80;

-                for($j=0; $j<8; $j++) {

-                    if($data[$i] & $mask) {

+                for ($j = 0; $j < 8; $j++) {

+                    if ($data[$i] & $mask) {

                         $bstream->data[$p] = 1;

                     } else {

                         $bstream->data[$p] = 0;

@@ -1840,11 +1840,11 @@ 
                 return -1;

             }

             

-            if($arg->size() == 0) {

+            if ($arg->size() == 0) {

                 return 0;

             }

             

-            if($this->size() == 0) {

+            if ($this->size() == 0) {

                 $this->data = $arg->data;

                 return 0;

             }

@@ -1862,7 +1862,7 @@ 
 

             $b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

             $ret = $this->append($b);

@@ -1879,7 +1879,7 @@ 
 

             $b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

+            if (is_null($b))

                 return -1;

 

             $ret = $this->append($b);

@@ -1894,18 +1894,18 @@ 
         

             $size = $this->size();

 

-            if($size == 0) {

+            if ($size == 0) {

                 return array();

             }

             

-            $data = array_fill(0, (int)(($size + 7) / 8), 0);

-            $bytes = (int)($size / 8);

+            $data = array_fill(0, (int) (($size + 7) / 8), 0);

+            $bytes = (int) ($size / 8);

 

             $p = 0;

             

-            for($i=0; $i<$bytes; $i++) {

+            for ($i = 0; $i < $bytes; $i++) {

                 $v = 0;

-                for($j=0; $j<8; $j++) {

+                for ($j = 0; $j < 8; $j++) {

                     $v = $v << 1;

                     $v |= $this->data[$p];

                     $p++;

@@ -1913,9 +1913,9 @@ 
                 $data[$i] = $v;

             }

             

-            if($size & 7) {

+            if ($size & 7) {

                 $v = 0;

-                for($j=0; $j<($size & 7); $j++) {

+                for ($j = 0; $j < ($size & 7); $j++) {

                     $v = $v << 1;

                     $v |= $this->data[$p];

                     $p++;

@@ -1987,7 +1987,7 @@ 
             if ($pos >= strlen($str))

                 return false;

             

-            return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

+            return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));

         }

         

         //----------------------------------------------------------------------

@@ -2007,17 +2007,17 @@ 
                 

             $c = $this->dataStr[$pos];

             

-            if(self::isdigitat($this->dataStr, $pos)) {

+            if (self::isdigitat($this->dataStr, $pos)) {

                 return QR_MODE_NUM;

-            } else if(self::isalnumat($this->dataStr, $pos)) {

+            } else if (self::isalnumat($this->dataStr, $pos)) {

                 return QR_MODE_AN;

-            } else if($this->modeHint == QR_MODE_KANJI) {

+            } else if ($this->modeHint == QR_MODE_KANJI) {

             

-                if ($pos+1 < strlen($this->dataStr)) 

+                if ($pos + 1 < strlen($this->dataStr)) 

                 {

-                    $d = $this->dataStr[$pos+1];

+                    $d = $this->dataStr[$pos + 1];

                     $word = (ord($c) << 8) | ord($d);

-                    if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

+                    if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

                         return QR_MODE_KANJI;

                     }

                 }

@@ -2032,32 +2032,32 @@ 
             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

             $p = 0;

-            while(self::isdigitat($this->dataStr, $p)) {

+            while (self::isdigitat($this->dataStr, $p)) {

                 $p++;

             }

             

             $run = $p;

             $mode = $this->identifyMode($p);

             

-            if($mode == QR_MODE_8) {

+            if ($mode == QR_MODE_8) {

                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

                      + QRinput::estimateBitsMode8(1)         // + 4 + l8

                      - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

-            if($mode == QR_MODE_AN) {

+            if ($mode == QR_MODE_AN) {

                 $dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

                      + QRinput::estimateBitsModeAn(1)        // + 4 + la

-                     - QRinput::estimateBitsModeAn($run + 1);// - 4 - la

-                if($dif > 0) {

+                     - QRinput::estimateBitsModeAn($run + 1); // - 4 - la

+                if ($dif > 0) {

                     return $this->eatAn();

                 }

             }

             

             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2066,15 +2066,15 @@ 
         //----------------------------------------------------------------------

         public function eatAn()

         {

-            $la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());

+            $la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());

             $ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

             $p = 0;

             

-            while(self::isalnumat($this->dataStr, $p)) {

-                if(self::isdigitat($this->dataStr, $p)) {

+            while (self::isalnumat($this->dataStr, $p)) {

+                if (self::isdigitat($this->dataStr, $p)) {

                     $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

+                    while (self::isdigitat($this->dataStr, $q)) {

                         $q++;

                     }

                     

@@ -2082,7 +2082,7 @@ 
                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

                          - QRinput::estimateBitsModeAn($q); // - 4 - la

                          

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -2094,17 +2094,17 @@ 
 

             $run = $p;

 

-            if(!self::isalnumat($this->dataStr, $p)) {

+            if (!self::isalnumat($this->dataStr, $p)) {

                 $dif = QRinput::estimateBitsModeAn($run) + 4 + $la

                      + QRinput::estimateBitsMode8(1) // + 4 + l8

                       - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-                if($dif > 0) {

+                if ($dif > 0) {

                     return $this->eat8();

                 }

             }

 

             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2115,12 +2115,12 @@ 
         {

             $p = 0;

             

-            while($this->identifyMode($p) == QR_MODE_KANJI) {

+            while ($this->identifyMode($p) == QR_MODE_KANJI) {

                 $p += 2;

             }

             

             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2135,34 +2135,34 @@ 
             $p = 1;

             $dataStrLen = strlen($this->dataStr);

             

-            while($p < $dataStrLen) {

+            while ($p < $dataStrLen) {

                 

                 $mode = $this->identifyMode($p);

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     break;

                 }

-                if($mode == QR_MODE_NUM) {

+                if ($mode == QR_MODE_NUM) {

                     $q = $p;

-                    while(self::isdigitat($this->dataStr, $q)) {

+                    while (self::isdigitat($this->dataStr, $q)) {

                         $q++;

                     }

                     $dif = QRinput::estimateBitsMode8($p) // + 4 + l8

                          + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

                          - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

                     }

-                } else if($mode == QR_MODE_AN) {

+                } else if ($mode == QR_MODE_AN) {

                     $q = $p;

-                    while(self::isalnumat($this->dataStr, $q)) {

+                    while (self::isalnumat($this->dataStr, $q)) {

                         $q++;

                     }

                     $dif = QRinput::estimateBitsMode8($p)  // + 4 + l8

                          + QRinput::estimateBitsModeAn($q - $p) + 4 + $la

                          - QRinput::estimateBitsMode8($q); // - 4 - l8

-                    if($dif < 0) {

+                    if ($dif < 0) {

                         break;

                     } else {

                         $p = $q;

@@ -2175,7 +2175,7 @@ 
             $run = $p;

             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-            if($ret < 0)

+            if ($ret < 0)

                 return -1;

 

             return $run;

@@ -2186,7 +2186,7 @@ 
         {

             while (strlen($this->dataStr) > 0)

             {

-                if($this->dataStr == '')

+                if ($this->dataStr == '')

                     return 0;

 

                 $mode = $this->identifyMode(0);

@@ -2203,8 +2203,8 @@ 
                 

                 }

 

-                if($length == 0) return 0;

-                if($length < 0)  return -1;

+                if ($length == 0) return 0;

+                if ($length < 0)  return -1;

                 

                 $this->dataStr = substr($this->dataStr, $length);

             }

@@ -2216,9 +2216,9 @@ 
             $stringLen = strlen($this->dataStr);

             $p = 0;

             

-            while ($p<$stringLen) {

+            while ($p < $stringLen) {

                 $mode = self::identifyMode(substr($this->dataStr, $p));

-                if($mode == QR_MODE_KANJI) {

+                if ($mode == QR_MODE_KANJI) {

                     $p += 2;

                 } else {

                     if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {

@@ -2234,13 +2234,13 @@ 
         //----------------------------------------------------------------------

         public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)

         {

-            if(is_null($string) || $string == '\0' || $string == '') {

+            if (is_null($string) || $string == '\0' || $string == '') {

                 throw new Exception('empty string!!!');

             }

 

             $split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

+            if (!$casesensitive)

                 $split->toUpper();

                 

             return $split->splitString();

@@ -2285,16 +2285,16 @@ 
  

     class QRrsItem {

     

-        public $mm;                  // Bits per symbol 

-        public $nn;                  // Symbols per block (= (1<<mm)-1) 

-        public $alpha_to = array();  // log lookup table 

-        public $index_of = array();  // Antilog lookup table 

-        public $genpoly = array();   // Generator polynomial 

-        public $nroots;              // Number of generator roots = number of parity symbols 

-        public $fcr;                 // First consecutive root, index form 

-        public $prim;                // Primitive element, index form 

-        public $iprim;               // prim-th root of 1, index form 

-        public $pad;                 // Padding bytes in shortened block 

+        public $mm; // Bits per symbol 

+        public $nn; // Symbols per block (= (1<<mm)-1) 

+        public $alpha_to = array(); // log lookup table 

+        public $index_of = array(); // Antilog lookup table 

+        public $genpoly = array(); // Generator polynomial 

+        public $nroots; // Number of generator roots = number of parity symbols 

+        public $fcr; // First consecutive root, index form 

+        public $prim; // Primitive element, index form 

+        public $iprim; // prim-th root of 1, index form 

+        public $pad; // Padding bytes in shortened block 

         public $gfpoly;

     

         //----------------------------------------------------------------------

@@ -2318,47 +2318,47 @@ 
             $rs = null;

             

             // Check parameter ranges

-            if($symsize < 0 || $symsize > 8)                     return $rs;

-            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;

-            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;

-            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!

-            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding

+            if ($symsize < 0 || $symsize > 8)                     return $rs;

+            if ($fcr < 0 || $fcr >= (1 << $symsize))                return $rs;

+            if ($prim <= 0 || $prim >= (1 << $symsize))             return $rs;

+            if ($nroots < 0 || $nroots >= (1 << $symsize))          return $rs; // Can't have more roots than symbol values!

+            if ($pad < 0 || $pad >= ((1 << $symsize) - 1 - $nroots)) return $rs; // Too much padding

 

             $rs = new QRrsItem();

             $rs->mm = $symsize;

-            $rs->nn = (1<<$symsize)-1;

+            $rs->nn = (1 << $symsize) - 1;

             $rs->pad = $pad;

 

-            $rs->alpha_to = array_fill(0, $rs->nn+1, 0);

-            $rs->index_of = array_fill(0, $rs->nn+1, 0);

+            $rs->alpha_to = array_fill(0, $rs->nn + 1, 0);

+            $rs->index_of = array_fill(0, $rs->nn + 1, 0);

           

             // PHP style macro replacement ;)

-            $NN =& $rs->nn;

-            $A0 =& $NN;

+            $NN = & $rs->nn;

+            $A0 = & $NN;

             

             // Generate Galois field lookup tables

             $rs->index_of[0] = $A0; // log(zero) = -inf

             $rs->alpha_to[$A0] = 0; // alpha**-inf = 0

             $sr = 1;

           

-            for($i=0; $i<$rs->nn; $i++) {

+            for ($i = 0; $i < $rs->nn; $i++) {

                 $rs->index_of[$sr] = $i;

                 $rs->alpha_to[$i] = $sr;

                 $sr <<= 1;

-                if($sr & (1<<$symsize)) {

+                if ($sr & (1 << $symsize)) {

                     $sr ^= $gfpoly;

                 }

                 $sr &= $rs->nn;

             }

             

-            if($sr != 1){

+            if ($sr != 1) {

                 // field generator polynomial is not primitive!

                 $rs = null;

                 return $rs;

             }

 

             /* Form RS code generator polynomial from its roots */

-            $rs->genpoly = array_fill(0, $nroots+1, 0);

+            $rs->genpoly = array_fill(0, $nroots + 1, 0);

         

             $rs->fcr = $fcr;

             $rs->prim = $prim;

@@ -2366,21 +2366,21 @@ 
             $rs->gfpoly = $gfpoly;

 

             /* Find prim-th root of 1, used in decoding */

-            for($iprim=1;($iprim % $prim) != 0;$iprim += $rs->nn)

+            for ($iprim = 1; ($iprim % $prim) != 0; $iprim += $rs->nn)

             ; // intentional empty-body loop!

             

-            $rs->iprim = (int)($iprim / $prim);

+            $rs->iprim = (int) ($iprim / $prim);

             $rs->genpoly[0] = 1;

             

-            for ($i = 0,$root=$fcr*$prim; $i < $nroots; $i++, $root += $prim) {

-                $rs->genpoly[$i+1] = 1;

+            for ($i = 0, $root = $fcr * $prim; $i < $nroots; $i++, $root += $prim) {

+                $rs->genpoly[$i + 1] = 1;

 

                 // Multiply rs->genpoly[] by  @**(root + x)

                 for ($j = $i; $j > 0; $j--) {

                     if ($rs->genpoly[$j] != 0) {

-                        $rs->genpoly[$j] = $rs->genpoly[$j-1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];

+                        $rs->genpoly[$j] = $rs->genpoly[$j - 1] ^ $rs->alpha_to[$rs->modnn($rs->index_of[$rs->genpoly[$j]] + $root)];

                     } else {

-                        $rs->genpoly[$j] = $rs->genpoly[$j-1];

+                        $rs->genpoly[$j] = $rs->genpoly[$j - 1];

                     }

                 }

                 // rs->genpoly[0] can never be zero

@@ -2397,38 +2397,38 @@ 
         //----------------------------------------------------------------------

         public function encode_rs_char($data, &$parity)

         {

-            $MM       =& $this->mm;

-            $NN       =& $this->nn;

-            $ALPHA_TO =& $this->alpha_to;

-            $INDEX_OF =& $this->index_of;

-            $GENPOLY  =& $this->genpoly;

-            $NROOTS   =& $this->nroots;

-            $FCR      =& $this->fcr;

-            $PRIM     =& $this->prim;

-            $IPRIM    =& $this->iprim;

-            $PAD      =& $this->pad;

-            $A0       =& $NN;

+            $MM       = & $this->mm;

+            $NN       = & $this->nn;

+            $ALPHA_TO = & $this->alpha_to;

+            $INDEX_OF = & $this->index_of;

+            $GENPOLY  = & $this->genpoly;

+            $NROOTS   = & $this->nroots;

+            $FCR      = & $this->fcr;

+            $PRIM     = & $this->prim;

+            $IPRIM    = & $this->iprim;

+            $PAD      = & $this->pad;

+            $A0       = & $NN;

 

             $parity = array_fill(0, $NROOTS, 0);

 

-            for($i=0; $i< ($NN-$NROOTS-$PAD); $i++) {

+            for ($i = 0; $i < ($NN - $NROOTS - $PAD); $i++) {

                 

                 $feedback = $INDEX_OF[$data[$i] ^ $parity[0]];

-                if($feedback != $A0) {      

+                if ($feedback != $A0) {      

                     // feedback term is non-zero

             

                     // This line is unnecessary when GENPOLY[NROOTS] is unity, as it must

                     // always be for the polynomials constructed by init_rs()

                     $feedback = $this->modnn($NN - $GENPOLY[$NROOTS] + $feedback);

             

-                    for($j=1;$j<$NROOTS;$j++) {

-                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS-$j])];

+                    for ($j = 1; $j < $NROOTS; $j++) {

+                        $parity[$j] ^= $ALPHA_TO[$this->modnn($feedback + $GENPOLY[$NROOTS - $j])];

                     }

                 }

                 

                 // Shift 

                 array_shift($parity);

-                if($feedback != $A0) {

+                if ($feedback != $A0) {

                     array_push($parity, $ALPHA_TO[$this->modnn($feedback + $GENPOLY[0])]);

                 } else {

                     array_push($parity, 0);

@@ -2446,13 +2446,13 @@ 
         //----------------------------------------------------------------------

         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)

         {

-            foreach(self::$items as $rs) {

-                if($rs->pad != $pad)       continue;

-                if($rs->nroots != $nroots) continue;

-                if($rs->mm != $symsize)    continue;

-                if($rs->gfpoly != $gfpoly) continue;

-                if($rs->fcr != $fcr)       continue;

-                if($rs->prim != $prim)     continue;

+            foreach (self::$items as $rs) {

+                if ($rs->pad != $pad)       continue;

+                if ($rs->nroots != $nroots) continue;

+                if ($rs->mm != $symsize)    continue;

+                if ($rs->gfpoly != $gfpoly) continue;

+                if ($rs->fcr != $fcr)       continue;

+                if ($rs->prim != $prim)     continue;

 

                 return $rs;

             }

@@ -2516,10 +2516,10 @@ 
         public function writeFormatInformation($width, &$frame, $mask, $level)

         {

             $blacks = 0;

-            $format =  QRspec::getFormatInfo($mask, $level);

+            $format = QRspec::getFormatInfo($mask, $level);

 

-            for($i=0; $i<8; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 8; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -2527,7 +2527,7 @@ 
                 }

                 

                 $frame[8][$width - 1 - $i] = chr($v);

-                if($i < 6) {

+                if ($i < 6) {

                     $frame[$i][8] = chr($v);

                 } else {

                     $frame[$i + 1][8] = chr($v);

@@ -2535,8 +2535,8 @@ 
                 $format = $format >> 1;

             }

             

-            for($i=0; $i<7; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 7; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -2544,7 +2544,7 @@ 
                 }

                 

                 $frame[$width - 7 + $i][8] = chr($v);

-                if($i == 0) {

+                if ($i == 0) {

                     $frame[8][7] = chr($v);

                 } else {

                     $frame[8][6 - $i] = chr($v);

@@ -2557,27 +2557,27 @@ 
         }

         

         //----------------------------------------------------------------------

-        public function mask0($x, $y) { return ($x+$y)&1;                       }

-        public function mask1($x, $y) { return ($y&1);                          }

-        public function mask2($x, $y) { return ($x%3);                          }

-        public function mask3($x, $y) { return ($x+$y)%3;                       }

-        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }

-        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }

-        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }

-        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }

+        public function mask0($x, $y) { return ($x + $y) & 1; }

+        public function mask1($x, $y) { return ($y & 1); }

+        public function mask2($x, $y) { return ($x % 3); }

+        public function mask3($x, $y) { return ($x + $y) % 3; }

+        public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3))) & 1; }

+        public function mask5($x, $y) { return (($x * $y) & 1) + ($x * $y) % 3; }

+        public function mask6($x, $y) { return ((($x * $y) & 1) + ($x * $y) % 3) & 1; }

+        public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y) & 1)) & 1; }

         

         //----------------------------------------------------------------------

         private function generateMaskNo($maskNo, $width, $frame)

         {

             $bitMask = array_fill(0, $width, array_fill(0, $width, 0));

             

-            for($y=0; $y<$width; $y++) {

-                for($x=0; $x<$width; $x++) {

-                    if(ord($frame[$y][$x]) & 0x80) {

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

+                    if (ord($frame[$y][$x]) & 0x80) {

                         $bitMask[$y][$x] = 0;

                     } else {

                         $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);

-                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;

+                        $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;

                     }

                     

                 }

@@ -2635,12 +2635,12 @@ 
                 

             $d = $s;

 

-            for($y=0; $y<$width; $y++) {

-                for($x=0; $x<$width; $x++) {

-                    if($bitMask[$y][$x] == 1) {

-                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

+                    if ($bitMask[$y][$x] == 1) {

+                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);

                     }

-                    $b += (int)(ord($d[$y][$x]) & 1);

+                    $b += (int) (ord($d[$y][$x]) & 1);

                 }

             }

 

@@ -2662,21 +2662,21 @@ 
         {

             $demerit = 0;

 

-            for($i=0; $i<$length; $i++) {

+            for ($i = 0; $i < $length; $i++) {

                 

-                if($this->runLength[$i] >= 5) {

+                if ($this->runLength[$i] >= 5) {

                     $demerit += (N1 + ($this->runLength[$i] - 5));

                 }

-                if($i & 1) {

-                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {

-                        $fact = (int)($this->runLength[$i] / 3);

-                        if(($this->runLength[$i-2] == $fact) &&

-                           ($this->runLength[$i-1] == $fact) &&

-                           ($this->runLength[$i+1] == $fact) &&

-                           ($this->runLength[$i+2] == $fact)) {

-                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {

+                if ($i & 1) {

+                    if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) {

+                        $fact = (int) ($this->runLength[$i] / 3);

+                        if (($this->runLength[$i - 2] == $fact) &&

+                           ($this->runLength[$i - 1] == $fact) &&

+                           ($this->runLength[$i + 1] == $fact) &&

+                           ($this->runLength[$i + 2] == $fact)) {

+                            if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) {

                                 $demerit += N3;

-                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {

+                            } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) {

                                 $demerit += N3;

                             }

                         }

@@ -2692,30 +2692,30 @@ 
             $head = 0;

             $demerit = 0;

 

-            for($y=0; $y<$width; $y++) {

+            for ($y = 0; $y < $width; $y++) {

                 $head = 0;

                 $this->runLength[0] = 1;

                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y > 0)

+                    $frameYM = $frame[$y - 1];

                 

-                for($x=0; $x<$width; $x++) {

-                    if(($x > 0) && ($y > 0)) {

-                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);

-                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);

+                for ($x = 0; $x < $width; $x++) {

+                    if (($x > 0) && ($y > 0)) {

+                        $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);

+                        $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);

                         

-                        if(($b22 | ($w22 ^ 1))&1) {                                                                     

+                        if (($b22 | ($w22 ^ 1)) & 1) {                                                                     

                             $demerit += N2;

                         }

                     }

-                    if(($x == 0) && (ord($frameY[$x]) & 1)) {

+                    if (($x == 0) && (ord($frameY[$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($x > 0) {

-                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {

+                    } else if ($x > 0) {

+                        if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -2724,20 +2724,20 @@ 
                     }

                 }

     

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

-            for($x=0; $x<$width; $x++) {

+            for ($x = 0; $x < $width; $x++) {

                 $head = 0;

                 $this->runLength[0] = 1;

                 

-                for($y=0; $y<$width; $y++) {

-                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {

+                for ($y = 0; $y < $width; $y++) {

+                    if ($y == 0 && (ord($frame[$y][$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($y > 0) {

-                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {

+                    } else if ($y > 0) {

+                        if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -2746,7 +2746,7 @@ 
                     }

                 }

             

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

             return $demerit;

@@ -2760,13 +2760,13 @@ 
             $bestMaskNum = 0;

             $bestMask = array();

             

-            $checked_masks = array(0,1,2,3,4,5,6,7);

+            $checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);

             

             if (QR_FIND_FROM_RANDOM !== false) {

             

-                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);

-                for ($i = 0; $i <  $howManuOut; $i++) {

-                    $remPos = rand (0, count($checked_masks)-1);

+                $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);

+                for ($i = 0; $i < $howManuOut; $i++) {

+                    $remPos = rand(0, count($checked_masks) - 1);

                     unset($checked_masks[$remPos]);

                     $checked_masks = array_values($checked_masks);

                 }

@@ -2775,18 +2775,18 @@ 
             

             $bestMask = $frame;

              

-            foreach($checked_masks as $i) {

+            foreach ($checked_masks as $i) {

                 $mask = array_fill(0, $width, str_repeat("\0", $width));

 

                 $demerit = 0;

                 $blacks = 0;

                 $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);

                 $blacks += $this->writeFormatInformation($width, $mask, $i, $level);

-                $blacks  = (int)(100 * $blacks / ($width * $width));

-                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);

+                $blacks  = (int) (100 * $blacks / ($width * $width));

+                $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);

                 $demerit += $this->evaluateSymbol($width, $mask);

                 

-                if($demerit < $minDemerit) {

+                if ($demerit < $minDemerit) {

                     $minDemerit = $demerit;

                     $bestMask = $mask;

                     $bestMaskNum = $i;

@@ -2866,10 +2866,10 @@ 
         //----------------------------------------------------------------------

         public function __construct(QRinput $input)

         {

-            $spec = array(0,0,0,0,0);

+            $spec = array(0, 0, 0, 0, 0);

             

             $this->datacode = $input->getByteStream();

-            if(is_null($this->datacode)) {

+            if (is_null($this->datacode)) {

                 throw new Exception('null imput string');

             }

 

@@ -2883,7 +2883,7 @@ 
             $this->blocks = QRspec::rsBlockNum($spec);

             

             $ret = $this->init($spec);

-            if($ret < 0) {

+            if ($ret < 0) {

                 throw new Exception('block alloc error');

                 return null;

             }

@@ -2902,29 +2902,29 @@ 
             $blockNo = 0;

             $dataPos = 0;

             $eccPos = 0;

-            for($i=0; $i<QRspec::rsBlockNum1($spec); $i++) {

-                $ecc = array_slice($this->ecccode,$eccPos);

-                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el,  $ecc, $rs);

-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

+            for ($i = 0; $i < QRspec::rsBlockNum1($spec); $i++) {

+                $ecc = array_slice($this->ecccode, $eccPos);

+                $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);

                 

                 $dataPos += $dl;

                 $eccPos += $el;

                 $blockNo++;

             }

 

-            if(QRspec::rsBlockNum2($spec) == 0)

+            if (QRspec::rsBlockNum2($spec) == 0)

                 return 0;

 

             $dl = QRspec::rsDataCodes2($spec);

             $el = QRspec::rsEccCodes2($spec);

             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

-            if($rs == null) return -1;

+            if ($rs == null) return -1;

             

-            for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

-                $ecc = array_slice($this->ecccode,$eccPos);

+            for ($i = 0; $i < QRspec::rsBlockNum2($spec); $i++) {

+                $ecc = array_slice($this->ecccode, $eccPos);

                 $this->rsblocks[$blockNo] = new QRrsblock($dl, array_slice($this->datacode, $dataPos), $el, $ecc, $rs);

-                $this->ecccode = array_merge(array_slice($this->ecccode,0, $eccPos), $ecc);

+                $this->ecccode = array_merge(array_slice($this->ecccode, 0, $eccPos), $ecc);

                 

                 $dataPos += $dl;

                 $eccPos += $el;

@@ -2939,14 +2939,14 @@ 
         {

             $ret = 0;

 

-            if($this->count < $this->dataLength) {

+            if ($this->count < $this->dataLength) {

                 $row = $this->count % $this->blocks;

                 $col = $this->count / $this->blocks;

-                if($col >= $this->rsblocks[0]->dataLength) {

+                if ($col >= $this->rsblocks[0]->dataLength) {

                     $row += $this->b1;

                 }

                 $ret = $this->rsblocks[$row]->data[$col];

-            } else if($this->count < $this->dataLength + $this->eccLength) {

+            } else if ($this->count < $this->dataLength + $this->eccLength) {

                 $row = ($this->count - $this->dataLength) % $this->blocks;

                 $col = ($this->count - $this->dataLength) / $this->blocks;

                 $ret = $this->rsblocks[$row]->ecc[$col];

@@ -2970,10 +2970,10 @@ 
         //----------------------------------------------------------------------

         public function encodeMask(QRinput $input, $mask)

         {

-            if($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

+            if ($input->getVersion() < 0 || $input->getVersion() > QRSPEC_VERSION_MAX) {

                 throw new Exception('wrong version');

             }

-            if($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

+            if ($input->getErrorCorrectionLevel() > QR_ECLEVEL_H) {

                 throw new Exception('wrong level');

             }

 

@@ -2986,15 +2986,15 @@ 
             $frame = QRspec::newFrame($version);

             

             $filler = new FrameFiller($width, $frame);

-            if(is_null($filler)) {

+            if (is_null($filler)) {

                 return null;

             }

 

             // inteleaved data and ecc codes

-            for($i=0; $i<$raw->dataLength + $raw->eccLength; $i++) {

+            for ($i = 0; $i < $raw->dataLength + $raw->eccLength; $i++) {

                 $code = $raw->getCode();

                 $bit = 0x80;

-                for($j=0; $j<8; $j++) {

+                for ($j = 0; $j < 8; $j++) {

                     $addr = $filler->next();

                     $filler->setFrameAt($addr, 0x02 | (($bit & $code) != 0));

                     $bit = $bit >> 1;

@@ -3007,7 +3007,7 @@ 
             

             // remainder bits

             $j = QRspec::getRemainder($version);

-            for($i=0; $i<$j; $i++) {

+            for ($i = 0; $i < $j; $i++) {

                 $addr = $filler->next();

                 $filler->setFrameAt($addr, 0x02);

             }

@@ -3018,7 +3018,7 @@ 
             

             // masking

             $maskObj = new QRmask();

-            if($mask < 0) {

+            if ($mask < 0) {

             

                 if (QR_FIND_BEST_MASK) {

                     $masked = $maskObj->mask($width, $frame, $input->getErrorCorrectionLevel());

@@ -3029,7 +3029,7 @@ 
                 $masked = $maskObj->makeMask($width, $frame, $mask, $input->getErrorCorrectionLevel());

             }

             

-            if($masked == null) {

+            if ($masked == null) {

                 return null;

             }

             

@@ -3051,16 +3051,16 @@ 
         //----------------------------------------------------------------------

         public function encodeString8bit($string, $version, $level)

         {

-            if(string == null) {

+            if (string == null) {

                 throw new Exception('empty string!');

                 return null;

             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if ($input == null) return null;

 

             $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));

-            if($ret < 0) {

+            if ($ret < 0) {

                 unset($input);

                 return null;

             }

@@ -3071,16 +3071,16 @@ 
         public function encodeString($string, $version, $level, $hint, $casesensitive)

         {

 

-            if($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

+            if ($hint != QR_MODE_8 && $hint != QR_MODE_KANJI) {

                 throw new Exception('bad hint');

                 return null;

             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if ($input == null) return null;

 

             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

-            if($ret < 0) {

+            if ($ret < 0) {

                 return null;

             }

 

@@ -3088,10 +3088,10 @@ 
         }

         

         //----------------------------------------------------------------------

-        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint=false) 

+        public static function png($text, $outfile = false, $level = QR_ECLEVEL_L, $size = 3, $margin = 4, $saveandprint = false) 

         {

             $enc = QRencode::factory($level, $size, $margin);

-            return $enc->encodePNG($text, $outfile, $saveandprint=false);

+            return $enc->encodePNG($text, $outfile, $saveandprint = false);

         }

 

         //----------------------------------------------------------------------

@@ -3148,7 +3148,7 @@ 
         {

             do {

             

-                if($this->bit == -1) {

+                if ($this->bit == -1) {

                     $this->bit = 0;

                     return array('x'=>$this->x, 'y'=>$this->y);

                 }

@@ -3157,7 +3157,7 @@ 
                 $y = $this->y;

                 $w = $this->width;

 

-                if($this->bit == 0) {

+                if ($this->bit == 0) {

                     $x--;

                     $this->bit++;

                 } else {

@@ -3166,33 +3166,33 @@ 
                     $this->bit--;

                 }

 

-                if($this->dir < 0) {

-                    if($y < 0) {

+                if ($this->dir < 0) {

+                    if ($y < 0) {

                         $y = 0;

                         $x -= 2;

                         $this->dir = 1;

-                        if($x == 6) {

+                        if ($x == 6) {

                             $x--;

                             $y = 9;

                         }

                     }

                 } else {

-                    if($y == $w) {

+                    if ($y == $w) {

                         $y = $w - 1;

                         $x -= 2;

                         $this->dir = -1;

-                        if($x == 6) {

+                        if ($x == 6) {

                             $x--;

                             $y -= 8;

                         }

                     }

                 }

-                if($x < 0 || $y < 0) return null;

+                if ($x < 0 || $y < 0) return null;

 

                 $this->x = $x;

                 $this->y = $y;

 

-            } while(ord($this->frame[$y][$x]) & 0x80);

+            } while (ord($this->frame[$y][$x]) & 0x80);

                         

             return array('x'=>$x, 'y'=>$y);

         }

@@ -3255,7 +3255,7 @@ 
         {

             $code = new QRcode();

 

-            if($this->eightbit) {

+            if ($this->eightbit) {

                 $code->encodeString8bit($intext, $this->version, $this->level);

             } else {

                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

@@ -3269,7 +3269,7 @@ 
         {

             $code = new QRcode();

 

-            if($this->eightbit) {

+            if ($this->eightbit) {

                 $code->encodeString8bit($intext, $this->version, $this->level);

             } else {

                 $code->encodeString($intext, $this->version, $this->level, $this->hint, $this->casesensitive);

@@ -3277,7 +3277,7 @@ 
             

             QRtools::markTime('after_encode');

             

-            if ($outfile!== false) {

+            if ($outfile !== false) {

                 file_put_contents($outfile, join("\n", QRtools::binarize($code->data)));

             } else {

                 return QRtools::binarize($code->data);

@@ -3285,7 +3285,7 @@ 
         }

         

         //----------------------------------------------------------------------

-        public function encodePNG($intext, $outfile = false,$saveandprint=false) 

+        public function encodePNG($intext, $outfile = false, $saveandprint = false) 

         {

             try {

             

@@ -3297,9 +3297,9 @@ 
                 if ($err != '')

                     QRtools::log($outfile, $err);

                 

-                $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

+                $maxSize = (int) (QR_PNG_MAXIMUM_SIZE / (count($tab) + 2 * $this->margin));

                 

-                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin,$saveandprint);

+                QRimage::png($tab, $outfile, min(max(1, $this->size), $maxSize), $this->margin, $saveandprint);

             

             } catch (Exception $e) {

             

Braces +194 added lines, -109 removed lines

@@ -176,8 +176,9 @@ 
         {

             $barcode_array = array();

             

-            if (!is_array($mode))

-                $mode = explode(',', $mode);

+            if (!is_array($mode)) {
+                            $mode = explode(',', $mode);
+            }
                 

             $eccLevel = 'L';

                 

@@ -194,8 +195,9 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach(str_split($line) as $char) {
+                                    $arrAdd[] = ($char=='1')?1:0;
+                }
                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -223,8 +225,9 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+				for ($maskNo=0; $maskNo<8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
             }

 			

 			QRtools::markTime('after_build_cache');

@@ -261,8 +264,9 @@ 
             list($usec, $sec) = explode(" ", microtime());

             $time = ((float)$usec + (float)$sec);

             

-            if (!isset($GLOBALS['qr_time_bench']))

-                $GLOBALS['qr_time_bench'] = array();

+            if (!isset($GLOBALS['qr_time_bench'])) {
+                            $GLOBALS['qr_time_bench'] = array();
+            }
             

             $GLOBALS['qr_time_bench'][$markerId] = $time;

         }

@@ -427,8 +431,9 @@ 
 

             for($i=1; $i<= QRSPEC_VERSION_MAX; $i++) {

                 $words  = self::$capacity[$i][QRCAP_WORDS] - self::$capacity[$i][QRCAP_EC][$level];

-                if($words >= $size) 

-                    return $i;

+                if($words >= $size) {
+                                    return $i;
+                }
             }

 

             return -1;

@@ -446,8 +451,9 @@ 
         //----------------------------------------------------------------------

         public static function lengthIndicator($mode, $version)

         {

-            if ($mode == QR_MODE_STRUCTURE)

-                return 0;

+            if ($mode == QR_MODE_STRUCTURE) {
+                            return 0;
+            }
                 

             if ($version <= 9) {

                 $l = 0;

@@ -463,8 +469,9 @@ 
         //----------------------------------------------------------------------

         public static function maximumWords($mode, $version)

         {

-            if($mode == QR_MODE_STRUCTURE) 

-                return 3;

+            if($mode == QR_MODE_STRUCTURE) {
+                            return 3;
+            }
                 

             if($version <= 9) {

                 $l = 0;

@@ -610,8 +617,9 @@ 
         //----------------------------------------------------------------------

         public static function putAlignmentPattern($version, &$frame, $width)

         {

-            if($version < 2)

-                return;

+            if($version < 2) {
+                            return;
+            }
 

             $d = self::$alignmentPattern[$version][1] - self::$alignmentPattern[$version][0];

             if($d < 0) {

@@ -663,8 +671,9 @@ 
         //----------------------------------------------------------------------

         public static function getVersionPattern($version)

         {

-            if($version < 7 || $version > QRSPEC_VERSION_MAX)

-                return 0;

+            if($version < 7 || $version > QRSPEC_VERSION_MAX) {
+                            return 0;
+            }
 

             return self::$versionPattern[$version -7];

         }

@@ -681,11 +690,13 @@ 
 

         public static function getFormatInfo($mask, $level)

         {

-            if($mask < 0 || $mask > 7)

-                return 0;

+            if($mask < 0 || $mask > 7) {
+                            return 0;
+            }
                 

-            if($level < 0 || $level > 3)

-                return 0;                

+            if($level < 0 || $level > 3) {
+                            return 0;
+            }
 

             return self::$formatInfo[$level][$mask];

         }

@@ -865,8 +876,9 @@ 
         //----------------------------------------------------------------------

         public static function newFrame($version)

         {

-            if($version < 1 || $version > QRSPEC_VERSION_MAX) 

-                return null;

+            if($version < 1 || $version > QRSPEC_VERSION_MAX) {
+                            return null;
+            }
 

             if(!isset(self::$frames[$version])) {

                 

@@ -884,8 +896,9 @@ 
                 }

             }

             

-            if(is_null(self::$frames[$version]))

-                return null;

+            if(is_null(self::$frames[$version])) {
+                            return null;
+            }
 

             return self::$frames[$version];

         }

@@ -950,7 +963,7 @@ 
                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else{

                     ImagePng($image, $filename);

                 }

             }

@@ -1210,8 +1223,9 @@ 
         {

             $bits = 0;

 

-            if($version == 0) 

-                $version = 1;

+            if($version == 0) {
+                            $version = 1;
+            }
 

             switch($this->mode) {

                 case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

@@ -1270,8 +1284,9 @@ 
                             break;

                     }

                     

-                    if($ret < 0)

-                        return -1;

+                    if($ret < 0) {
+                                            return -1;
+                    }
                 }

 

                 return $this->bstream->size();

@@ -1488,8 +1503,9 @@ 
         //----------------------------------------------------------------------

         public static function checkModeKanji($size, $data)

         {

-            if($size & 1)

-                return false;

+            if($size & 1) {
+                            return false;
+            }
 

             for($i=0; $i<$size; $i+=2) {

                 $val = (ord($data[$i]) << 8) | ord($data[$i+1]);

@@ -1509,8 +1525,9 @@ 
 

         public static function check($mode, $size, $data)

         {

-            if($size <= 0) 

-                return false;

+            if($size <= 0) {
+                            return false;
+            }
 

             switch($mode) {

                 case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

@@ -1575,8 +1592,9 @@ 
                     $chunks = (int)($payload / 11);

                     $remain = $payload - $chunks * 11;

                     $size = $chunks * 2;

-                    if($remain >= 6) 

-                        $size++;

+                    if($remain >= 6) {
+                                            $size++;
+                    }
                     break;

                 case QR_MODE_8:

                     $size = (int)($payload / 8);

@@ -1593,8 +1611,12 @@ 
             }

             

             $maxsize = QRspec::maximumWords($mode, $version);

-            if($size < 0) $size = 0;

-            if($size > $maxsize) $size = $maxsize;

+            if($size < 0) {
+                $size = 0;
+            }
+            if($size > $maxsize) {
+                $size = $maxsize;
+            }
 

             return $size;

         }

@@ -1607,8 +1629,9 @@ 
             foreach($this->items as $item) {

                 $bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $total += $bits;

             }

@@ -1627,8 +1650,9 @@ 
             for(;;) {

                 $bits = $this->createBitStream();

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

                 if($ver < 0) {

@@ -1665,8 +1689,9 @@ 
             $padding = new QRbitstream();

             $ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-            if($ret < 0) 

-                return $ret;

+            if($ret < 0) {
+                            return $ret;
+            }
 

             $padlen = $maxwords - $words;

             

@@ -1679,8 +1704,9 @@ 
                 

                 $ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

-                    return $ret;

+                if($ret < 0) {
+                                    return $ret;
+                }
                 

             }

 

@@ -1857,13 +1883,15 @@ 
         //----------------------------------------------------------------------

         public function appendNum($bits, $num)

         {

-            if ($bits == 0) 

-                return 0;

+            if ($bits == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromNum($bits, $num);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -1874,13 +1902,15 @@ 
         //----------------------------------------------------------------------

         public function appendBytes($size, $data)

         {

-            if ($size == 0) 

-                return 0;

+            if ($size == 0) {
+                            return 0;
+            }
 

             $b = QRbitstream::newFromBytes($size, $data);

             

-            if(is_null($b))

-                return -1;

+            if(is_null($b)) {
+                            return -1;
+            }
 

             $ret = $this->append($b);

             unset($b);

@@ -1984,8 +2014,9 @@ 
         //----------------------------------------------------------------------

         public static function isdigitat($str, $pos)

         {    

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
             

             return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

         }

@@ -1993,8 +2024,9 @@ 
         //----------------------------------------------------------------------

         public static function isalnumat($str, $pos)

         {

-            if ($pos >= strlen($str))

-                return false;

+            if ($pos >= strlen($str)) {
+                            return false;
+            }
                 

             return (QRinput::lookAnTable(ord($str[$pos])) >= 0);

         }

@@ -2002,8 +2034,9 @@ 
         //----------------------------------------------------------------------

         public function identifyMode($pos)

         {

-            if ($pos >= strlen($this->dataStr)) 

-                return QR_MODE_NUL;

+            if ($pos >= strlen($this->dataStr)) {
+                            return QR_MODE_NUL;
+            }
                 

             $c = $this->dataStr[$pos];

             

@@ -2057,8 +2090,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2104,8 +2138,9 @@ 
             }

 

             $ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2120,8 +2155,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2175,8 +2211,9 @@ 
             $run = $p;

             $ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $run;

         }

@@ -2186,8 +2223,9 @@ 
         {

             while (strlen($this->dataStr) > 0)

             {

-                if($this->dataStr == '')

-                    return 0;

+                if($this->dataStr == '') {
+                                    return 0;
+                }
 

                 $mode = $this->identifyMode(0);

                 

@@ -2195,16 +2233,22 @@ 
                     case QR_MODE_NUM: $length = $this->eatNum(); break;

                     case QR_MODE_AN:  $length = $this->eatAn(); break;

                     case QR_MODE_KANJI:

-                        if ($this->modeHint == QR_MODE_KANJI)

-                                $length = $this->eatKanji();

-                        else    $length = $this->eat8();

+                        if ($this->modeHint == QR_MODE_KANJI) {
+                                                        $length = $this->eatKanji();
+                        } else {
+                            $length = $this->eat8();
+                        }
                         break;

                     default: $length = $this->eat8(); break;

                 

                 }

 

-                if($length == 0) return 0;

-                if($length < 0)  return -1;

+                if($length == 0) {
+                    return 0;
+                }
+                if($length < 0) {
+                    return -1;
+                }
                 

                 $this->dataStr = substr($this->dataStr, $length);

             }

@@ -2240,8 +2284,9 @@ 
 

             $split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

-                $split->toUpper();

+            if(!$casesensitive) {
+                            $split->toUpper();
+            }
                 

             return $split->splitString();

         }

@@ -2318,11 +2363,23 @@ 
             $rs = null;

             

             // Check parameter ranges

-            if($symsize < 0 || $symsize > 8)                     return $rs;

-            if($fcr < 0 || $fcr >= (1<<$symsize))                return $rs;

-            if($prim <= 0 || $prim >= (1<<$symsize))             return $rs;

-            if($nroots < 0 || $nroots >= (1<<$symsize))          return $rs; // Can't have more roots than symbol values!

-            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) return $rs; // Too much padding

+            if($symsize < 0 || $symsize > 8) {
+                return $rs;
+            }
+            if($fcr < 0 || $fcr >= (1<<$symsize)) {
+                return $rs;
+            }
+            if($prim <= 0 || $prim >= (1<<$symsize)) {
+                return $rs;
+            }
+            if($nroots < 0 || $nroots >= (1<<$symsize)) {
+                return $rs;
+            }
+            // Can't have more roots than symbol values!

+            if($pad < 0 || $pad >= ((1<<$symsize) -1 - $nroots)) {
+                return $rs;
+            }
+            // Too much padding

 

             $rs = new QRrsItem();

             $rs->mm = $symsize;

@@ -2388,8 +2445,9 @@ 
             }

             

             // convert rs->genpoly[] to index form for quicker encoding

-            for ($i = 0; $i <= $nroots; $i++)

-                $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];

+            for ($i = 0; $i <= $nroots; $i++) {
+                            $rs->genpoly[$i] = $rs->index_of[$rs->genpoly[$i]];
+            }
 

             return $rs;

         }

@@ -2447,12 +2505,24 @@ 
         public static function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad)

         {

             foreach(self::$items as $rs) {

-                if($rs->pad != $pad)       continue;

-                if($rs->nroots != $nroots) continue;

-                if($rs->mm != $symsize)    continue;

-                if($rs->gfpoly != $gfpoly) continue;

-                if($rs->fcr != $fcr)       continue;

-                if($rs->prim != $prim)     continue;

+                if($rs->pad != $pad) {
+                    continue;
+                }
+                if($rs->nroots != $nroots) {
+                    continue;
+                }
+                if($rs->mm != $symsize) {
+                    continue;
+                }
+                if($rs->gfpoly != $gfpoly) {
+                    continue;
+                }
+                if($rs->fcr != $fcr) {
+                    continue;
+                }
+                if($rs->prim != $prim) {
+                    continue;
+                }
 

                 return $rs;

             }

@@ -2591,8 +2661,9 @@ 
         {

             $codeArr = array();

             

-            foreach ($bitFrame as $line)

-                $codeArr[] = join('', $line);

+            foreach ($bitFrame as $line) {
+                            $codeArr[] = join('', $line);
+            }
                 

             return gzcompress(join("\n", $codeArr), 9);

         }

@@ -2603,8 +2674,9 @@ 
             $codeArr = array();

             

             $codeLines = explode("\n", gzuncompress($code));

-            foreach ($codeLines as $line)

-                $codeArr[] = str_split($line);

+            foreach ($codeLines as $line) {
+                            $codeArr[] = str_split($line);
+            }
             

             return $codeArr;

         }

@@ -2622,16 +2694,18 @@ 
                     $bitMask = self::unserial(file_get_contents($fileName));

                 } else {

                     $bitMask = $this->generateMaskNo($maskNo, $width, $s);

-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))

-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);

+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
+                                            mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                    }
                     file_put_contents($fileName, self::serial($bitMask));

                 }

             } else {

                 $bitMask = $this->generateMaskNo($maskNo, $width, $s);

             }

 

-            if ($maskGenOnly)

-                return;

+            if ($maskGenOnly) {
+                            return;
+            }
                 

             $d = $s;

 

@@ -2698,8 +2772,9 @@ 
                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y>0) {
+                                    $frameYM = $frame[$y-1];
+                }
                 

                 for($x=0; $x<$width; $x++) {

                     if(($x > 0) && ($y > 0)) {

@@ -2912,14 +2987,17 @@ 
                 $blockNo++;

             }

 

-            if(QRspec::rsBlockNum2($spec) == 0)

-                return 0;

+            if(QRspec::rsBlockNum2($spec) == 0) {
+                            return 0;
+            }
 

             $dl = QRspec::rsDataCodes2($spec);

             $el = QRspec::rsEccCodes2($spec);

             $rs = QRrs::init_rs(8, 0x11d, 0, 1, $el, 255 - $dl - $el);

             

-            if($rs == null) return -1;

+            if($rs == null) {
+                return -1;
+            }
             

             for($i=0; $i<QRspec::rsBlockNum2($spec); $i++) {

                 $ecc = array_slice($this->ecccode,$eccPos);

@@ -3057,7 +3135,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if($input == null) {
+                return null;
+            }
 

             $ret = $input->append(QR_MODE_8, strlen($string), str_split($string));

             if($ret < 0) {

@@ -3077,7 +3157,9 @@ 
             }

 

             $input = new QRinput($version, $level);

-            if($input == null) return null;

+            if($input == null) {
+                return null;
+            }
 

             $ret = QRsplit::splitStringToQRinput($string, $input, $hint, $casesensitive);

             if($ret < 0) {

@@ -3187,7 +3269,9 @@ 
                         }

                     }

                 }

-                if($x < 0 || $y < 0) return null;

+                if($x < 0 || $y < 0) {
+                    return null;
+                }
 

                 $this->x = $x;

                 $this->y = $y;

@@ -3294,8 +3378,9 @@ 
                 $err = ob_get_contents();

                 ob_end_clean();

                 

-                if ($err != '')

-                    QRtools::log($outfile, $err);

+                if ($err != '') {
+                                    QRtools::log($outfile, $err);
+                }
                 

                 $maxSize = (int)(QR_PNG_MAXIMUM_SIZE / (count($tab)+2*$this->margin));

                 

lib/phpqrcode/qrmask.php

Spacing +61 added lines, -61 removed lines

@@ -44,10 +44,10 @@ 
         public function writeFormatInformation($width, &$frame, $mask, $level)

         {

             $blacks = 0;

-            $format =  QRspec::getFormatInfo($mask, $level);

+            $format = QRspec::getFormatInfo($mask, $level);

 

-            for($i=0; $i<8; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 8; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -55,7 +55,7 @@ 
                 }

                 

                 $frame[8][$width - 1 - $i] = chr($v);

-                if($i < 6) {

+                if ($i < 6) {

                     $frame[$i][8] = chr($v);

                 } else {

                     $frame[$i + 1][8] = chr($v);

@@ -63,8 +63,8 @@ 
                 $format = $format >> 1;

             }

             

-            for($i=0; $i<7; $i++) {

-                if($format & 1) {

+            for ($i = 0; $i < 7; $i++) {

+                if ($format & 1) {

                     $blacks += 2;

                     $v = 0x85;

                 } else {

@@ -72,7 +72,7 @@ 
                 }

                 

                 $frame[$width - 7 + $i][8] = chr($v);

-                if($i == 0) {

+                if ($i == 0) {

                     $frame[8][7] = chr($v);

                 } else {

                     $frame[8][6 - $i] = chr($v);

@@ -85,27 +85,27 @@ 
         }

         

         //----------------------------------------------------------------------

-        public function mask0($x, $y) { return ($x+$y)&1;                       }

-        public function mask1($x, $y) { return ($y&1);                          }

-        public function mask2($x, $y) { return ($x%3);                          }

-        public function mask3($x, $y) { return ($x+$y)%3;                       }

-        public function mask4($x, $y) { return (((int)($y/2))+((int)($x/3)))&1; }

-        public function mask5($x, $y) { return (($x*$y)&1)+($x*$y)%3;           }

-        public function mask6($x, $y) { return ((($x*$y)&1)+($x*$y)%3)&1;       }

-        public function mask7($x, $y) { return ((($x*$y)%3)+(($x+$y)&1))&1;     }

+        public function mask0($x, $y) { return ($x + $y) & 1; }

+        public function mask1($x, $y) { return ($y & 1); }

+        public function mask2($x, $y) { return ($x % 3); }

+        public function mask3($x, $y) { return ($x + $y) % 3; }

+        public function mask4($x, $y) { return (((int) ($y / 2)) + ((int) ($x / 3))) & 1; }

+        public function mask5($x, $y) { return (($x * $y) & 1) + ($x * $y) % 3; }

+        public function mask6($x, $y) { return ((($x * $y) & 1) + ($x * $y) % 3) & 1; }

+        public function mask7($x, $y) { return ((($x * $y) % 3) + (($x + $y) & 1)) & 1; }

         

         //----------------------------------------------------------------------

         private function generateMaskNo($maskNo, $width, $frame)

         {

             $bitMask = array_fill(0, $width, array_fill(0, $width, 0));

             

-            for($y=0; $y<$width; $y++) {

-                for($x=0; $x<$width; $x++) {

-                    if(ord($frame[$y][$x]) & 0x80) {

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

+                    if (ord($frame[$y][$x]) & 0x80) {

                         $bitMask[$y][$x] = 0;

                     } else {

                         $maskFunc = call_user_func(array($this, 'mask'.$maskNo), $x, $y);

-                        $bitMask[$y][$x] = ($maskFunc == 0)?1:0;

+                        $bitMask[$y][$x] = ($maskFunc == 0) ? 1 : 0;

                     }

                     

                 }

@@ -163,12 +163,12 @@ 
                 

             $d = $s;

 

-            for($y=0; $y<$width; $y++) {

-                for($x=0; $x<$width; $x++) {

-                    if($bitMask[$y][$x] == 1) {

-                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

+                    if ($bitMask[$y][$x] == 1) {

+                        $d[$y][$x] = chr(ord($s[$y][$x]) ^ (int) $bitMask[$y][$x]);

                     }

-                    $b += (int)(ord($d[$y][$x]) & 1);

+                    $b += (int) (ord($d[$y][$x]) & 1);

                 }

             }

 

@@ -190,21 +190,21 @@ 
         {

             $demerit = 0;

 

-            for($i=0; $i<$length; $i++) {

+            for ($i = 0; $i < $length; $i++) {

                 

-                if($this->runLength[$i] >= 5) {

+                if ($this->runLength[$i] >= 5) {

                     $demerit += (N1 + ($this->runLength[$i] - 5));

                 }

-                if($i & 1) {

-                    if(($i >= 3) && ($i < ($length-2)) && ($this->runLength[$i] % 3 == 0)) {

-                        $fact = (int)($this->runLength[$i] / 3);

-                        if(($this->runLength[$i-2] == $fact) &&

-                           ($this->runLength[$i-1] == $fact) &&

-                           ($this->runLength[$i+1] == $fact) &&

-                           ($this->runLength[$i+2] == $fact)) {

-                            if(($this->runLength[$i-3] < 0) || ($this->runLength[$i-3] >= (4 * $fact))) {

+                if ($i & 1) {

+                    if (($i >= 3) && ($i < ($length - 2)) && ($this->runLength[$i] % 3 == 0)) {

+                        $fact = (int) ($this->runLength[$i] / 3);

+                        if (($this->runLength[$i - 2] == $fact) &&

+                           ($this->runLength[$i - 1] == $fact) &&

+                           ($this->runLength[$i + 1] == $fact) &&

+                           ($this->runLength[$i + 2] == $fact)) {

+                            if (($this->runLength[$i - 3] < 0) || ($this->runLength[$i - 3] >= (4 * $fact))) {

                                 $demerit += N3;

-                            } else if((($i+3) >= $length) || ($this->runLength[$i+3] >= (4 * $fact))) {

+                            } else if ((($i + 3) >= $length) || ($this->runLength[$i + 3] >= (4 * $fact))) {

                                 $demerit += N3;

                             }

                         }

@@ -220,30 +220,30 @@ 
             $head = 0;

             $demerit = 0;

 

-            for($y=0; $y<$width; $y++) {

+            for ($y = 0; $y < $width; $y++) {

                 $head = 0;

                 $this->runLength[0] = 1;

                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y > 0)

+                    $frameYM = $frame[$y - 1];

                 

-                for($x=0; $x<$width; $x++) {

-                    if(($x > 0) && ($y > 0)) {

-                        $b22 = ord($frameY[$x]) & ord($frameY[$x-1]) & ord($frameYM[$x]) & ord($frameYM[$x-1]);

-                        $w22 = ord($frameY[$x]) | ord($frameY[$x-1]) | ord($frameYM[$x]) | ord($frameYM[$x-1]);

+                for ($x = 0; $x < $width; $x++) {

+                    if (($x > 0) && ($y > 0)) {

+                        $b22 = ord($frameY[$x]) & ord($frameY[$x - 1]) & ord($frameYM[$x]) & ord($frameYM[$x - 1]);

+                        $w22 = ord($frameY[$x]) | ord($frameY[$x - 1]) | ord($frameYM[$x]) | ord($frameYM[$x - 1]);

                         

-                        if(($b22 | ($w22 ^ 1))&1) {                                                                     

+                        if (($b22 | ($w22 ^ 1)) & 1) {                                                                     

                             $demerit += N2;

                         }

                     }

-                    if(($x == 0) && (ord($frameY[$x]) & 1)) {

+                    if (($x == 0) && (ord($frameY[$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($x > 0) {

-                        if((ord($frameY[$x]) ^ ord($frameY[$x-1])) & 1) {

+                    } else if ($x > 0) {

+                        if ((ord($frameY[$x]) ^ ord($frameY[$x - 1])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -252,20 +252,20 @@ 
                     }

                 }

     

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

-            for($x=0; $x<$width; $x++) {

+            for ($x = 0; $x < $width; $x++) {

                 $head = 0;

                 $this->runLength[0] = 1;

                 

-                for($y=0; $y<$width; $y++) {

-                    if($y == 0 && (ord($frame[$y][$x]) & 1)) {

+                for ($y = 0; $y < $width; $y++) {

+                    if ($y == 0 && (ord($frame[$y][$x]) & 1)) {

                         $this->runLength[0] = -1;

                         $head = 1;

                         $this->runLength[$head] = 1;

-                    } else if($y > 0) {

-                        if((ord($frame[$y][$x]) ^ ord($frame[$y-1][$x])) & 1) {

+                    } else if ($y > 0) {

+                        if ((ord($frame[$y][$x]) ^ ord($frame[$y - 1][$x])) & 1) {

                             $head++;

                             $this->runLength[$head] = 1;

                         } else {

@@ -274,7 +274,7 @@ 
                     }

                 }

             

-                $demerit += $this->calcN1N3($head+1);

+                $demerit += $this->calcN1N3($head + 1);

             }

 

             return $demerit;

@@ -288,13 +288,13 @@ 
             $bestMaskNum = 0;

             $bestMask = array();

             

-            $checked_masks = array(0,1,2,3,4,5,6,7);

+            $checked_masks = array(0, 1, 2, 3, 4, 5, 6, 7);

             

             if (QR_FIND_FROM_RANDOM !== false) {

             

-                $howManuOut = 8-(QR_FIND_FROM_RANDOM % 9);

-                for ($i = 0; $i <  $howManuOut; $i++) {

-                    $remPos = rand (0, count($checked_masks)-1);

+                $howManuOut = 8 - (QR_FIND_FROM_RANDOM % 9);

+                for ($i = 0; $i < $howManuOut; $i++) {

+                    $remPos = rand(0, count($checked_masks) - 1);

                     unset($checked_masks[$remPos]);

                     $checked_masks = array_values($checked_masks);

                 }

@@ -303,18 +303,18 @@ 
             

             $bestMask = $frame;

              

-            foreach($checked_masks as $i) {

+            foreach ($checked_masks as $i) {

                 $mask = array_fill(0, $width, str_repeat("\0", $width));

 

                 $demerit = 0;

                 $blacks = 0;

                 $blacks  = $this->makeMaskNo($i, $width, $frame, $mask);

                 $blacks += $this->writeFormatInformation($width, $mask, $i, $level);

-                $blacks  = (int)(100 * $blacks / ($width * $width));

-                $demerit = (int)((int)(abs($blacks - 50) / 5) * N4);

+                $blacks  = (int) (100 * $blacks / ($width * $width));

+                $demerit = (int) ((int) (abs($blacks - 50) / 5) * N4);

                 $demerit += $this->evaluateSymbol($width, $mask);

                 

-                if($demerit < $minDemerit) {

+                if ($demerit < $minDemerit) {

                     $minDemerit = $demerit;

                     $bestMask = $mask;

                     $bestMaskNum = $i;

Braces +15 added lines, -10 removed lines

@@ -119,8 +119,9 @@ 
         {

             $codeArr = array();

             

-            foreach ($bitFrame as $line)

-                $codeArr[] = join('', $line);

+            foreach ($bitFrame as $line) {
+                            $codeArr[] = join('', $line);
+            }
                 

             return gzcompress(join("\n", $codeArr), 9);

         }

@@ -131,8 +132,9 @@ 
             $codeArr = array();

             

             $codeLines = explode("\n", gzuncompress($code));

-            foreach ($codeLines as $line)

-                $codeArr[] = str_split($line);

+            foreach ($codeLines as $line) {
+                            $codeArr[] = str_split($line);
+            }
             

             return $codeArr;

         }

@@ -150,16 +152,18 @@ 
                     $bitMask = self::unserial(file_get_contents($fileName));

                 } else {

                     $bitMask = $this->generateMaskNo($maskNo, $width, $s);

-                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo))

-                        mkdir(QR_CACHE_DIR.'mask_'.$maskNo);

+                    if (!file_exists(QR_CACHE_DIR.'mask_'.$maskNo)) {
+                                            mkdir(QR_CACHE_DIR.'mask_'.$maskNo);
+                    }
                     file_put_contents($fileName, self::serial($bitMask));

                 }

             } else {

                 $bitMask = $this->generateMaskNo($maskNo, $width, $s);

             }

 

-            if ($maskGenOnly)

-                return;

+            if ($maskGenOnly) {
+                            return;
+            }
                 

             $d = $s;

 

@@ -226,8 +230,9 @@ 
                 

                 $frameY = $frame[$y];

                 

-                if ($y>0)

-                    $frameYM = $frame[$y-1];

+                if ($y>0) {
+                                    $frameYM = $frame[$y-1];
+                }
                 

                 for($x=0; $x<$width; $x++) {

                     if(($x > 0) && ($y > 0)) {

Indentation +8 added lines, -8 removed lines

@@ -25,17 +25,17 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	define('N1', 3);

-	define('N2', 3);

-	define('N3', 40);

-	define('N4', 10);

+    define('N1', 3);

+    define('N2', 3);

+    define('N3', 40);

+    define('N4', 10);

 

-	class QRmask {

+    class QRmask {

 	

-		public $runLength = array();

+        public $runLength = array();

 		

-		//----------------------------------------------------------------------

-		public function __construct() 

+        //----------------------------------------------------------------------

+        public function __construct() 

         {

             $this->runLength = array_fill(0, QRSPEC_WIDTH_MAX + 1, 0);

         }

lib/phpqrcode/qrconfig.php

Spacing +7 added lines, -7 removed lines

@@ -5,13 +5,13 @@
  * Config file, feel free to modify

  */

      

-    define('QR_CACHEABLE', true);                                                               // use cache - more disk reads but less CPU power, masks and format templates are stored there

-    define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR);  // used when QR_CACHEABLE === true

-    define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR);                                // default error logs dir   

+    define('QR_CACHEABLE', true); // use cache - more disk reads but less CPU power, masks and format templates are stored there

+    define('QR_CACHE_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR.'cache'.DIRECTORY_SEPARATOR); // used when QR_CACHEABLE === true

+    define('QR_LOG_DIR', dirname(__FILE__).DIRECTORY_SEPARATOR); // default error logs dir   

     

-    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

-    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

-    define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

+    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

+    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

+    define('QR_DEFAULT_MASK', 2); // when QR_FIND_BEST_MASK === false

                                                   

-    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

+    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

                                                   
\ No newline at end of file

Indentation +1 added lines, -1 removed lines

@@ -14,4 +14,4 @@
     define('QR_DEFAULT_MASK', 2);                                                               // when QR_FIND_BEST_MASK === false

                                                   

     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

-                                                  
\ No newline at end of file
+                                                    
\ No newline at end of file

lib/phpqrcode/index.php

Spacing +9 added lines, -9 removed lines

@@ -42,12 +42,12 @@ 
     //processing form input

     //remember to sanitize user input in real-life solution !!!

     $errorCorrectionLevel = 'L';

-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))

+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L', 'M', 'Q', 'H')))

         $errorCorrectionLevel = $_REQUEST['level'];    

 

     $matrixPointSize = 4;

     if (isset($_REQUEST['size']))

-        $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);

+        $matrixPointSize = min(max((int) $_REQUEST['size'], 1), 10);

 

 
     if (isset($_REQUEST['data'])) { 

@@ -73,17 +73,17 @@ 
     

     //config form

     echo '<form action="index.php" method="post">

-        Data:&nbsp;<input name="data" value="'.(isset($_REQUEST['data'])?htmlspecialchars($_REQUEST['data']):'PHP QR Code :)').'" />&nbsp;

+        Data:&nbsp;<input name="data" value="'.(isset($_REQUEST['data']) ?htmlspecialchars($_REQUEST['data']) : 'PHP QR Code :)').'" />&nbsp;

         ECC:&nbsp;<select name="level">

-            <option value="L"'.(($errorCorrectionLevel=='L')?' selected':'').'>L - smallest</option>

-            <option value="M"'.(($errorCorrectionLevel=='M')?' selected':'').'>M</option>

-            <option value="Q"'.(($errorCorrectionLevel=='Q')?' selected':'').'>Q</option>

-            <option value="H"'.(($errorCorrectionLevel=='H')?' selected':'').'>H - best</option>

+            <option value="L"'.(($errorCorrectionLevel == 'L') ? ' selected' : '').'>L - smallest</option>

+            <option value="M"'.(($errorCorrectionLevel == 'M') ? ' selected' : '').'>M</option>

+            <option value="Q"'.(($errorCorrectionLevel == 'Q') ? ' selected' : '').'>Q</option>

+            <option value="H"'.(($errorCorrectionLevel == 'H') ? ' selected' : '').'>H - best</option>

         </select>&nbsp;

         Size:&nbsp;<select name="size">';

         

-    for($i=1;$i<=10;$i++)

-        echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';

+    for ($i = 1; $i <= 10; $i++)

+        echo '<option value="'.$i.'"'.(($matrixPointSize == $i) ? ' selected' : '').'>'.$i.'</option>';

         

     echo '</select>&nbsp;

         <input type="submit" value="GENERATE"></form><hr/>';

Braces +15 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
     include "qrlib.php";    

     

     //ofcourse we need rights to create temp dir

-    if (!file_exists($PNG_TEMP_DIR))

-        mkdir($PNG_TEMP_DIR);
+    if (!file_exists($PNG_TEMP_DIR)) {
+            mkdir($PNG_TEMP_DIR);
+    }
     

     

     $filename = $PNG_TEMP_DIR.'test.png';

@@ -42,19 +43,22 @@ 
     //processing form input

     //remember to sanitize user input in real-life solution !!!

     $errorCorrectionLevel = 'L';

-    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))

-        $errorCorrectionLevel = $_REQUEST['level'];    

+    if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H'))) {
+            $errorCorrectionLevel = $_REQUEST['level'];
+    }
 

     $matrixPointSize = 4;

-    if (isset($_REQUEST['size']))

-        $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);

+    if (isset($_REQUEST['size'])) {
+            $matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);
+    }
 

 
     if (isset($_REQUEST['data'])) { 

     

         //it's very important!

-        if (trim($_REQUEST['data']) == '')

-            die('data cannot be empty! <a href="?">back</a>');

+        if (trim($_REQUEST['data']) == '') {
+                    die('data cannot be empty! <a href="?">back</a>');
+        }
             
         // user data

         $filename = $PNG_TEMP_DIR.'test'.md5($_REQUEST['data'].'|'.$errorCorrectionLevel.'|'.$matrixPointSize).'.png';
@@ -82,8 +86,9 @@ 
         </select>&nbsp;

         Size:&nbsp;<select name="size">';

         

-    for($i=1;$i<=10;$i++)

-        echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';

+    for($i=1;$i<=10;$i++) {
+            echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';
+    }
         

     echo '</select>&nbsp;

         <input type="submit" value="GENERATE"></form><hr/>';

lib/phpqrcode/qrtools.php

Spacing +12 added lines, -12 removed lines

@@ -30,8 +30,8 @@ 
             $len = count($frame);

             foreach ($frame as &$frameLine) {

                 

-                for($i=0; $i<$len; $i++) {

-                    $frameLine[$i] = (ord($frameLine[$i])&1)?'1':'0';

+                for ($i = 0; $i < $len; $i++) {

+                    $frameLine[$i] = (ord($frameLine[$i]) & 1) ? '1' : '0';

                 }

             }

             

@@ -61,8 +61,8 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach (str_split($line) as $char)

+                    $arrAdd[] = ($char == '1') ? 1 : 0;

                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -81,7 +81,7 @@ 
 			QRtools::markTime('before_build_cache');

 			

 			$mask = new QRmask();

-            for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {

+            for ($a = 1; $a <= QRSPEC_VERSION_MAX; $a++) {

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

                     $fileName = QR_CACHE_DIR.'frame_'.$a.'.png';

@@ -90,7 +90,7 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

+				for ($maskNo = 0; $maskNo < 8; $maskNo++)

 					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

             }

 			

@@ -115,8 +115,8 @@ 
         public static function dumpMask($frame) 

         {

             $width = count($frame);

-            for($y=0;$y<$width;$y++) {

-                for($x=0;$x<$width;$x++) {

+            for ($y = 0; $y < $width; $y++) {

+                for ($x = 0; $x < $width; $x++) {

                     echo ord($frame[$y][$x]).',';

                 }

             }

@@ -126,7 +126,7 @@ 
         public static function markTime($markerId)

         {

             list($usec, $sec) = explode(" ", microtime());

-            $time = ((float)$usec + (float)$sec);

+            $time = ((float) $usec + (float) $sec);

             

             if (!isset($GLOBALS['qr_time_bench']))

                 $GLOBALS['qr_time_bench'] = array();

@@ -147,9 +147,9 @@ 
                     <thead><tr style="border-bottom:1px solid silver"><td colspan="2" style="text-align:center">BENCHMARK</td></tr></thead>

                     <tbody>';

 

-            foreach($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

+            foreach ($GLOBALS['qr_time_bench'] as $markerId=>$thisTime) {

                 if ($p > 0) {

-                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime-$lastTime, 6).'s</td></tr>';

+                    echo '<tr><th style="text-align:right">till '.$markerId.': </th><td>'.number_format($thisTime - $lastTime, 6).'s</td></tr>';

                 } else {

                     $startTime = $thisTime;

                 }

@@ -159,7 +159,7 @@ 
             }

             

             echo '</tbody><tfoot>

-                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime-$startTime, 6).'s</td></tr>

+                <tr style="border-top:2px solid black"><th style="text-align:right">TOTAL: </th><td>'.number_format($lastTime - $startTime, 6).'s</td></tr>

             </tfoot>

             </table>';

         }

Braces +12 added lines, -8 removed lines

@@ -43,8 +43,9 @@ 
         {

             $barcode_array = array();

             

-            if (!is_array($mode))

-                $mode = explode(',', $mode);

+            if (!is_array($mode)) {
+                            $mode = explode(',', $mode);
+            }
                 

             $eccLevel = 'L';

                 

@@ -61,8 +62,9 @@ 
                 

             foreach ($qrTab as $line) {

                 $arrAdd = array();

-                foreach(str_split($line) as $char)

-                    $arrAdd[] = ($char=='1')?1:0;

+                foreach(str_split($line) as $char) {
+                                    $arrAdd[] = ($char=='1')?1:0;
+                }
                 $barcode_array['bcode'][] = $arrAdd;

             }

                     

@@ -90,8 +92,9 @@ 
 				

 				$width = count($frame);

 				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+				for ($maskNo=0; $maskNo<8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
             }

 			

 			QRtools::markTime('after_build_cache');

@@ -128,8 +131,9 @@ 
             list($usec, $sec) = explode(" ", microtime());

             $time = ((float)$usec + (float)$sec);

             

-            if (!isset($GLOBALS['qr_time_bench']))

-                $GLOBALS['qr_time_bench'] = array();

+            if (!isset($GLOBALS['qr_time_bench'])) {
+                            $GLOBALS['qr_time_bench'] = array();
+            }
             

             $GLOBALS['qr_time_bench'][$markerId] = $time;

         }

Indentation +7 added lines, -7 removed lines

@@ -78,9 +78,9 @@ 
         //----------------------------------------------------------------------

         public static function buildCache()

         {

-			QRtools::markTime('before_build_cache');

+            QRtools::markTime('before_build_cache');

 			

-			$mask = new QRmask();

+            $mask = new QRmask();

             for ($a=1; $a <= QRSPEC_VERSION_MAX; $a++) {

                 $frame = QRspec::newFrame($a);

                 if (QR_IMAGE) {

@@ -88,13 +88,13 @@ 
                     QRimage::png(self::binarize($frame), $fileName, 1, 0);

                 }

 				

-				$width = count($frame);

-				$bitMask = array_fill(0, $width, array_fill(0, $width, 0));

-				for ($maskNo=0; $maskNo<8; $maskNo++)

-					$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

+                $width = count($frame);

+                $bitMask = array_fill(0, $width, array_fill(0, $width, 0));

+                for ($maskNo=0; $maskNo<8; $maskNo++)

+                    $mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);

             }

 			

-			QRtools::markTime('after_build_cache');

+            QRtools::markTime('after_build_cache');

         }

 

         //----------------------------------------------------------------------

lib/phpqrcode/qrimage.php

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else{

                     ImagePng($image, $filename);

                 }

             }

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
     class QRimage {

     

         //----------------------------------------------------------------------

-        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=false) 

+        public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = false) 

         {

             $image = self::image($frame, $pixelPerPoint, $outerFrame);

             

@@ -35,11 +35,11 @@ 
                 Header("Content-type: image/png");

                 ImagePng($image);

             } else {

-                if($saveandprint===true){

+                if ($saveandprint === true) {

                     ImagePng($image, $filename);

                     header("Content-type: image/png");

                     ImagePng($image);

-                }else{

+                } else {

                     ImagePng($image, $filename);

                 }

             }

@@ -68,25 +68,25 @@ 
             $h = count($frame);

             $w = strlen($frame[0]);

             

-            $imgW = $w + 2*$outerFrame;

-            $imgH = $h + 2*$outerFrame;

+            $imgW = $w + 2 * $outerFrame;

+            $imgH = $h + 2 * $outerFrame;

             

-            $base_image =ImageCreate($imgW, $imgH);

+            $base_image = ImageCreate($imgW, $imgH);

             

-            $col[0] = ImageColorAllocate($base_image,255,255,255);

-            $col[1] = ImageColorAllocate($base_image,0,0,0);

+            $col[0] = ImageColorAllocate($base_image, 255, 255, 255);

+            $col[1] = ImageColorAllocate($base_image, 0, 0, 0);

 

             imagefill($base_image, 0, 0, $col[0]);

 

-            for($y=0; $y<$h; $y++) {

-                for($x=0; $x<$w; $x++) {

+            for ($y = 0; $y < $h; $y++) {

+                for ($x = 0; $x < $w; $x++) {

                     if ($frame[$y][$x] == '1') {

-                        ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 

+                        ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); 

                     }

                 }

             }

             

-            $target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

+            $target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

             ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);

             ImageDestroy($base_image);

             

lib/gettext/gettext.inc

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+  define('LC_MESSAGES', 5);
 }
 
 require('streams.php');
@@ -77,7 +77,7 @@ 
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
                    $locale, $matches)) {
 
       if (isset($matches["lang"])) $lang = $matches["lang"];
@@ -113,7 +113,7 @@ 
 /**
  * Utility function to get a StreamReader for the given text domain.
  */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
+function _get_reader($domain = null, $category = 5, $enable_cache = true) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
     if (!isset($text_domains[$domain]->l10n)) {
@@ -121,12 +121,12 @@ 
         $locale = _setlocale(LC_MESSAGES, 0);
         $bound_path = isset($text_domains[$domain]->path) ?
           $text_domains[$domain]->path : './';
-        $subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+        $subpath = $LC_CATEGORIES[$category]."/$domain.mo";
 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
+          $full_path = $bound_path.$locale."/".$subpath;
           if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
@@ -154,7 +154,7 @@ 
 /**
  * Checks if the current locale is supported on this system.
  */
-function _check_locale_and_function($function=false) {
+function _check_locale_and_function($function = false) {
     global $EMULATEGETTEXT;
     if ($function and !function_exists($function))
         return false;
@@ -164,10 +164,10 @@ 
 /**
  * Get the codeset for the given domain.
  */
-function _get_codeset($domain=null) {
+function _get_codeset($domain = null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
     if (!isset($domain)) $domain = $default_domain;
-    return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
+    return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
 /**
@@ -241,10 +241,10 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path)-1] != '/')
+      if ($path[strlen($path) - 1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {

Braces +149 added lines, -95 removed lines

@@ -80,32 +80,45 @@ 
                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
                    $locale, $matches)) {
 
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
+      if (isset($matches["lang"])) {
+          $lang = $matches["lang"];
+      }
+      if (isset($matches["country"])) {
+          $country = $matches["country"];
+      }
+      if (isset($matches["charset"])) {
+          $charset = $matches["charset"];
+      }
+      if (isset($matches["modifier"])) {
+          $modifier = $matches["modifier"];
+      }
 
       if ($modifier) {
         if ($country) {
-          if ($charset)
-            array_push($locale_names, "${lang}_$country.$charset@$modifier");
+          if ($charset) {
+                      array_push($locale_names, "${lang}_$country.$charset@$modifier");
+          }
           array_push($locale_names, "${lang}_$country@$modifier");
-        } elseif ($charset)
-            array_push($locale_names, "${lang}.$charset@$modifier");
+        } elseif ($charset) {
+                    array_push($locale_names, "${lang}.$charset@$modifier");
+        }
         array_push($locale_names, "$lang@$modifier");
       }
       if ($country) {
-        if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
+        if ($charset) {
+                  array_push($locale_names, "${lang}_$country.$charset");
+        }
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
+      } elseif ($charset) {
+                array_push($locale_names, "${lang}.$charset");
+      }
       array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
-    if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
+    if (!in_array($locale, $locale_names)) {
+          array_push($locale_names, $locale);
+    }
   }
   return $locale_names;
 }
@@ -115,7 +128,9 @@ 
  */
 function _get_reader($domain=null, $category=5, $enable_cache=true) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     if (!isset($text_domains[$domain]->l10n)) {
         // get the current locale
         $locale = _setlocale(LC_MESSAGES, 0);
@@ -156,8 +171,9 @@ 
  */
 function _check_locale_and_function($function=false) {
     global $EMULATEGETTEXT;
-    if ($function and !function_exists($function))
-        return false;
+    if ($function and !function_exists($function)) {
+            return false;
+    }
     return !$EMULATEGETTEXT;
 }
 
@@ -166,7 +182,9 @@ 
  */
 function _get_codeset($domain=null) {
     global $text_domains, $default_domain, $LC_CATEGORIES;
-    if (!isset($domain)) $domain = $default_domain;
+    if (!isset($domain)) {
+        $domain = $default_domain;
+    }
     return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
@@ -177,8 +195,9 @@ 
   $target_encoding = _get_codeset();
   if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
-    if ($source_encoding != $target_encoding)
-      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    if ($source_encoding != $target_encoding) {
+          $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    }
   }
   return $text;
 }
@@ -190,11 +209,13 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
+  if ($locale == '') {
+      // emulate variable support
     return getenv('LANG');
-  else
-    return $locale;
-}
+  } else {
+      return $locale;
+  }
+  }
 
 /**
  * Sets a requested locale, if needed emulates it.
@@ -202,12 +223,13 @@ 
 function _setlocale($category, $locale) {
     global $CURRENTLOCALE, $EMULATEGETTEXT;
     if ($locale === 0) { // use === to differentiate between string "0"
-        if ($CURRENTLOCALE != '')
-            return $CURRENTLOCALE;
-        else
-            // obey LANG variable, maybe extend to support all of LC_* vars
+        if ($CURRENTLOCALE != '') {
+                    return $CURRENTLOCALE;
+        } else {
+                    // obey LANG variable, maybe extend to support all of LC_* vars
             // even if we tried to read locale without setting it first
             return _setlocale($category, $CURRENTLOCALE);
+        }
     } else {
         if (function_exists('setlocale')) {
           $ret = setlocale($category, $locale);
@@ -241,11 +263,13 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-        $path .= '\\';
+      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') {
+              $path .= '\\';
+      }
     } else {
-      if ($path[strlen($path)-1] != '/')
-        $path .= '/';
+      if ($path[strlen($path)-1] != '/') {
+              $path .= '/';
+      }
     }
     if (!array_key_exists($domain, $text_domains)) {
       // Initialize an empty domain object.
@@ -384,96 +408,126 @@ 
 }
 
 function T_bindtextdomain($domain, $path) {
-    if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-    else return _bindtextdomain($domain, $path);
-}
+    if (_check_locale_and_function()) {
+        return bindtextdomain($domain, $path);
+    } else {
+        return _bindtextdomain($domain, $path);
+    }
+    }
 function T_bind_textdomain_codeset($domain, $codeset) {
     // bind_textdomain_codeset is available only in PHP 4.2.0+
-    if (_check_locale_and_function('bind_textdomain_codeset'))
-        return bind_textdomain_codeset($domain, $codeset);
-    else return _bind_textdomain_codeset($domain, $codeset);
-}
+    if (_check_locale_and_function('bind_textdomain_codeset')) {
+            return bind_textdomain_codeset($domain, $codeset);
+    } else {
+        return _bind_textdomain_codeset($domain, $codeset);
+    }
+    }
 function T_textdomain($domain) {
-    if (_check_locale_and_function()) return textdomain($domain);
-    else return _textdomain($domain);
-}
+    if (_check_locale_and_function()) {
+        return textdomain($domain);
+    } else {
+        return _textdomain($domain);
+    }
+    }
 function T_gettext($msgid) {
-    if (_check_locale_and_function()) return gettext($msgid);
-    else return _gettext($msgid);
-}
+    if (_check_locale_and_function()) {
+        return gettext($msgid);
+    } else {
+        return _gettext($msgid);
+    }
+    }
 function T_($msgid) {
-    if (_check_locale_and_function()) return _($msgid);
+    if (_check_locale_and_function()) {
+        return _($msgid);
+    }
     return __($msgid);
 }
 function T_ngettext($singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return ngettext($singular, $plural, $number);
-    else return _ngettext($singular, $plural, $number);
-}
+    if (_check_locale_and_function()) {
+            return ngettext($singular, $plural, $number);
+    } else {
+        return _ngettext($singular, $plural, $number);
+    }
+    }
 function T_dgettext($domain, $msgid) {
-    if (_check_locale_and_function()) return dgettext($domain, $msgid);
-    else return _dgettext($domain, $msgid);
-}
+    if (_check_locale_and_function()) {
+        return dgettext($domain, $msgid);
+    } else {
+        return _dgettext($domain, $msgid);
+    }
+    }
 function T_dngettext($domain, $singular, $plural, $number) {
-    if (_check_locale_and_function())
-        return dngettext($domain, $singular, $plural, $number);
-    else return _dngettext($domain, $singular, $plural, $number);
-}
+    if (_check_locale_and_function()) {
+            return dngettext($domain, $singular, $plural, $number);
+    } else {
+        return _dngettext($domain, $singular, $plural, $number);
+    }
+    }
 function T_dcgettext($domain, $msgid, $category) {
-    if (_check_locale_and_function())
-        return dcgettext($domain, $msgid, $category);
-    else return _dcgettext($domain, $msgid, $category);
-}
+    if (_check_locale_and_function()) {
+            return dcgettext($domain, $msgid, $category);
+    } else {
+        return _dcgettext($domain, $msgid, $category);
+    }
+    }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
-    if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
-    else return _dcngettext($domain, $singular, $plural, $number, $category);
-}
+    if (_check_locale_and_function()) {
+          return dcngettext($domain, $singular, $plural, $number, $category);
+    } else {
+        return _dcngettext($domain, $singular, $plural, $number, $category);
+    }
+    }
 
 function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
-}
+  if (_check_locale_and_function('pgettext')) {
+        return pgettext($context, $msgid);
+  } else {
+        return _pgettext($context, $msgid);
+  }
+  }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
-}
+  if (_check_locale_and_function('dpgettext')) {
+        return dpgettext($domain, $context, $msgid);
+  } else {
+        return _dpgettext($domain, $context, $msgid);
+  }
+  }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
-}
+  if (_check_locale_and_function('dcpgettext')) {
+        return dcpgettext($domain, $context, $msgid, $category);
+  } else {
+        return _dcpgettext($domain, $context, $msgid, $category);
+  }
+  }
 
 function T_npgettext($context, $singular, $plural, $number) {
-    if (_check_locale_and_function('npgettext'))
-        return npgettext($context, $singular, $plural, $number);
-    else
-        return _npgettext($context, $singular, $plural, $number);
-}
+    if (_check_locale_and_function('npgettext')) {
+            return npgettext($context, $singular, $plural, $number);
+    } else {
+            return _npgettext($context, $singular, $plural, $number);
+    }
+    }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
-}
+  if (_check_locale_and_function('dnpgettext')) {
+        return dnpgettext($domain, $context, $singular, $plural, $number);
+  } else {
+        return _dnpgettext($domain, $context, $singular, $plural, $number);
+  }
+  }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
                        $number, $category) {
-    if (_check_locale_and_function('dcnpgettext'))
-        return dcnpgettext($domain, $context, $singular,
+    if (_check_locale_and_function('dcnpgettext')) {
+            return dcnpgettext($domain, $context, $singular,
                            $plural, $number, $category);
-    else
-        return _dcnpgettext($domain, $context, $singular,
+    } else {
+            return _dcnpgettext($domain, $context, $singular,
                             $plural, $number, $category);
-}
+    }
+    }
 
 
 

Indentation +77 added lines, -77 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+    define('LC_MESSAGES',	5);
 }
 
 require('streams.php');
@@ -53,9 +53,9 @@ 
 
 /* Class to hold a single domain included in $text_domains. */
 class domain {
-  var $l10n;
-  var $path;
-  var $codeset;
+    var $l10n;
+    var $path;
+    var $codeset;
 }
 
 // Utility functions
@@ -64,50 +64,50 @@ 
  * Return a list of locales to try for any POSIX-style locale specification.
  */
 function get_list_of_locales($locale) {
-  /* Figure out all possible locale names and start with the most
+    /* Figure out all possible locale names and start with the most
    * specific ones.  I.e. for sr_CS.UTF-8@latin, look through all of
    * sr_CS.UTF-8@latin, sr_CS@latin, sr@latin, sr_CS.UTF-8, sr_CS, sr.
    */
-  $locale_names = array();
-  $lang = null;
-  $country = null;
-  $charset = null;
-  $modifier = null;
-  if ($locale) {
+    $locale_names = array();
+    $lang = null;
+    $country = null;
+    $charset = null;
+    $modifier = null;
+    if ($locale) {
     if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
-                   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
-                   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-                   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
-                   $locale, $matches)) {
+                    ."(?:_(?P<country>[A-Z]{2}))?"           // country code
+                    ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
+                    ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+                    $locale, $matches)) {
 
-      if (isset($matches["lang"])) $lang = $matches["lang"];
-      if (isset($matches["country"])) $country = $matches["country"];
-      if (isset($matches["charset"])) $charset = $matches["charset"];
-      if (isset($matches["modifier"])) $modifier = $matches["modifier"];
+        if (isset($matches["lang"])) $lang = $matches["lang"];
+        if (isset($matches["country"])) $country = $matches["country"];
+        if (isset($matches["charset"])) $charset = $matches["charset"];
+        if (isset($matches["modifier"])) $modifier = $matches["modifier"];
 
-      if ($modifier) {
+        if ($modifier) {
         if ($country) {
-          if ($charset)
+            if ($charset)
             array_push($locale_names, "${lang}_$country.$charset@$modifier");
-          array_push($locale_names, "${lang}_$country@$modifier");
+            array_push($locale_names, "${lang}_$country@$modifier");
         } elseif ($charset)
             array_push($locale_names, "${lang}.$charset@$modifier");
         array_push($locale_names, "$lang@$modifier");
-      }
-      if ($country) {
+        }
+        if ($country) {
         if ($charset)
-          array_push($locale_names, "${lang}_$country.$charset");
+            array_push($locale_names, "${lang}_$country.$charset");
         array_push($locale_names, "${lang}_$country");
-      } elseif ($charset)
-          array_push($locale_names, "${lang}.$charset");
-      array_push($locale_names, $lang);
+        } elseif ($charset)
+            array_push($locale_names, "${lang}.$charset");
+        array_push($locale_names, $lang);
     }
 
     // If the locale name doesn't match POSIX style, just include it as-is.
     if (!in_array($locale, $locale_names))
-      array_push($locale_names, $locale);
-  }
-  return $locale_names;
+        array_push($locale_names, $locale);
+    }
+    return $locale_names;
 }
 
 /**
@@ -126,19 +126,19 @@ 
         $locale_names = get_list_of_locales($locale);
         $input = null;
         foreach ($locale_names as $locale) {
-          $full_path = $bound_path . $locale . "/" . $subpath;
-          if (file_exists($full_path)) {
+            $full_path = $bound_path . $locale . "/" . $subpath;
+            if (file_exists($full_path)) {
             $input = new FileReader($full_path);
             break;
-          }
+            }
         }
 
         if (!array_key_exists($domain, $text_domains)) {
-          // Initialize an empty domain object.
-          $text_domains[$domain] = new domain();
+            // Initialize an empty domain object.
+            $text_domains[$domain] = new domain();
         }
         $text_domains[$domain]->l10n = new gettext_reader($input,
-                                                          $enable_cache);
+                                                            $enable_cache);
     }
     return $text_domains[$domain]->l10n;
 }
@@ -174,13 +174,13 @@ 
  * Convert the given string to the encoding set by bind_textdomain_codeset.
  */
 function _encode($text) {
-  $target_encoding = _get_codeset();
-  if (function_exists("mb_detect_encoding")) {
+    $target_encoding = _get_codeset();
+    if (function_exists("mb_detect_encoding")) {
     $source_encoding = mb_detect_encoding($text);
     if ($source_encoding != $target_encoding)
-      $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
-  }
-  return $text;
+        $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+    }
+    return $text;
 }
 
 
@@ -190,9 +190,9 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
+    if ($locale == '') // emulate variable support
     return getenv('LANG');
-  else
+    else
     return $locale;
 }
 
@@ -210,20 +210,20 @@ 
             return _setlocale($category, $CURRENTLOCALE);
     } else {
         if (function_exists('setlocale')) {
-          $ret = setlocale($category, $locale);
-          if (($locale == '' and !$ret) or // failed setting it by env
+            $ret = setlocale($category, $locale);
+            if (($locale == '' and !$ret) or // failed setting it by env
               ($locale != '' and $ret != $locale)) { // failed setting it
             // Failed setting it according to environment.
             $CURRENTLOCALE = _get_default_locale($locale);
             $EMULATEGETTEXT = 1;
-          } else {
+            } else {
             $CURRENTLOCALE = $ret;
             $EMULATEGETTEXT = 0;
-          }
+            }
         } else {
-          // No function setlocale(), emulate it all.
-          $CURRENTLOCALE = _get_default_locale($locale);
-          $EMULATEGETTEXT = 1;
+            // No function setlocale(), emulate it all.
+            $CURRENTLOCALE = _get_default_locale($locale);
+            $EMULATEGETTEXT = 1;
         }
         // Allow locale to be changed on the go for one translation domain.
         global $text_domains, $default_domain;
@@ -241,15 +241,15 @@ 
     global $text_domains;
     // ensure $path ends with a slash ('/' should work for both, but lets still play nice)
     if (substr(php_uname(), 0, 7) == "Windows") {
-      if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
+        if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
         $path .= '\\';
     } else {
-      if ($path[strlen($path)-1] != '/')
+        if ($path[strlen($path)-1] != '/')
         $path .= '/';
     }
     if (!array_key_exists($domain, $text_domains)) {
-      // Initialize an empty domain object.
-      $text_domains[$domain] = new domain();
+        // Initialize an empty domain object.
+        $text_domains[$domain] = new domain();
     }
     $text_domains[$domain]->path = $path;
 }
@@ -426,29 +426,29 @@ 
 }
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
     if (_check_locale_and_function())
-      return dcngettext($domain, $singular, $plural, $number, $category);
+        return dcngettext($domain, $singular, $plural, $number, $category);
     else return _dcngettext($domain, $singular, $plural, $number, $category);
 }
 
 function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-      return pgettext($context, $msgid);
-  else
-      return _pgettext($context, $msgid);
+    if (_check_locale_and_function('pgettext'))
+        return pgettext($context, $msgid);
+    else
+        return _pgettext($context, $msgid);
 }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-      return dpgettext($domain, $context, $msgid);
-  else
-      return _dpgettext($domain, $context, $msgid);
+    if (_check_locale_and_function('dpgettext'))
+        return dpgettext($domain, $context, $msgid);
+    else
+        return _dpgettext($domain, $context, $msgid);
 }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-      return dcpgettext($domain, $context, $msgid, $category);
-  else
-      return _dcpgettext($domain, $context, $msgid, $category);
+    if (_check_locale_and_function('dcpgettext'))
+        return dcpgettext($domain, $context, $msgid, $category);
+    else
+        return _dcpgettext($domain, $context, $msgid, $category);
 }
 
 function T_npgettext($context, $singular, $plural, $number) {
@@ -459,17 +459,17 @@ 
 }
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-      return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-      return _dnpgettext($domain, $context, $singular, $plural, $number);
+    if (_check_locale_and_function('dnpgettext'))
+        return dnpgettext($domain, $context, $singular, $plural, $number);
+    else
+        return _dnpgettext($domain, $context, $singular, $plural, $number);
 }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
-                       $number, $category) {
+                        $number, $category) {
     if (_check_locale_and_function('dcnpgettext'))
         return dcnpgettext($domain, $context, $singular,
-                           $plural, $number, $category);
+                            $plural, $number, $category);
     else
         return _dcnpgettext($domain, $context, $singular,
                             $plural, $number, $category);
@@ -526,9 +526,9 @@ 
         return _dcpgettext($domain, $context, $msgid, $category);
     }
     function dcnpgettext($domain, $context, $singular, $plural,
-                         $number, $category) {
-      return _dcnpgettext($domain, $context, $singular, $plural,
-                          $number, $category);
+                            $number, $category) {
+        return _dcnpgettext($domain, $context, $singular, $plural,
+                            $number, $category);
     }
 }