codysnider / tt-rss

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

Braces +47 added lines, -35 removed lines

@@ -140,8 +140,9 @@ 
   function load_tables() {
 	if (is_array($this->cache_translations) &&
 	  is_array($this->table_originals) &&
-	  is_array($this->table_translations))
-	  return;
+	  is_array($this->table_translations)) {
+		  return;
+	}
 
 	/* get original and translations tables */
 	if (!is_array($this->table_originals)) {
@@ -176,8 +177,9 @@ 
   function get_original_string($num) {
 	$length = $this->table_originals[$num * 2 + 1];
 	$offset = $this->table_originals[$num * 2 + 2];
-	if (! $length)
-	  return '';
+	if (! $length) {
+		  return '';
+	}
 	$this->STREAM->seekto($offset);
 	$data = $this->STREAM->read($length);
 	return (string)$data;
@@ -193,8 +195,9 @@ 
   function get_translation_string($num) {
 	$length = $this->table_translations[$num * 2 + 1];
 	$offset = $this->table_translations[$num * 2 + 2];
-	if (! $length)
-	  return '';
+	if (! $length) {
+		  return '';
+	}
 	$this->STREAM->seekto($offset);
 	$data = $this->STREAM->read($length);
 	return (string)$data;
@@ -218,10 +221,11 @@ 
 	if (abs($start - $end) <= 1) {
 	  // We're done, now we either found the string, or it doesn't exist
 	  $txt = $this->get_original_string($start);
-	  if ($string == $txt)
-		return $start;
-	  else
-		return -1;
+	  if ($string == $txt) {
+	  		return $start;
+	  } else {
+	  		return -1;
+	  }
 	} else if ($start > $end) {
 	  // start > end -> turn around and start over
 	  return $this->find_string($string, $end, $start);
@@ -229,15 +233,16 @@ 
 	  // Divide table in two parts
 	  $half = (int)(($start + $end) / 2);
 	  $cmp = strcmp($string, $this->get_original_string($half));
-	  if ($cmp == 0)
-		// string is exactly in the middle => return it
+	  if ($cmp == 0) {
+	  		// string is exactly in the middle => return it
 		return $half;
-	  else if ($cmp < 0)
-		// The string is in the upper half
+	  } else if ($cmp < 0) {
+	  		// The string is in the upper half
 		return $this->find_string($string, $start, $half);
-	  else
-		// The string is in the lower half
+	  } else {
+	  		// The string is in the lower half
 		return $this->find_string($string, $half, $end);
+	  }
 	}
   }
 
@@ -249,23 +254,26 @@ 
    * @return string translated string (or original, if not found)
    */
   function translate($string) {
-	if ($this->short_circuit)
-	  return $string;
+	if ($this->short_circuit) {
+		  return $string;
+	}
 	$this->load_tables();
 
 	if ($this->enable_cache) {
 	  // Caching enabled, get translated string from cache
-	  if (array_key_exists($string, $this->cache_translations))
-		return $this->cache_translations[$string];
-	  else
-		return $string;
+	  if (array_key_exists($string, $this->cache_translations)) {
+	  		return $this->cache_translations[$string];
+	  } else {
+	  		return $string;
+	  }
 	} else {
 	  // Caching not enabled, try to find string
 	  $num = $this->find_string($string);
-	  if ($num == -1)
-		return $string;
-	  else
-		return $this->get_translation_string($num);
+	  if ($num == -1) {
+	  		return $string;
+	  } else {
+	  		return $this->get_translation_string($num);
+	  }
 	}
   }
 
@@ -311,10 +319,11 @@ 
    * @return string verbatim plural form header field
    */
   function extract_plural_forms_header_from_po_header($header) {
-	if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs))
-	  $expr = $regs[2];
-	else
-	  $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+	if (preg_match("/(^|\n)plural-forms: ([^\n]*)\n/i", $header, $regs)) {
+		  $expr = $regs[2];
+	} else {
+		  $expr = "nplurals=2; plural=n == 1 ? 0 : 1;";
+	}
 	return $expr;
   }
 
@@ -363,7 +372,9 @@ 
 	$plural = 0;
 
 	eval("$string");
-	if ($plural >= $total) $plural = $total - 1;
+	if ($plural >= $total) {
+		$plural = $total - 1;
+	}
 	return $plural;
   }
 
