codysnider / tt-rss

lib/gettext/streams.php

Braces +6 added lines, -4 removed lines

@@ -57,16 +57,18 @@
     function read($bytes) {
     $data = substr($this->_str, $this->_pos, $bytes);
     $this->_pos += $bytes;
-    if (strlen($this->_str) < $this->_pos)
-        $this->_pos = strlen($this->_str);
+    if (strlen($this->_str) < $this->_pos) {
+            $this->_pos = strlen($this->_str);
+    }
 
     return $data;
     }
 
     function seekto($pos) {
     $this->_pos = $pos;
-    if (strlen($this->_str) < $this->_pos)
-        $this->_pos = strlen($this->_str);
+    if (strlen($this->_str) < $this->_pos) {
+            $this->_pos = strlen($this->_str);
+    }
     return $this->_pos;
     }
 

lib/gettext/gettext.inc

Braces +6 added lines, -4 removed lines

@@ -263,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.

lib/MiniTemplator.class.php

Switch Indentation +47 added lines, -47 removed lines

@@ -305,23 +305,23 @@ 
     if (!$this->parseWord($cmdL, $p, $cmd)) return true;

     $parms = substr($cmdL, $p);

     switch (strtoupper($cmd)) {

-        case '$BEGINBLOCK':

-         if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

-            return false;

-            break;

-        case '$ENDBLOCK':

-         if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

-            return false;

-            break;

-        case '$INCLUDE':

-         if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

-            return false;

-            $resumeFromStart = true;

-            break;

-        default:

-         if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

-            $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

-            return false; }}

+    case '$BEGINBLOCK':

+     if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

+        return false;

+        break;

+    case '$ENDBLOCK':

+     if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

+        return false;

+        break;

+    case '$INCLUDE':

+     if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

+        return false;

+        $resumeFromStart = true;

+        break;

+    default:

