codysnider / tt-rss

install/index.php

Braces +3 added lines, -1 removed lines

@@ -17,7 +17,9 @@
 
 		$timestamp = filemtime($filename);
 
-		if ($query) $timestamp .= "&$query";
+		if ($query) {
+			$timestamp .= "&$query";
+		}
 
 		return "<script type=\"text/javascript\" charset=\"utf-8\" src=\"$filename?$timestamp\"></script>\n";
 	}

opml.php

Braces +3 added lines, -1 removed lines

@@ -10,7 +10,9 @@
 	require_once "db.php";
 	require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	$op = $_REQUEST['op'];
 

lib/MiniTemplator.class.php

Braces +177 added lines, -82 removed lines

@@ -175,7 +175,9 @@ 
    if (!$this->readFileIntoString($fileName,$s)) {

       $this->triggerError ("Error while reading template file " . $fileName . ".");

       return false; }

-   if (!$this->setTemplateString($s)) return false;

+   if (!$this->setTemplateString($s)) {
+   	return false;
+   }
    return true; }

 

 /**

@@ -187,7 +189,9 @@ 
 function setTemplateString ($templateString) {

    $this->templateValid = false;

    $this->template = $templateString;

-   if (!$this->parseTemplate()) return false;

+   if (!$this->parseTemplate()) {
+   	return false;
+   }
    $this->reset();

    $this->templateValid = true;

    return true; }

@@ -214,10 +218,16 @@ 
 function parseTemplate() {

    $this->initParsing();

    $this->beginMainBlock();

-   if (!$this->parseTemplateCommands()) return false;

+   if (!$this->parseTemplateCommands()) {
+   	return false;
+   }
    $this->endMainBlock();

-   if (!$this->checkBlockDefinitionsComplete()) return false;

-   if (!$this->parseTemplateVariables()) return false;

+   if (!$this->checkBlockDefinitionsComplete()) {
+   	return false;
+   }
+   if (!$this->parseTemplateVariables()) {
+   	return false;
+   }
    $this->associateVariablesWithBlocks();

    return true; }

 

@@ -272,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; }

 

 /**

@@ -292,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:

@@ -377,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;

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

@@ -443,7 +467,9 @@ 
    $p = 0;

    while (true) {

       $p = strpos($this->template, '${', $p);

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

+      if ($p === false) {
+      	break;
+      }
       $p0 = $p;

       $p = strpos($this->template, '}', $p);

       if ($p === false) {

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

@@ -502,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; }}

@@ -523,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;

@@ -551,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;

@@ -619,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

@@ -666,7 +701,9 @@ 
 */

 function generateOutput () {

    $this->outputMode = 0;

-   if (!$this->generateOutputPage()) return false;

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

 

 /**

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

@@ -695,7 +734,9 @@ 
    $outputString = "Error";

    $this->outputMode = 2;

    $this->outputString = "";

-   if (!$this->generateOutputPage()) return false;

+   if (!$this->generateOutputPage()) {
+   	return false;
+   }
    $outputString = $this->outputString;

    return true; }

 

@@ -705,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; }

 

 /**

@@ -725,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']; }}

 

@@ -762,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'];

@@ -778,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;

@@ -789,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;

@@ -812,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; }

 

@@ -825,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; }

 

@@ -839,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; }

 

 /**

@@ -856,10 +924,16 @@ 
 */

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

    $sLen = strlen($s);

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

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

+   while ($p < $sLen && ord($s{$p}) <= 32) {
+   	$p++;
+   }
+   if ($p >= $sLen) {
+   	return false;
+   }
    $p0 = $p;

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

+   while ($p < $sLen && ord($s{$p}) > 32) {
+   	$p++;
+   }
    $w = substr($s, $p0, $p - $p0);

    return true; }

 

@@ -869,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; }

@@ -885,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/jimIcon.php

Braces +21 added lines, -14 removed lines

@@ -24,13 +24,15 @@ 
                 $r = ord($str[2]);
                 if (strlen($str) > 3) {
                         $a = 127 - (ord($str[3]) / 2);
-                        if ($a != 0 && $a != 127)
-                                $this->had_alpha = 1;
+                        if ($a != 0 && $a != 127) {
+                                                        $this->had_alpha = 1;
+                        }
                 } else {
                         $a = 0;
                 }