@@ -378,10 +389,11 @@ 
    */
   function ngettext($single, $plural, $number) {
 	if ($this->short_circuit) {
-	  if ($number != 1)
-		return $plural;
-	  else
-		return $single;
+	  if ($number != 1) {
+	  		return $plural;
+	  } else {
+	  		return $single;
+	  }
 	}
 
 	// find out the appropriate form

lib/gettext/gettext.inc

Braces +149 added lines, -95 removed lines

@@ -80,32 +80,45 @@ 
 				   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
 				   $locale, $matches)) {
 
-	  if (isset($matches["lang"])) $lang = $matches["lang"];
-	  if (isset($matches["country"])) $country = $matches["country"];
-	  if (isset($matches["charset"])) $charset = $matches["charset"];
-	  if (isset($matches["modifier"])) $modifier = $matches["modifier"];
+	  if (isset($matches["lang"])) {
+	  	$lang = $matches["lang"];
+	  }
+	  if (isset($matches["country"])) {
+	  	$country = $matches["country"];
+	  }
+	  if (isset($matches["charset"])) {
+	  	$charset = $matches["charset"];
+	  }
+	  if (isset($matches["modifier"])) {
+	  	$modifier = $matches["modifier"];
+	  }
 
 	  if ($modifier) {
 		if ($country) {
-		  if ($charset)
-			array_push($locale_names, "${lang}_$country.$charset@$modifier");
+		  if ($charset) {
+		  			array_push($locale_names, "${lang}_$country.$charset@$modifier");
+		  }
 		  array_push($locale_names, "${lang}_$country@$modifier");
-		} elseif ($charset)
-			array_push($locale_names, "${lang}.$charset@$modifier");
+		} elseif ($charset) {
+					array_push($locale_names, "${lang}.$charset@$modifier");
+		}
 		array_push($locale_names, "$lang@$modifier");
 	  }
 	  if ($country) {
-		if ($charset)
-		  array_push($locale_names, "${lang}_$country.$charset");
+		if ($charset) {
+				  array_push($locale_names, "${lang}_$country.$charset");
+		}
 		array_push($locale_names, "${lang}_$country");
-	  } elseif ($charset)
-		  array_push($locale_names, "${lang}.$charset");
+	  } elseif ($charset) {
+	  		  array_push($locale_names, "${lang}.$charset");
+	  }
 	  array_push($locale_names, $lang);
 	}
 
 	// If the locale name doesn't match POSIX style, just include it as-is.
-	if (!in_array($locale, $locale_names))
-	  array_push($locale_names, $locale);
+	if (!in_array($locale, $locale_names)) {
+		  array_push($locale_names, $locale);
+	}
   }
   return $locale_names;
 }