+     if ($cmd{0} == '$' && !(strlen($cmd) >= 2 && $cmd{1} == '{')) {

+        $this->triggerError("Unknown command \"$cmd\" in template at offset $cmdTPosBegin.");

+        return false; }}

     return true; }

 

 /**

@@ -781,25 +781,25 @@ 
         if ($tPos2 > $tPos)

             $this->writeString(substr($this->template, $tPos, $tPos2 - $tPos));

         switch ($kind) {

-            case 0:         // end of block

-            return;

-            case 1:         // variable

-            $vrtr = & $this->varRefTab[$varRefNo];

-            if ($vrtr['blockNo'] != $blockNo)

-                $this->programLogicError(4);

-            $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

-            $this->writeString($variableValue);

-            $tPos = $vrtr['tPosEnd'];

-            $varRefNo += 1;

-            break;

-            case 2:         // sub block

-            $subBtr = & $this->blockTab[$subBlockNo];

-            if ($subBtr['parentBlockNo'] != $blockNo)

-                $this->programLogicError(3);

-            $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call

-            $tPos = $subBtr['tPosEnd'];

-            $subBlockNo += 1;

-            break; }}}

+        case 0:         // end of block

+        return;

+        case 1:         // variable

+        $vrtr = & $this->varRefTab[$varRefNo];

+        if ($vrtr['blockNo'] != $blockNo)

+            $this->programLogicError(4);

+        $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

+        $this->writeString($variableValue);

+        $tPos = $vrtr['tPosEnd'];

+        $varRefNo += 1;

+        break;

+        case 2:         // sub block

+        $subBtr = & $this->blockTab[$subBlockNo];

+        if ($subBtr['parentBlockNo'] != $blockNo)

+            $this->programLogicError(3);

+        $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call

+        $tPos = $subBtr['tPosEnd'];

+        $subBlockNo += 1;

+        break; }}}

 

 /**

 * @access private

@@ -807,17 +807,17 @@ 
 function writeString($s) {

     if ($this->outputError) return;

     switch ($this->outputMode) {

-        case 0:            // output to PHP output stream

-         if (!print($s))

-            $this->outputError = true;

-            break;

-        case 1:            // output to file

-         $rc = fwrite($this->outputFileHandle, $s);

-            if ($rc === false) $this->outputError = true;

-            break;

-        case 2:            // output to string

-         $this->outputString .= $s;

-            break; }}

+    case 0:            // output to PHP output stream

+     if (!print($s))

+        $this->outputError = true;

+        break;

+    case 1:            // output to file

+     $rc = fwrite($this->outputFileHandle, $s);

+        if ($rc === false) $this->outputError = true;

+        break;

+    case 2:            // output to string

+     $this->outputString .= $s;

+        break; }}

 

 //--- name lookup routines ------------------------------------------------------------------------------------------

 

Braces +144 added lines, -71 removed lines

@@ -282,16 +282,22 @@ 
     $p = 0;

     while (true) {

         $p0 = strpos($this->template, '<!--', $p);

-        if ($p0 === false) break;

+        if ($p0 === false) {
+            break;
+        }
         $p = strpos($this->template, '-->', $p0);

         if ($p === false) {

             $this->triggerError("Invalid HTML comment in template at offset $p0.");

             return false; }

         $p += 3;

         $cmdL = substr($this->template, $p0 + 4, $p - $p0 - 7);

-        if (!$this->processTemplateCommand($cmdL, $p0, $p, $resumeFromStart))

-            return false;

-        if ($resumeFromStart) $p = $p0; }

+        if (!$this->processTemplateCommand($cmdL, $p0, $p, $resumeFromStart)) {
+                    return false;
+        }
+        if ($resumeFromStart) {
+            $p = $p0;
+        }
+        }

     return true; }

 

 /**

@@ -302,20 +308,25 @@ 
     $resumeFromStart = false;

     $p = 0;

     $cmd = '';

-    if (!$this->parseWord($cmdL, $p, $cmd)) return true;

+    if (!$this->parseWord($cmdL, $p, $cmd)) {
+        return true;
+    }
     $parms = substr($cmdL, $p);

     switch (strtoupper($cmd)) {

         case '$BEGINBLOCK':

-         if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

-            return false;

+         if (!$this->processBeginBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) {
+                     return false;
+         }
             break;

         case '$ENDBLOCK':

-         if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

-            return false;

+         if (!$this->processEndBlockCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) {
+                     return false;
+         }
             break;

         case '$INCLUDE':

-         if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd))

-            return false;

+         if (!$this->processincludeCmd($parms, $cmdTPosBegin, $cmdTPosEnd)) {
+                     return false;
+         }
             $resumeFromStart = true;

             break;

         default:

@@ -387,8 +398,9 @@ 
     $btr = & $this->blockTab[$blockNo];

     $btr = array();

     $btr['blockName'] = $blockName;

-    if (!$this->lookupBlockName($blockName, $btr['nextWithSameName']))

-        $btr['nextWithSameName'] = -1;

+    if (!$this->lookupBlockName($blockName, $btr['nextWithSameName'])) {
+            $btr['nextWithSameName'] = -1;
+    }
     $btr['definitionIsOpen'] = true;

     $btr['instances'] = 0;

     $btr['firstBlockInstNo'] = -1;

@@ -438,7 +450,9 @@ 
     if (strlen($this->template) > $this->maxInclTemplateSize) {

         $this->triggerError("Subtemplate include aborted because the internal template string is longer than $this->maxInclTemplateSize characters.");

         return false; }

-    if (!$this->loadSubtemplate($subtemplateName, $subtemplate)) return false;

+    if (!$this->loadSubtemplate($subtemplateName, $subtemplate)) {
+        return false;
+    }
     // (Copying the template to insert a subtemplate is a bit slow. In a future implementation of MiniTemplator,

     // a table could be used that contains references to the string fragments.)

     $this->template = substr($this->template, 0, $tPos1).$subtemplate.substr($this->template, $tPos2);

@@ -473,8 +487,9 @@ 
 * @access private

 */

 function registerVariableReference($varName, $tPosBegin, $tPosEnd) {

-    if (!$this->lookupVariableName($varName, $varNo))

-        $this->registerVariable($varName, $varNo);

+    if (!$this->lookupVariableName($varName, $varNo)) {
+            $this->registerVariable($varName, $varNo);
+    }
     $varRefNo = $this->varRefTabCnt++;

     $vrtr = & $this->varRefTab[$varRefNo];

     $vrtr = array();

@@ -514,12 +529,14 @@ 
             $nextBlockNo += 1;

             continue; }}

         $btr = & $this->blockTab[$activeBlockNo];

