majiameng / QrCode-php

src/Gateways/Qr.php

Braces +3 added lines, -3 removed lines

@@ -43,7 +43,7 @@ 
         if($filePath){
             if($filePath === true){
                 $filePath = saveFilePath;
-            }else{
+            } else{
                 if(substr($filePath,-1) != DIRECTORY_SEPARATOR){
                     $filePath .= DIRECTORY_SEPARATOR;
                 }
@@ -55,13 +55,13 @@ 
 
             if(is_int($data)){
                 $file_name = 'qr'.$data.'.png';
-            }else{
+            } else{
                 $file_name = 'qr'.date('YmdHis').rand(1111,9999).'.png';
             }
             $filename = $filePath.$file_name;
             QRcode::png($data, $filename, $errorCorrectionLevel, $matrixPointSize, 2);
             return $filename;
-        }else{
+        } else{
             QRcode::png($data, false, $errorCorrectionLevel, $matrixPointSize, 2);
         }
     }

src/Gateways/qrcode/QRmask.php

Braces +15 added lines, -10 removed lines

@@ -120,8 +120,9 @@ 
     {
         $codeArr = array();
         
-        foreach ($bitFrame as $line)
-            $codeArr[] = join('', $line);
+        foreach ($bitFrame as $line) {
+                    $codeArr[] = join('', $line);
+        }
             
         return gzcompress(join("\n", $codeArr), 9);
     }
@@ -132,8 +133,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;
     }
@@ -151,16 +153,18 @@ 
                 $bitMask = self::unserial(file_get_contents($fileName));
             } else {
                 $bitMask = $this->generateMaskNo($maskNo, $width, $s, $d);
-                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, $d);
         }
 
-        if ($maskGenOnly)
-            return;
+        if ($maskGenOnly) {
+                    return;
+        }
             
         $d = $s;
 
@@ -227,8 +231,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)) {

src/Gateways/qrcode/QRinput.php

Indentation +1 added lines, -1 removed lines

@@ -180,7 +180,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,

Braces +27 added lines, -16 removed lines

@@ -233,8 +233,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]);
@@ -254,8 +255,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;
@@ -320,8 +322,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);
@@ -338,8 +341,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;
     }
@@ -352,8 +359,9 @@ 
         foreach($this->items as $item) {
             $bits = $item->encodeBitStream($this->version);
             
-            if($bits < 0) 
-                return -1;
+            if($bits < 0) {
+                            return -1;
+            }
                 
             $total += $bits;
         }
@@ -372,8 +380,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) {
@@ -410,8 +419,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;
         
@@ -424,8 +434,9 @@ 
             
             $ret = $padding->appendBytes($padlen, $padbuf);
             
-            if($ret < 0)
-                return $ret;
+            if($ret < 0) {
+                            return $ret;
+            }
             
         }
 

src/Gateways/qrcode/QRrsItem.php

Braces +20 added lines, -7 removed lines

@@ -41,11 +41,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;
@@ -111,8 +123,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;
     }

src/Gateways/qrcode/QRsplit.php

Braces +38 added lines, -23 removed lines

@@ -49,8 +49,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')));
     }
@@ -58,8 +59,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);
     }
@@ -67,8 +69,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];
         
@@ -122,8 +125,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;
     }
@@ -169,8 +173,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;
     }
@@ -185,8 +190,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;
     }
@@ -240,8 +246,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;
     }
@@ -251,8 +258,9 @@ 
     {
         while (strlen($this->dataStr) > 0)
         {
-            if($this->dataStr == '')
-                return 0;
+            if($this->dataStr == '') {
+                            return 0;
+            }
 
             $mode = $this->identifyMode(0);
             
@@ -260,16 +268,22 @@ 
                 case QR_MODE_NUM: $length = $this->eatNum(); break;
                 case QR_MODE_AN:  $length = $this->eatAn(); break;
                 case QR_MODE_KANJI:
-                    if ($hint == QR_MODE_KANJI)
-                            $length = $this->eatKanji();
-                    else    $length = $this->eat8();
+                    if ($hint == 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);
         }
@@ -305,8 +319,9 @@ 
 
         $split = new QRsplit($string, $input, $modeHint);
         
-        if(!$casesensitive)
-            $split->toUpper();
+        if(!$casesensitive) {
+                    $split->toUpper();
+        }
             
         return $split->splitString();
     }

src/Gateways/qrcode/QRrawcode.php

Braces +6 added lines, -3 removed lines

@@ -69,14 +69,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);

src/Gateways/qrcode/QRtools.php

Braces +12 added lines, -8 removed lines

@@ -44,8 +44,9 @@ 
     {
         $barcode_array = array();
 
-        if (!is_array($mode))
-            $mode = explode(',', $mode);
+        if (!is_array($mode)) {
+                    $mode = explode(',', $mode);
+        }
 
         $eccLevel = 'L';
 
@@ -62,8 +63,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;
         }
 
@@ -91,8 +93,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');
@@ -129,8 +132,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;
     }

src/Gateways/qrcode/FrameFiller.php

Braces +3 added lines, -1 removed lines

@@ -83,7 +83,9 @@
                     }
                 }
             }
-            if($x < 0 || $y < 0) return null;
+            if($x < 0 || $y < 0) {
+                return null;
+            }
 
             $this->x = $x;
             $this->y = $y;

src/Gateways/qrcode/Qrcode.php

Braces +6 added lines, -2 removed lines

@@ -139,7 +139,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) {
@@ -159,7 +161,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) {