@@ -115,7 +128,9 @@ 
  */
 function _get_reader($domain=null, $category=5, $enable_cache=true) {
 	global $text_domains, $default_domain, $LC_CATEGORIES;
-	if (!isset($domain)) $domain = $default_domain;
+	if (!isset($domain)) {
+		$domain = $default_domain;
+	}
 	if (!isset($text_domains[$domain]->l10n)) {
 		// get the current locale
 		$locale = _setlocale(LC_MESSAGES, 0);
@@ -156,8 +171,9 @@ 
  */
 function _check_locale_and_function($function=false) {
 	global $EMULATEGETTEXT;
-	if ($function and !function_exists($function))
-		return false;
+	if ($function and !function_exists($function)) {
+			return false;
+	}
 	return !$EMULATEGETTEXT;
 }
 
@@ -166,7 +182,9 @@ 
  */
 function _get_codeset($domain=null) {
 	global $text_domains, $default_domain, $LC_CATEGORIES;
-	if (!isset($domain)) $domain = $default_domain;
+	if (!isset($domain)) {
+		$domain = $default_domain;
+	}
 	return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
@@ -177,8 +195,9 @@ 
   $target_encoding = _get_codeset();
   if (function_exists("mb_detect_encoding")) {
 	$source_encoding = mb_detect_encoding($text);
-	if ($source_encoding != $target_encoding)
-	  $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+	if ($source_encoding != $target_encoding) {
+		  $text = mb_convert_encoding($text, $target_encoding, $source_encoding);
+	}
   }
   return $text;
 }
@@ -190,11 +209,13 @@ 
  * Returns passed in $locale, or environment variable $LANG if $locale == ''.
  */
 function _get_default_locale($locale) {
-  if ($locale == '') // emulate variable support
+  if ($locale == '') {
+  	// emulate variable support
 	return getenv('LANG');
-  else
-	return $locale;
-}
+  } else {
+  	return $locale;
+  }
+  }
 
 /**
  * Sets a requested locale, if needed emulates it.
@@ -202,12 +223,13 @@ 
 function _setlocale($category, $locale) {
 	global $CURRENTLOCALE, $EMULATEGETTEXT;
 	if ($locale === 0) { // use === to differentiate between string "0"
-		if ($CURRENTLOCALE != '')
-			return $CURRENTLOCALE;
-		else
-			// obey LANG variable, maybe extend to support all of LC_* vars
+		if ($CURRENTLOCALE != '') {
+					return $CURRENTLOCALE;
+		} else {
+					// obey LANG variable, maybe extend to support all of LC_* vars
 			// even if we tried to read locale without setting it first
 			return _setlocale($category, $CURRENTLOCALE);
+		}
 	} else {
 		if (function_exists('setlocale')) {
 		  $ret = setlocale($category, $locale);
@@ -241,11 +263,13 @@ 
 	global $text_domains;
 	// ensure $path ends with a slash ('/' should work for both, but lets still play nice)
 	if (substr(php_uname(), 0, 7) == "Windows") {
-	  if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/')
-		$path .= '\\';
+	  if ($path[strlen($path)-1] != '\\' and $path[strlen($path)-1] != '/') {
+	  		$path .= '\\';
+	  }
 	} else {
-	  if ($path[strlen($path)-1] != '/')
-		$path .= '/';
+	  if ($path[strlen($path)-1] != '/') {
+	  		$path .= '/';
+	  }
 	}
 	if (!array_key_exists($domain, $text_domains)) {
 	  // Initialize an empty domain object.
@@ -384,96 +408,126 @@ 
 }
 
 function T_bindtextdomain($domain, $path) {
-	if (_check_locale_and_function()) return bindtextdomain($domain, $path);
-	else return _bindtextdomain($domain, $path);
-}
+	if (_check_locale_and_function()) {
+		return bindtextdomain($domain, $path);
+	} else {
+		return _bindtextdomain($domain, $path);
+	}
+	}
 function T_bind_textdomain_codeset($domain, $codeset) {
 	// bind_textdomain_codeset is available only in PHP 4.2.0+
-	if (_check_locale_and_function('bind_textdomain_codeset'))
-		return bind_textdomain_codeset($domain, $codeset);
-	else return _bind_textdomain_codeset($domain, $codeset);
-}
+	if (_check_locale_and_function('bind_textdomain_codeset')) {
+			return bind_textdomain_codeset($domain, $codeset);
+	} else {
+		return _bind_textdomain_codeset($domain, $codeset);
+	}
+	}
 function T_textdomain($domain) {
-	if (_check_locale_and_function()) return textdomain($domain);
-	else return _textdomain($domain);
-}
+	if (_check_locale_and_function()) {
+		return textdomain($domain);
+	} else {
+		return _textdomain($domain);
+	}
+	}
 function T_gettext($msgid) {
-	if (_check_locale_and_function()) return gettext($msgid);
-	else return _gettext($msgid);
-}
+	if (_check_locale_and_function()) {
+		return gettext($msgid);
+	} else {
+		return _gettext($msgid);
+	}
+	}
 function T_($msgid) {
-	if (_check_locale_and_function()) return _($msgid);
+	if (_check_locale_and_function()) {
+		return _($msgid);
+	}
 	return __($msgid);
 }
 function T_ngettext($singular, $plural, $number) {
-	if (_check_locale_and_function())
-		return ngettext($singular, $plural, $number);
-	else return _ngettext($singular, $plural, $number);
-}
+	if (_check_locale_and_function()) {
+			return ngettext($singular, $plural, $number);
+	} else {
+		return _ngettext($singular, $plural, $number);
+	}
+	}
 function T_dgettext($domain, $msgid) {
-	if (_check_locale_and_function()) return dgettext($domain, $msgid);
-	else return _dgettext($domain, $msgid);
-}
+	if (_check_locale_and_function()) {
+		return dgettext($domain, $msgid);
+	} else {
+		return _dgettext($domain, $msgid);
+	}
+	}
 function T_dngettext($domain, $singular, $plural, $number) {
-	if (_check_locale_and_function())
-		return dngettext($domain, $singular, $plural, $number);
-	else return _dngettext($domain, $singular, $plural, $number);
-}
+	if (_check_locale_and_function()) {
+			return dngettext($domain, $singular, $plural, $number);
+	} else {
+		return _dngettext($domain, $singular, $plural, $number);
+	}
+	}
 function T_dcgettext($domain, $msgid, $category) {
-	if (_check_locale_and_function())
-		return dcgettext($domain, $msgid, $category);
-	else return _dcgettext($domain, $msgid, $category);
-}
+	if (_check_locale_and_function()) {
+			return dcgettext($domain, $msgid, $category);
+	} else {
+		return _dcgettext($domain, $msgid, $category);
+	}
+	}
 function T_dcngettext($domain, $singular, $plural, $number, $category) {
-	if (_check_locale_and_function())
-	  return dcngettext($domain, $singular, $plural, $number, $category);
-	else return _dcngettext($domain, $singular, $plural, $number, $category);
-}
+	if (_check_locale_and_function()) {
+		  return dcngettext($domain, $singular, $plural, $number, $category);
+	} else {
+		return _dcngettext($domain, $singular, $plural, $number, $category);
+	}
+	}
 
 function T_pgettext($context, $msgid) {
-  if (_check_locale_and_function('pgettext'))
-	  return pgettext($context, $msgid);
-  else
-	  return _pgettext($context, $msgid);
-}
+  if (_check_locale_and_function('pgettext')) {
+  	  return pgettext($context, $msgid);
+  } else {
+  	  return _pgettext($context, $msgid);
+  }
+  }
 
 function T_dpgettext($domain, $context, $msgid) {
-  if (_check_locale_and_function('dpgettext'))
-	  return dpgettext($domain, $context, $msgid);
-  else
-	  return _dpgettext($domain, $context, $msgid);
-}
+  if (_check_locale_and_function('dpgettext')) {
+  	  return dpgettext($domain, $context, $msgid);
+  } else {
+  	  return _dpgettext($domain, $context, $msgid);
+  }
+  }
 
 function T_dcpgettext($domain, $context, $msgid, $category) {
-  if (_check_locale_and_function('dcpgettext'))
-	  return dcpgettext($domain, $context, $msgid, $category);
-  else
-	  return _dcpgettext($domain, $context, $msgid, $category);
-}
+  if (_check_locale_and_function('dcpgettext')) {
+  	  return dcpgettext($domain, $context, $msgid, $category);
+  } else {
+  	  return _dcpgettext($domain, $context, $msgid, $category);
+  }
+  }
 
 function T_npgettext($context, $singular, $plural, $number) {
-	if (_check_locale_and_function('npgettext'))
-		return npgettext($context, $singular, $plural, $number);
-	else
-		return _npgettext($context, $singular, $plural, $number);
-}
+	if (_check_locale_and_function('npgettext')) {
+			return npgettext($context, $singular, $plural, $number);
+	} else {
+			return _npgettext($context, $singular, $plural, $number);
+	}
+	}
 
 function T_dnpgettext($domain, $context, $singular, $plural, $number) {
-  if (_check_locale_and_function('dnpgettext'))
-	  return dnpgettext($domain, $context, $singular, $plural, $number);
-  else
-	  return _dnpgettext($domain, $context, $singular, $plural, $number);
-}
+  if (_check_locale_and_function('dnpgettext')) {
+  	  return dnpgettext($domain, $context, $singular, $plural, $number);
+  } else {
+  	  return _dnpgettext($domain, $context, $singular, $plural, $number);
+  }
+  }
 
 function T_dcnpgettext($domain, $context, $singular, $plural,
 					   $number, $category) {
-	if (_check_locale_and_function('dcnpgettext'))
-		return dcnpgettext($domain, $context, $singular,
+	if (_check_locale_and_function('dcnpgettext')) {
+			return dcnpgettext($domain, $context, $singular,
 						   $plural, $number, $category);
-	else
-		return _dcnpgettext($domain, $context, $singular,
+	} else {
+			return _dcnpgettext($domain, $context, $singular,
 							$plural, $number, $category);
-}
+	}
+	}
 
 
 

lib/gettext/streams.php

Braces +9 added lines, -5 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;
   }
 
@@ -117,7 +119,9 @@ 
 	  $this->_pos = ftell($this->_fd);
 
 	  return $data;
-	} else return '';
+	} else {
+		return '';
+	}
   }
 
   function seekto($pos) {

lib/phpqrcode/qrimage.php

Braces +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
 					ImagePng($image, $filename);

 					header("Content-type: image/png");

 					ImagePng($image);

-				}else{

+				} else{

 					ImagePng($image, $filename);

 				}

 			}

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

Braces +15 added lines, -10 removed lines

@@ -33,8 +33,9 @@ 
 	include "qrlib.php";    

     

 	//ofcourse we need rights to create temp dir

-	if (!file_exists($PNG_TEMP_DIR))

-		mkdir($PNG_TEMP_DIR);
+	if (!file_exists($PNG_TEMP_DIR)) {
+			mkdir($PNG_TEMP_DIR);
+	}
     

     

 	$filename = $PNG_TEMP_DIR.'test.png';

@@ -42,19 +43,22 @@ 
 	//processing form input

 	//remember to sanitize user input in real-life solution !!!

 	$errorCorrectionLevel = 'L';

-	if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H')))

-		$errorCorrectionLevel = $_REQUEST['level'];    

+	if (isset($_REQUEST['level']) && in_array($_REQUEST['level'], array('L','M','Q','H'))) {
+			$errorCorrectionLevel = $_REQUEST['level'];
+	}
 

 	$matrixPointSize = 4;

-	if (isset($_REQUEST['size']))

-		$matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);

+	if (isset($_REQUEST['size'])) {
+			$matrixPointSize = min(max((int)$_REQUEST['size'], 1), 10);
+	}
 

 
 	if (isset($_REQUEST['data'])) { 

     

 		//it's very important!

-		if (trim($_REQUEST['data']) == '')

-			die('data cannot be empty! <a href="?">back</a>');

+		if (trim($_REQUEST['data']) == '') {
+					die('data cannot be empty! <a href="?">back</a>');
+		}
             
 		// user data

 		$filename = $PNG_TEMP_DIR.'test'.md5($_REQUEST['data'].'|'.$errorCorrectionLevel.'|'.$matrixPointSize).'.png';
@@ -82,8 +86,9 @@ 
         </select>&nbsp;

         Size:&nbsp;<select name="size">';

         

-	for($i=1;$i<=10;$i++)

-		echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';

+	for($i=1;$i<=10;$i++) {
+			echo '<option value="'.$i.'"'.(($matrixPointSize==$i)?' selected':'').'>'.$i.'</option>';
+	}
         

 	echo '</select>&nbsp;

         <input type="submit" value="GENERATE"></form><hr/>';

lib/phpqrcode/qrtools.php

Braces +12 added lines, -8 removed lines

@@ -43,8 +43,9 @@ 
 		{

 			$barcode_array = array();

             

-			if (!is_array($mode))

-				$mode = explode(',', $mode);

+			if (!is_array($mode)) {
+							$mode = explode(',', $mode);
+			}
                 

 			$eccLevel = 'L';

                 

@@ -61,8 +62,9 @@ 
                 

 			foreach ($qrTab as $line) {

 				$arrAdd = array();

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

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

+				foreach(str_split($line) as $char) {
+									$arrAdd[] = ($char=='1')?1:0;
+				}
 				$barcode_array['bcode'][] = $arrAdd;

 			}

                     

@@ -90,8 +92,9 @@ 
 				

 				$width = count($frame);

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

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

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

+				for ($maskNo = 0; $maskNo < 8; $maskNo++) {
+									$mask->makeMaskNo($maskNo, $width, $frame, $bitMask, true);
+				}
 			}

 			

 			QRtools::markTime('after_build_cache');

@@ -128,8 +131,9 @@ 
 			list($usec, $sec) = explode(" ", microtime());

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

             

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

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

+			if (!isset($GLOBALS['qr_time_bench'])) {
+							$GLOBALS['qr_time_bench'] = array();
+			}
             

 			$GLOBALS['qr_time_bench'][$markerId] = $time;

 		}