codysnider / tt-rss

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;

 			}

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

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

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];

 		}

lib/phpqrcode/qrmask.php

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)) {

lib/MiniTemplator.class.php

Braces +150 added lines, -73 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; }

 

 /**

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

 

 /**

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

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

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

@@ -451,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) {

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

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

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

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

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

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

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

 

 /**

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

 

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

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

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

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

 

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

 

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

 

 /**

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

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

 

 /**

classes/article.php

Braces +21 added lines, -16 removed lines

@@ -445,10 +445,12 @@ 
 
 								if (!$hide_images) {
 									$encsize = '';
-									if ($entry['height'] > 0)
-										$encsize .= ' height="'.intval($entry['height']).'"';
-									if ($entry['width'] > 0)
-										$encsize .= ' width="'.intval($entry['width']).'"';
+									if ($entry['height'] > 0) {
+																			$encsize .= ' height="'.intval($entry['height']).'"';
+									}
+									if ($entry['width'] > 0) {
+																			$encsize .= ' width="'.intval($entry['width']).'"';
+									}
 									$rv .= "<p><img
 										alt=\"".htmlspecialchars($entry["filename"])."\"
 										src=\"" .htmlspecialchars($entry["url"])."\"
@@ -480,15 +482,17 @@ 
 			$rv .= "<div dojoType=\"dijit.Menu\" style=\"display: none;\">";
 
 			foreach ($entries as $entry) {
-				if ($entry["title"])
-					$title = " &mdash; ".truncate_string($entry["title"], 30);
-				else
-					$title = "";
+				if ($entry["title"]) {
+									$title = " &mdash; ".truncate_string($entry["title"], 30);
+				} else {
+									$title = "";
+				}
 
-				if ($entry["filename"])
-					$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
-				else
-					$filename = "";
+				if ($entry["filename"]) {
+									$filename = truncate_middle(htmlspecialchars($entry["filename"]), 60);
+				} else {
+									$filename = "";
+				}
 
 				$rv .= "<div onclick='popupOpenUrl(\"".htmlspecialchars($entry["url"])."\")'
 					dojoType=\"dijit.MenuItem\">".$filename.$title."</div>";
@@ -639,10 +643,11 @@ 
 
 		// purge orphaned posts in main content table
 
-		if (DB_TYPE == "mysql")
-			$limit_qpart = "LIMIT 5000";
-		else
-			$limit_qpart = "";
+		if (DB_TYPE == "mysql") {
+					$limit_qpart = "LIMIT 5000";
+		} else {
+					$limit_qpart = "";
+		}
 
 		$pdo = Db::pdo();
 		$res = $pdo->query("DELETE FROM ttrss_entries WHERE

classes/feedparser.php

Braces +3 added lines, -1 removed lines

@@ -26,8 +26,10 @@
 		if ($error) {
 			foreach (libxml_get_errors() as $error) {
 				if ($error->level == LIBXML_ERR_FATAL) {
-					if (!isset($this->error)) //currently only the first error is reported
+					if (!isset($this->error)) {
+						//currently only the first error is reported
 						$this->error = $this->format_error($error);
+					}
 					$this->libxml_errors [] = $this->format_error($error);
 				}
 			}

classes/feeds.php

Braces +54 added lines, -33 removed lines

@@ -50,8 +50,9 @@ 
 			$reply .= strip_tags($feed_title);
 		}
 
-		if ($error)
-			$reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+		if ($error) {
+					$reply .= " <i title=\"".htmlspecialchars($error)."\" class='material-icons icon-error'>error</i>";
+		}
 
 		$reply .= "</span>";
 		$reply .= "<span id='feed_current_unread' style='display: none'></span>";
@@ -325,10 +326,11 @@ 
 
 				$line['content'] = DiskCache::rewriteUrls($line['content']);
 
-				if ($line['note'])
-					$line['note'] = Article::format_article_note($id, $line['note']);
-				else
-					$line['note'] = "";
+				if ($line['note']) {
+									$line['note'] = Article::format_article_note($id, $line['note']);
+				} else {
+									$line['note'] = "";
+				}
 
 				if (!get_pref("CDM_EXPANDED")) {
 					$line["cdm_excerpt"] = "<span class='collapse'>
@@ -395,8 +397,9 @@ 
 				/* we don't need those */
 
 				foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-							 "uuid", "label_cache", "yyiw"] as $k)
-					unset($line[$k]);
+							 "uuid", "label_cache", "yyiw"] as $k) {
+									unset($line[$k]);
+				}
 
 				array_push($reply['content'], $line);
 			}
@@ -1310,13 +1313,17 @@ 
 
 	public static function getCategoryUnread($cat, $owner_uid = false) {
 
-		if (!$owner_uid) $owner_uid = $_SESSION["uid"];
+		if (!$owner_uid) {
+			$owner_uid = $_SESSION["uid"];
+		}
 
 		$pdo = Db::pdo();
 
 		if ($cat >= 0) {
 
-			if (!$cat) $cat = null;
+			if (!$cat) {
+				$cat = null;
+			}
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
@@ -2279,56 +2286,68 @@ 
 				break;
 			case "note":
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
-					else if ($commandpair[1] == "false")
-						array_push($query_keywords, "($not (note IS NULL OR note = ''))");
-					else
-						array_push($query_keywords, "($not (LOWER(note) LIKE ".
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (note IS NOT NULL AND note != ''))");
+					} else if ($commandpair[1] == "false") {
+											array_push($query_keywords, "($not (note IS NULL OR note = ''))");
+					} else {
+											array_push($query_keywords, "($not (LOWER(note) LIKE ".
 							$pdo->quote('%' . mb_strtolower($commandpair[1]) . '%')."))");
+					}
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			case "star":
 
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (marked = true))");
-					else
-						array_push($query_keywords, "($not (marked = false))");
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (marked = true))");
+					} else {
+											array_push($query_keywords, "($not (marked = false))");
+					}
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			case "pub":
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (published = true))");
-					else
-						array_push($query_keywords, "($not (published = false))");
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (published = true))");
+					} else {
+											array_push($query_keywords, "($not (published = false))");
+					}
 
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER('%$k%')
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			case "unread":
 				if ($commandpair[1]) {
-					if ($commandpair[1] == "true")
-						array_push($query_keywords, "($not (unread = true))");
-					else
-						array_push($query_keywords, "($not (unread = false))");
+					if ($commandpair[1] == "true") {
+											array_push($query_keywords, "($not (unread = true))");
+					} else {
+											array_push($query_keywords, "($not (unread = false))");
+					}
 
 				} else {
 					array_push($query_keywords, "(UPPER(ttrss_entries.title) $not LIKE UPPER(".$pdo->quote("%$k%").")
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 				break;
 			default:
@@ -2351,7 +2370,9 @@ 
 								OR UPPER(ttrss_entries.content) $not LIKE UPPER(".$pdo->quote("%$k%")."))");
 					}
 
-					if (!$not) array_push($search_words, $k);
+					if (!$not) {
+						array_push($search_words, $k);
+					}
 				}
 			}
 		}