-        if ($varRefTPos < $btr['tPosBegin'])

-            $this->programLogicError(1);

+        if ($varRefTPos < $btr['tPosBegin']) {
+                    $this->programLogicError(1);
+        }
         $blockVarNo = $btr['blockVarCnt']++;

         $btr['blockVarNoToVarNoMap'][$blockVarNo] = $varNo;

-        if ($btr['firstVarRefNo'] == -1)

-            $btr['firstVarRefNo'] = $varRefNo;

+        if ($btr['firstVarRefNo'] == -1) {
+                    $btr['firstVarRefNo'] = $varRefNo;
+        }
         $vrtr['blockNo'] = $activeBlockNo;

         $vrtr['blockVarNo'] = $blockVarNo;

         $varRefNo += 1; }}

@@ -535,8 +552,9 @@ 
 * @access public

 */

 function reset() {

-    for ($varNo = 0; $varNo < $this->varTabCnt; $varNo++)

-        $this->varTab[$varNo]['varValue'] = '';

+    for ($varNo = 0; $varNo < $this->varTabCnt; $varNo++) {
+            $this->varTab[$varNo]['varValue'] = '';
+    }
     for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {

         $btr = & $this->blockTab[$blockNo];

         $btr['instances'] = 0;

@@ -563,7 +581,9 @@ 
 function setVariable($variableName, $variableValue, $isOptional = false) {

     if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }

     if (!$this->lookupVariableName($variableName, $varNo)) {

-        if ($isOptional) return true;

+        if ($isOptional) {
+            return true;
+        }
         $this->triggerError("Variable \"$variableName\" not defined in template.");

         return false; }

     $this->varTab[$varNo]['varValue'] = $variableValue;

@@ -631,20 +651,23 @@ 
     $btr = & $this->blockTab[$blockNo];

     $this->registerBlockInstance($blockInstNo);

     $bitr = & $this->blockInstTab[$blockInstNo];

-    if ($btr['firstBlockInstNo'] == -1)

-        $btr['firstBlockInstNo'] = $blockInstNo;

-    if ($btr['lastBlockInstNo'] != -1)

-        $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;

+    if ($btr['firstBlockInstNo'] == -1) {
+            $btr['firstBlockInstNo'] = $blockInstNo;
+    }
+    if ($btr['lastBlockInstNo'] != -1) {
+            $this->blockInstTab[$btr['lastBlockInstNo']]['nextBlockInstNo'] = $blockInstNo;
+    }
             // set forward pointer of chain

     $btr['lastBlockInstNo'] = $blockInstNo;

     $parentBlockNo = $btr['parentBlockNo'];

     $blockVarCnt = $btr['blockVarCnt'];

     $bitr['blockNo'] = $blockNo;

     $bitr['instanceLevel'] = $btr['instances']++;

-    if ($parentBlockNo == -1)

-        $bitr['parentInstLevel'] = -1;

-    else

-        $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];

+    if ($parentBlockNo == -1) {
+            $bitr['parentInstLevel'] = -1;
+    } else {
+            $bitr['parentInstLevel'] = $this->blockTab[$parentBlockNo]['instances'];
+    }
     $bitr['nextBlockInstNo'] = -1;

     $bitr['blockVarTab'] = array();

     // copy instance variables for this block

@@ -691,7 +714,9 @@ 
 */

 function generateOutputToFile($fileName) {

     $fh = fopen($fileName, "wb");

-    if ($fh === false) return false;

+    if ($fh === false) {
+        return false;
+    }
     $this->outputMode = 1;

     $this->outputFileHandle = $fh;

     $ok = $this->generateOutputPage();

@@ -721,14 +746,18 @@ 
 */

 function generateOutputPage() {

     if (!$this->templateValid) {$this->triggerError("Template not valid."); return false; }

-    if ($this->blockTab[0]['instances'] == 0)

-        $this->addBlockByNo(0); // add main block

+    if ($this->blockTab[0]['instances'] == 0) {
+            $this->addBlockByNo(0);
+    }
+    // add main block

     for ($blockNo = 0; $blockNo < $this->blockTabCnt; $blockNo++) {

         $btr = & $this->blockTab[$blockNo];

         $btr['currBlockInstNo'] = $btr['firstBlockInstNo']; }

     $this->outputError = false;

     $this->writeBlockInstances(0, -1);

-    if ($this->outputError) return false;

+    if ($this->outputError) {
+        return false;
+    }
     return true; }

 

 /**

@@ -741,11 +770,16 @@ 
     $btr = & $this->blockTab[$blockNo];

     while (!$this->outputError) {

         $blockInstNo = $btr['currBlockInstNo'];

-        if ($blockInstNo == -1) break;

+        if ($blockInstNo == -1) {
+            break;
+        }
         $bitr = & $this->blockInstTab[$blockInstNo];

-        if ($bitr['parentInstLevel'] < $parentInstLevel)

-            $this->programLogicError(2);

-        if ($bitr['parentInstLevel'] > $parentInstLevel) break;

+        if ($bitr['parentInstLevel'] < $parentInstLevel) {
+                    $this->programLogicError(2);
+        }
+        if ($bitr['parentInstLevel'] > $parentInstLevel) {
+            break;
+        }
         $this->writeBlockInstance($blockInstNo);

         $btr['currBlockInstNo'] = $bitr['nextBlockInstNo']; }}

 

@@ -778,15 +812,17 @@ 
             if ($subBtr['tPosBegin'] < $tPos2) {

             $tPos2 = $subBtr['tPosBegin'];

             $kind = 2; }}

-        if ($tPos2 > $tPos)

-            $this->writeString(substr($this->template, $tPos, $tPos2 - $tPos));

+        if ($tPos2 > $tPos) {
+                    $this->writeString(substr($this->template, $tPos, $tPos2 - $tPos));
+        }
         switch ($kind) {

             case 0:         // end of block

             return;

             case 1:         // variable

             $vrtr = & $this->varRefTab[$varRefNo];

-            if ($vrtr['blockNo'] != $blockNo)

-                $this->programLogicError(4);

+            if ($vrtr['blockNo'] != $blockNo) {
+                            $this->programLogicError(4);
+            }
             $variableValue = $bitr['blockVarTab'][$vrtr['blockVarNo']];

             $this->writeString($variableValue);

             $tPos = $vrtr['tPosEnd'];

@@ -794,8 +830,9 @@ 
             break;

             case 2:         // sub block

             $subBtr = & $this->blockTab[$subBlockNo];

-            if ($subBtr['parentBlockNo'] != $blockNo)

-                $this->programLogicError(3);

+            if ($subBtr['parentBlockNo'] != $blockNo) {
+                            $this->programLogicError(3);
+            }
             $this->writeBlockInstances($subBlockNo, $bitr['instanceLevel']); // recursive call

             $tPos = $subBtr['tPosEnd'];

             $subBlockNo += 1;

@@ -805,15 +842,20 @@ 
 * @access private

 */

 function writeString($s) {

-    if ($this->outputError) return;

+    if ($this->outputError) {
+        return;
+    }
     switch ($this->outputMode) {

         case 0:            // output to PHP output stream

-         if (!print($s))

-            $this->outputError = true;

+         if (!print($s)) {
+                     $this->outputError = true;
+         }
             break;

         case 1:            // output to file

          $rc = fwrite($this->outputFileHandle, $s);

-            if ($rc === false) $this->outputError = true;

+            if ($rc === false) {
+                $this->outputError = true;
+            }
             break;

         case 2:            // output to string

          $this->outputString .= $s;

@@ -828,7 +870,9 @@ 
 */

 function lookupVariableName($varName, &$varNo) {

     $x = & $this->varNameToNoMap[strtoupper($varName)];

-    if (!isset($x)) return false;

+    if (!isset($x)) {
+        return false;
+    }
     $varNo = $x;

     return true; }

 

@@ -841,7 +885,9 @@ 
 */

 function lookupBlockName($blockName, &$blockNo) {

     $x = & $this->blockNameToNoMap[strtoupper($blockName)];

-    if (!isset($x)) return false;

+    if (!isset($x)) {
+        return false;
+    }
     $blockNo = $x;

     return true; }

 

@@ -855,15 +901,21 @@ 
 function readFileIntoString($fileName, &$s) {

     if (function_exists('version_compare') && version_compare(phpversion(), "4.3.0", ">=")) {

         $s = file_get_contents($fileName);

-        if ($s === false) return false;

+        if ($s === false) {
+            return false;
+        }
         return true; }

     $fh = fopen($fileName, "rb");

-    if ($fh === false) return false;

+    if ($fh === false) {
+        return false;
+    }
     $fileSize = filesize($fileName);

     if ($fileSize === false) {fclose($fh); return false; }

     $s = fread($fh, $fileSize);

     fclose($fh);

-    if (strlen($s) != $fileSize) return false;

+    if (strlen($s) != $fileSize) {
+        return false;
+    }
     return true; }

 

 /**

@@ -891,12 +943,22 @@ 
 */

 function parseQuotedString($s, &$p, &$w) {

     $sLen = strlen($s);

-    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-    if ($p >= $sLen) return false;

-    if (substr($s, $p, 1) != '"') return false;

+    while ($p < $sLen && ord($s{$p}) <= 32) {
+        $p++;
+    }
+    if ($p >= $sLen) {
+        return false;
+    }
+    if (substr($s, $p, 1) != '"') {
+        return false;
+    }
     $p++; $p0 = $p;

-    while ($p < $sLen && $s{$p} != '"') $p++;

-    if ($p >= $sLen) return false;

+    while ($p < $sLen && $s{$p} != '"') {
+        $p++;
+    }
+    if ($p >= $sLen) {
+        return false;
+    }
     $w = substr($s, $p0, $p - $p0);

     $p++;

     return true; }

@@ -907,25 +969,36 @@ 
 */

 function parseWordOrQuotedString($s, &$p, &$w) {

     $sLen = strlen($s);

-    while ($p < $sLen && ord($s{$p}) <= 32) $p++;

-    if ($p >= $sLen) return false;

-    if (substr($s, $p, 1) == '"')

-        return $this->parseQuotedString($s, $p, $w);

-    else

-        return $this->parseWord($s, $p, $w); }

+    while ($p < $sLen && ord($s{$p}) <= 32) {
+        $p++;
+    }
+    if ($p >= $sLen) {
+        return false;
+    }
+    if (substr($s, $p, 1) == '"') {
+            return $this->parseQuotedString($s, $p, $w);
+    } else {
+            return $this->parseWord($s, $p, $w);
+    }
+    }

 

 /**

 * Combine two file system paths.

 * @access private

 */

 function combineFileSystemPath($path1, $path2) {

-    if ($path1 == '' || $path2 == '') return $path2;

+    if ($path1 == '' || $path2 == '') {
+        return $path2;
+    }
     $s = $path1;

-    if (substr($s, -1) != '\\' && substr($s, -1) != '/') $s = $s."/";

-    if (substr($path2, 0, 1) == '\\' || substr($path2, 0, 1) == '/')

-        $s = $s.substr($path2, 1);

-    else

-        $s = $s.$path2;

+    if (substr($s, -1) != '\\' && substr($s, -1) != '/') {
+        $s = $s."/";
+    }
+    if (substr($path2, 0, 1) == '\\' || substr($path2, 0, 1) == '/') {
+            $s = $s.substr($path2, 1);
+    } else {
+            $s = $s.$path2;
+    }
     return $s; }

 

 /**

lib/phpqrcode/phpqrcode.php

Braces +17 added lines, -9 removed lines

@@ -225,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');

@@ -1591,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);

@@ -2231,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);

             }

lib/phpqrcode/bindings/tcpdf/qrcode.php

Switch Indentation +128 added lines, -128 removed lines

@@ -1461,26 +1461,26 @@ 
                 }
                 $mode = $this->identifyMode(0);
                 switch ($mode) {
-                    case QR_MODE_NM: {
-                        $length = $this->eatNum();
-                        break;
-                    }
-                    case QR_MODE_AN: {
-                        $length = $this->eatAn();
-                        break;
-                    }
-                    case QR_MODE_KJ: {
-                        if ($this->hint == QR_MODE_KJ) {
-                            $length = $this->eatKanji();
-                        } else {
-                            $length = $this->eat8();
-                        }
-                        break;
-                    }
-                    default: {
+                case QR_MODE_NM: {
+                    $length = $this->eatNum();
+                    break;
+                }
+                case QR_MODE_AN: {
+                    $length = $this->eatAn();
+                    break;
+                }
+                case QR_MODE_KJ: {
+                    if ($this->hint == QR_MODE_KJ) {
+                        $length = $this->eatKanji();
+                    } else {
                         $length = $this->eat8();
-                        break;
                     }
+                    break;
+                }
+                default: {
+                    $length = $this->eat8();
+                    break;
+                }
                 }
                 if ($length == 0) {
                     return 0;
@@ -1665,29 +1665,29 @@ 
                 $inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
             } else {
                 switch ($inputitem['mode']) {
-                    case QR_MODE_NM: {
-                        $inputitem = $this->encodeModeNum($inputitem, $version);
-                        break;
-                    }
-                    case QR_MODE_AN: {
-                        $inputitem = $this->encodeModeAn($inputitem, $version);
-                        break;
-                    }
-                    case QR_MODE_8B: {
-                        $inputitem = $this->encodeMode8($inputitem, $version);
-                        break;
-                    }
-                    case QR_MODE_KJ: {
-                        $inputitem = $this->encodeModeKanji($inputitem, $version);
-                        break;
-                    }
-                    case QR_MODE_ST: {
-                        $inputitem = $this->encodeModeStructure($inputitem);
-                        break;
-                    }
-                    default: {
-                        break;
-                    }
+                case QR_MODE_NM: {
+                    $inputitem = $this->encodeModeNum($inputitem, $version);
+                    break;
+                }
+                case QR_MODE_AN: {
+                    $inputitem = $this->encodeModeAn($inputitem, $version);
+                    break;
+                }
+                case QR_MODE_8B: {
+                    $inputitem = $this->encodeMode8($inputitem, $version);
+                    break;
+                }
+                case QR_MODE_KJ: {
+                    $inputitem = $this->encodeModeKanji($inputitem, $version);
+                    break;
+                }
+                case QR_MODE_ST: {
+                    $inputitem = $this->encodeModeStructure($inputitem);
+                    break;
+                }
+                default: {
+                    break;
+                }
                 }
             }
             return $inputitem;
@@ -1774,17 +1774,17 @@ 
             $w = (int) $size / 3;
             $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;
         }
@@ -1876,24 +1876,24 @@ 
                 return false;
             }
             switch ($mode) {
-                case QR_MODE_NM: {
-                    return $this->checkModeNum($size, $data);
-                }
-                case QR_MODE_AN: {
-                    return $this->checkModeAn($size, $data);
-                }
-                case QR_MODE_KJ: {
-                    return $this->checkModeKanji($size, $data);
-                }
-                case QR_MODE_8B: {
-                    return true;
-                }
-                case QR_MODE_ST: {
-                    return true;
-                }
-                default: {
-                    break;
-                }
+            case QR_MODE_NM: {
+                return $this->checkModeNum($size, $data);
+            }
+            case QR_MODE_AN: {
+                return $this->checkModeAn($size, $data);
+            }
+            case QR_MODE_KJ: {
+                return $this->checkModeKanji($size, $data);
+            }
+            case QR_MODE_8B: {
+                return true;
+            }
+            case QR_MODE_ST: {
+                return true;
+            }
+            default: {
+                break;
+            }
             }
             return false;
         }
@@ -1911,28 +1911,28 @@ 
             }
             foreach ($items as $item) {
                 switch ($item['mode']) {
-                    case QR_MODE_NM: {
-                        $bits = $this->estimateBitsModeNum($item['size']);
-                        break;
-                    }
-                    case QR_MODE_AN: {
-                        $bits = $this->estimateBitsModeAn($item['size']);
-                        break;
-                    }
-                    case QR_MODE_8B: {
-                        $bits = $this->estimateBitsMode8($item['size']);
-                        break;
-                    }
-                    case QR_MODE_KJ: {
-                        $bits = $this->estimateBitsModeKanji($item['size']);
-                        break;
-                    }
-                    case QR_MODE_ST: {
-                        return STRUCTURE_HEADER_BITS;
-                    }
-                    default: {
-                        return 0;
-                    }
+                case QR_MODE_NM: {
+                    $bits = $this->estimateBitsModeNum($item['size']);
+                    break;
+                }
+                case QR_MODE_AN: {
+                    $bits = $this->estimateBitsModeAn($item['size']);
+                    break;
+                }
+                case QR_MODE_8B: {
+                    $bits = $this->estimateBitsMode8($item['size']);
+                    break;
+                }
+                case QR_MODE_KJ: {
+                    $bits = $this->estimateBitsModeKanji($item['size']);
+                    break;
+                }
+                case QR_MODE_ST: {
+                    return STRUCTURE_HEADER_BITS;
+                }
+                default: {
+                    return 0;
+                }
                 }
                 $l = $this->lengthIndicator($item['mode'], $version);
                 $m = 1 << $l;
@@ -1971,42 +1971,42 @@ 
             protected function lengthOfCode($mode, $version, $bits) {
             $payload = $bits - 4 - $this->lengthIndicator($mode, $version);
             switch ($mode) {
-                case QR_MODE_NM: {
-                    $chunks = (int) ($payload / 10);
-                    $remain = $payload - $chunks * 10;
-                    $size = $chunks * 3;
-                    if ($remain >= 7) {
-                        $size += 2;
-                    } elseif ($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_8B: {
-                    $size = (int) ($payload / 8);
-                    break;
-                }
-                case QR_MODE_KJ: {
-                    $size = (int) (($payload / 13) * 2);
-                    break;
-                }
-                case QR_MODE_ST: {
-                    $size = (int) ($payload / 8);
-                    break;
-                }
-                default: {
-                    $size = 0;
-                    break;
-                }
+            case QR_MODE_NM: {
+                $chunks = (int) ($payload / 10);
+                $remain = $payload - $chunks * 10;
+                $size = $chunks * 3;
+                if ($remain >= 7) {
+                    $size += 2;
+                } elseif ($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_8B: {
+                $size = (int) ($payload / 8);
+                break;
+            }
+            case QR_MODE_KJ: {
+                $size = (int) (($payload / 13) * 2);
+                break;
+            }
+            case QR_MODE_ST: {
+                $size = (int) ($payload / 8);
+                break;
+            }
+            default: {
+                $size = 0;
+                break;
+            }
             }
             $maxsize = $this->maximumWords($mode, $version);
             if ($size < 0) {

lib/phpqrcode/qrinput.php

Braces +3 added lines, -2 removed lines

@@ -566,8 +566,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);

lib/phpqrcode/qrsplit.php

Braces +11 added lines, -5 removed lines

@@ -266,16 +266,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);

             }

lib/phpqrcode/qrtools.php

Braces +3 added lines, -2 removed lines

@@ -92,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');