-                if ($a != 127)
-                        $this->all_transaprent = 0;
+                if ($a != 127) {
+                                        $this->all_transaprent = 0;
+                }
                 return imagecolorallocatealpha($img, $r, $g, $b, $a);
         }
 
@@ -65,8 +67,9 @@ 
                 $most_pixels = 0;
                 for ($i = 0; $i < $h["num"]; $i++) {
                         $entry = substr($ico, 6 + 16 * $i, 16);
-                        if (!$entry || strlen($entry) < 16)
-                                continue;
+                        if (!$entry || strlen($entry) < 16) {
+                                                        continue;
+                        }
                         $e = unpack("Cwidth/" .
                                     "Cheight/" .
                                     "Ccolors/" .
@@ -76,10 +79,12 @@ 
                                     "Vsize/" .
                                     "Voffset/",
                                     $entry);
-                        if ($e["width"] == 0)
-                                $e["width"] = 256;
-                        if ($e["height"] == 0)
-                                $e["height"] = 256;
+                        if ($e["width"] == 0) {
+                                                        $e["width"] = 256;
+                        }
+                        if ($e["height"] == 0) {
+                                                        $e["height"] = 256;
+                        }
                         if ($e["zero"] != 0) {
                                 $this->error = "nonzero reserved field";
                                 return false;
@@ -226,8 +231,9 @@ 
                                 }
                         }
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
 
                 // Now the "AND" image, which is 1 bit per pixel.  Ignore
@@ -261,8 +267,9 @@ 
                         }
 
                         // End of row padding
-                        while ($offset & 3)
-                                $offset++;
+                        while ($offset & 3) {
+                                                        $offset++;
+                        }
                 }
                 return $img;
         }

lib/phpqrcode/qrbitstream.php

Braces +12 added lines, -8 removed lines

@@ -108,13 +108,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);

@@ -125,13 +127,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);

lib/phpqrcode/qrsplit.php

Braces +38 added lines, -23 removed lines

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

         }

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

         }

@@ -65,8 +67,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];

             

@@ -120,8 +123,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;

         }

@@ -167,8 +171,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;

         }

@@ -183,8 +188,9 @@ 
             }

             

             $ret = $this->input->append(QR_MODE_KANJI, $p, str_split($this->dataStr));

-            if($ret < 0)

-                return -1;

+            if($ret < 0) {
+                            return -1;
+            }
 

             return $ret;

         }

@@ -238,8 +244,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;

         }

@@ -249,8 +256,9 @@ 
         {

             while (strlen($this->dataStr) > 0)

             {

-                if($this->dataStr == '')

-                    return 0;

+                if($this->dataStr == '') {
+                                    return 0;
+                }
 

                 $mode = $this->identifyMode(0);

                 

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

             }

@@ -303,8 +317,9 @@ 
 

             $split = new QRsplit($string, $input, $modeHint);

             

-            if(!$casesensitive)

-                $split->toUpper();

+            if(!$casesensitive) {
+                            $split->toUpper();
+            }
                 

             return $split->splitString();

         }

lib/phpqrcode/qrinput.php

Braces +33 added lines, -20 removed lines

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

@@ -257,8 +258,9 @@ 
                             break;

                     }

                     

-                    if($ret < 0)

-                        return -1;

+                    if($ret < 0) {
+                                            return -1;
+                    }
                 }

 

                 return $this->bstream->size();

@@ -475,8 +477,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]);

@@ -496,8 +499,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;

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

@@ -580,8 +585,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;

         }

@@ -594,8 +603,9 @@ 
             foreach($this->items as $item) {

                 $bits = $item->encodeBitStream($this->version);

                 

-                if($bits < 0) 

-                    return -1;

+                if($bits < 0) {
+                                    return -1;
+                }
                     

                 $total += $bits;

             }

@@ -614,8 +624,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) {

@@ -652,8 +663,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;

             

@@ -666,8 +678,9 @@ 
                 

                 $ret = $padding->appendBytes($padlen, $padbuf);

                 

-                if($ret < 0)

-                    return $ret;

+                if($ret < 0) {
+                                    return $ret;
+                }
                 

             }

 

lib/phpqrcode/qrencode.php

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/qrrscode.php

Braces +38 added lines, -13 removed lines

@@ -63,11 +63,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;

@@ -133,8 +145,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;

         }

@@ -192,12 +205,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;

             }