codysnider / tt-rss

errors.php

Spacing +2 added lines, -2 removed lines

@@ -6,10 +6,10 @@
 
 $ERRORS[0] = "";
 
-$ERRORS[1] = __("This program requires XmlHttpRequest " .
+$ERRORS[1] = __("This program requires XmlHttpRequest ".
 		"to function properly. Your browser doesn't seem to support it.");
 
-$ERRORS[2] = __("This program requires cookies " .
+$ERRORS[2] = __("This program requires cookies ".
 		"to function properly. Your browser doesn't seem to support them.");
 
 $ERRORS[3] = __("Backend sanity check failed.");

lib/jimIcon.php

Spacing +18 added lines, -18 removed lines

@@ -67,13 +67,13 @@ 
 						$entry = substr($ico, 6 + 16 * $i, 16);
 						if (!$entry || strlen($entry) < 16)
 								continue;
-						$e = unpack("Cwidth/" .
-									"Cheight/" .
-									"Ccolors/" .
-									"Czero/" .
-									"vplanes/" .
-									"vbpp/" .
-									"Vsize/" .
+						$e = unpack("Cwidth/".
+									"Cheight/".
+									"Ccolors/".
+									"Czero/".
+									"vplanes/".
+									"vbpp/".
+									"Vsize/".
 									"Voffset/",
 									$entry);
 						if ($e["width"] == 0)
@@ -122,16 +122,16 @@ 
 				// directory entry.
 				$bitmapinfo = unpack("Vsize", $data);
 				if ($bitmapinfo["size"] == 40) {
-						$info = unpack("Vsize/" .
-									   "Vwidth/" .
-									   "Vheight/" .
-									   "vplanes/" .
-									   "vbpp/" .
-									   "Vcompress/" .
-									   "Vsize/" .
-									   "Vxres/" .
-									   "Vyres/" .
-									   "Vpalcolors/" .
+						$info = unpack("Vsize/".
+									   "Vwidth/".
+									   "Vheight/".
+									   "vplanes/".
+									   "vbpp/".
+									   "Vcompress/".
+									   "Vsize/".
+									   "Vxres/".
+									   "Vyres/".
+									   "Vpalcolors/".
 									   "Vimpcolors/", $data);
 						if ($e["bpp"] == 0) {
 								$e["bpp"] = $info["bpp"];
@@ -212,7 +212,7 @@ 
 										$pixel1 = $palette[$p >> 4];
 										$pixel2 = $palette[$p & 0x0f];
 										$XOR[$y][$x] = $pixel1;
-										$XOR[$y][$x+1] = $pixel2;
+										$XOR[$y][$x + 1] = $pixel2;
 										$x += 2;
 										$offset++;
 								} elseif ($bpp == 8) {

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

Spacing +19 added lines, -19 removed lines

@@ -63,11 +63,11 @@ 
   function readint() {
 	  if ($this->BYTEORDER == 0) {
 		// low endian
-		$input=unpack('V', $this->STREAM->read(4));
+		$input = unpack('V', $this->STREAM->read(4));
 		return array_shift($input);
 	  } else {
 		// big endian
-		$input=unpack('N', $this->STREAM->read(4));
+		$input = unpack('N', $this->STREAM->read(4));
 		return array_shift($input);
 	  }
 	}
@@ -100,7 +100,7 @@ 
    */
   function __construct($Reader, $enable_cache = true) {
 	// If there isn't a StreamReader, turn on short circuit mode.
-	if (! $Reader || isset($Reader->error) ) {
+	if (!$Reader || isset($Reader->error)) {
 	  $this->short_circuit = true;
 	  return;
 	}
@@ -154,7 +154,7 @@ 
 	}
 
 	if ($this->enable_cache) {
-	  $this->cache_translations = array ();
+	  $this->cache_translations = array();
 	  /* read all strings in the cache */
 	  for ($i = 0; $i < $this->total; $i++) {
 		$this->STREAM->seekto($this->table_originals[$i * 2 + 2]);
@@ -176,11 +176,11 @@ 
   function get_original_string($num) {
 	$length = $this->table_originals[$num * 2 + 1];
 	$offset = $this->table_originals[$num * 2 + 2];
-	if (! $length)
+	if (!$length)
 	  return '';
 	$this->STREAM->seekto($offset);
 	$data = $this->STREAM->read($length);
-	return (string)$data;
+	return (string) $data;
   }
 
   /**
@@ -193,11 +193,11 @@ 
   function get_translation_string($num) {
 	$length = $this->table_translations[$num * 2 + 1];
 	$offset = $this->table_translations[$num * 2 + 2];
-	if (! $length)
+	if (!$length)
 	  return '';
 	$this->STREAM->seekto($offset);
 	$data = $this->STREAM->read($length);
-	return (string)$data;
+	return (string) $data;
   }
 
   /**
@@ -227,7 +227,7 @@ 
 	  return $this->find_string($string, $end, $start);
 	} else {
 	  // Divide table in two parts
-	  $half = (int)(($start + $end) / 2);
+	  $half = (int) (($start + $end) / 2);
 	  $cmp = strcmp($string, $this->get_original_string($half));
 	  if ($cmp == 0)
 		// string is exactly in the middle => return it
@@ -294,7 +294,7 @@ 
 		$res .= ') : (';
 		break;
 	  case ';':
-		$res .= str_repeat( ')', $p) . ';';
+		$res .= str_repeat(')', $p).';';
 		$p = 0;
 		break;
 	  default:
@@ -330,7 +330,7 @@ 
 	$this->load_tables();
 
 	// cache header field for plural forms
-	if (! is_string($this->pluralheader)) {
+	if (!is_string($this->pluralheader)) {
 	  if ($this->enable_cache) {
 		$header = $this->cache_translations[""];
 	  } else {
@@ -352,12 +352,12 @@ 
   function select_string($n) {
 	if (!is_int($n)) {
 	  throw new InvalidArgumentException(
-		"Select_string only accepts integers: " . $n);
+		"Select_string only accepts integers: ".$n);
 	}
 	$string = $this->get_plural_forms();
-	$string = str_replace('nplurals',"\$total",$string);
-	$string = str_replace("n",$n,$string);
-	$string = str_replace('plural',"\$plural",$string);
+	$string = str_replace('nplurals', "\$total", $string);
+	$string = str_replace("n", $n, $string);
+	$string = str_replace('plural', "\$plural", $string);
 
 	$total = 0;
 	$plural = 0;
@@ -388,11 +388,11 @@ 
 	$select = $this->select_string($number);
 
 	// this should contains all strings separated by NULLs
-	$key = $single . chr(0) . $plural;
+	$key = $single.chr(0).$plural;
 
 
 	if ($this->enable_cache) {
-	  if (! array_key_exists($key, $this->cache_translations)) {
+	  if (!array_key_exists($key, $this->cache_translations)) {
 		return ($number != 1) ? $plural : $single;
 	  } else {
 		$result = $this->cache_translations[$key];
@@ -412,7 +412,7 @@ 
   }
 
   function pgettext($context, $msgid) {
-	$key = $context . chr(4) . $msgid;
+	$key = $context.chr(4).$msgid;
 	$ret = $this->translate($key);
 	if (strpos($ret, "\004") !== FALSE) {
 	  return $msgid;
@@ -422,7 +422,7 @@ 
   }
 
   function npgettext($context, $singular, $plural, $number) {
-	$key = $context . chr(4) . $singular;
+	$key = $context.chr(4).$singular;
 	$ret = $this->ngettext($key, $plural, $number);
 	if (strpos($ret, "\004") !== FALSE) {
 	  return $singular;

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

Spacing +9 added lines, -9 removed lines

@@ -77,7 +77,7 @@ 
 	if (preg_match("/^(?P<lang>[a-z]{2,3})"              // language code
 				   ."(?:_(?P<country>[A-Z]{2}))?"           // country code
 				   ."(?:\.(?P<charset>[-A-Za-z0-9_]+))?"    // charset
-				   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/",  // @ modifier
+				   ."(?:@(?P<modifier>[-A-Za-z0-9_]+))?$/", // @ modifier
 				   $locale, $matches)) {
 
 	  if (isset($matches["lang"])) $lang = $matches["lang"];
@@ -113,7 +113,7 @@ 
 /**
  * Utility function to get a StreamReader for the given text domain.
  */
-function _get_reader($domain=null, $category=5, $enable_cache=true) {
+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($text_domains[$domain]->l10n)) {
@@ -121,12 +121,12 @@ 
 		$locale = _setlocale(LC_MESSAGES, 0);
 		$bound_path = isset($text_domains[$domain]->path) ?
 		  $text_domains[$domain]->path : './';
-		$subpath = $LC_CATEGORIES[$category] ."/$domain.mo";
+		$subpath = $LC_CATEGORIES[$category]."/$domain.mo";
 
 		$locale_names = get_list_of_locales($locale);
 		$input = null;
 		foreach ($locale_names as $locale) {
-		  $full_path = $bound_path . $locale . "/" . $subpath;
+		  $full_path = $bound_path.$locale."/".$subpath;
 		  if (file_exists($full_path)) {
 			$input = new FileReader($full_path);
 			break;
@@ -154,7 +154,7 @@ 
 /**
  * Checks if the current locale is supported on this system.
  */
-function _check_locale_and_function($function=false) {
+function _check_locale_and_function($function = false) {
 	global $EMULATEGETTEXT;
 	if ($function and !function_exists($function))
 		return false;
@@ -164,10 +164,10 @@ 
 /**
  * Get the codeset for the given domain.
  */
-function _get_codeset($domain=null) {
+function _get_codeset($domain = null) {
 	global $text_domains, $default_domain, $LC_CATEGORIES;
 	if (!isset($domain)) $domain = $default_domain;
-	return (isset($text_domains[$domain]->codeset))? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
+	return (isset($text_domains[$domain]->codeset)) ? $text_domains[$domain]->codeset : ini_get('mbstring.internal_encoding');
 }
 
 /**
@@ -241,10 +241,10 @@ 
 	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] != '/')
+	  if ($path[strlen($path) - 1] != '\\' and $path[strlen($path) - 1] != '/')
 		$path .= '\\';
 	} else {
-	  if ($path[strlen($path)-1] != '/')
+	  if ($path[strlen($path) - 1] != '/')
 		$path .= '/';
 	}
 	if (!array_key_exists($domain, $text_domains)) {

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

Spacing +7 added lines, -7 removed lines

@@ -49,7 +49,7 @@ 
   var $_pos;
   var $_str;
 
-  function StringReader($str='') {
+  function StringReader($str = '') {
 	$this->_str = $str;
 	$this->_pos = 0;
   }
@@ -57,7 +57,7 @@ 
   function read($bytes) {
 	$data = substr($this->_str, $this->_pos, $bytes);
 	$this->_pos += $bytes;
-	if (strlen($this->_str)<$this->_pos)
+	if (strlen($this->_str) < $this->_pos)
 	  $this->_pos = strlen($this->_str);
 
 	return $data;
@@ -65,7 +65,7 @@ 
 
   function seekto($pos) {
 	$this->_pos = $pos;
-	if (strlen($this->_str)<$this->_pos)
+	if (strlen($this->_str) < $this->_pos)
 	  $this->_pos = strlen($this->_str);
 	return $this->_pos;
   }
@@ -89,9 +89,9 @@ 
   function FileReader($filename) {
 	if (file_exists($filename)) {
 
-	  $this->_length=filesize($filename);
+	  $this->_length = filesize($filename);
 	  $this->_pos = 0;
-	  $this->_fd = fopen($filename,'rb');
+	  $this->_fd = fopen($filename, 'rb');
 	  if (!$this->_fd) {
 		$this->error = 3; // Cannot read file, probably permissions
 		return false;
@@ -146,8 +146,8 @@ 
   function CachedFileReader($filename) {
 	if (file_exists($filename)) {
 
-	  $length=filesize($filename);
-	  $fd = fopen($filename,'rb');
+	  $length = filesize($filename);
+	  $fd = fopen($filename, 'rb');
 
 	  if (!$fd) {
 		$this->error = 3; // Cannot read file, probably permissions

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

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
 	class QRimage {

     

 		//----------------------------------------------------------------------

-		public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4,$saveandprint=FALSE) 

+		public static function png($frame, $filename = false, $pixelPerPoint = 4, $outerFrame = 4, $saveandprint = FALSE) 

 		{

 			$image = self::image($frame, $pixelPerPoint, $outerFrame);

             

@@ -35,11 +35,11 @@ 
 				Header("Content-type: image/png");

 				ImagePng($image);

 			} else {

-				if($saveandprint===TRUE){

+				if ($saveandprint === TRUE) {

 					ImagePng($image, $filename);

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

 					ImagePng($image);

-				}else{

+				} else {

 					ImagePng($image, $filename);

 				}

 			}

@@ -68,25 +68,25 @@ 
 			$h = count($frame);

 			$w = strlen($frame[0]);

             

-			$imgW = $w + 2*$outerFrame;

-			$imgH = $h + 2*$outerFrame;

+			$imgW = $w + 2 * $outerFrame;

+			$imgH = $h + 2 * $outerFrame;

             

-			$base_image =ImageCreate($imgW, $imgH);

+			$base_image = ImageCreate($imgW, $imgH);

             

-			$col[0] = ImageColorAllocate($base_image,255,255,255);

-			$col[1] = ImageColorAllocate($base_image,0,0,0);

+			$col[0] = ImageColorAllocate($base_image, 255, 255, 255);

+			$col[1] = ImageColorAllocate($base_image, 0, 0, 0);

 

 			imagefill($base_image, 0, 0, $col[0]);

 

-			for($y=0; $y<$h; $y++) {

-				for($x=0; $x<$w; $x++) {

+			for ($y = 0; $y < $h; $y++) {

+				for ($x = 0; $x < $w; $x++) {

 					if ($frame[$y][$x] == '1') {

-						ImageSetPixel($base_image,$x+$outerFrame,$y+$outerFrame,$col[1]); 

+						ImageSetPixel($base_image, $x + $outerFrame, $y + $outerFrame, $col[1]); 

 					}

 				}

 			}

             

-			$target_image =ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

+			$target_image = ImageCreate($imgW * $pixelPerPoint, $imgH * $pixelPerPoint);

 			ImageCopyResized($target_image, $base_image, 0, 0, 0, 0, $imgW * $pixelPerPoint, $imgH * $pixelPerPoint, $imgW, $imgH);

 			ImageDestroy($base_image);

             

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

Switch Indentation +8 added lines, -8 removed lines

@@ -255,14 +255,14 @@
 				$mode = $this->identifyMode(0);

                 

 				switch ($mode) {

-					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();

-						break;

-					default: $length = $this->eat8(); break;

+				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();

+					break;

+				default: $length = $this->eat8(); break;

                 

 				}

 

Spacing +40 added lines, -40 removed lines

@@ -50,7 +50,7 @@ 
 			if ($pos >= strlen($str))

 				return false;

             

-			return ((ord($str[$pos]) >= ord('0'))&&(ord($str[$pos]) <= ord('9')));

+			return ((ord($str[$pos]) >= ord('0')) && (ord($str[$pos]) <= ord('9')));

 		}

         

 		//----------------------------------------------------------------------

@@ -70,17 +70,17 @@ 
                 

 			$c = $this->dataStr[$pos];

             

-			if(self::isdigitat($this->dataStr, $pos)) {

+			if (self::isdigitat($this->dataStr, $pos)) {

 				return QR_MODE_NUM;

-			} else if(self::isalnumat($this->dataStr, $pos)) {

+			} else if (self::isalnumat($this->dataStr, $pos)) {

 				return QR_MODE_AN;

-			} else if($this->modeHint == QR_MODE_KANJI) {

+			} else if ($this->modeHint == QR_MODE_KANJI) {

             

-				if ($pos+1 < strlen($this->dataStr)) 

+				if ($pos + 1 < strlen($this->dataStr)) 

 				{

-					$d = $this->dataStr[$pos+1];

+					$d = $this->dataStr[$pos + 1];

 					$word = (ord($c) << 8) | ord($d);

-					if(($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

+					if (($word >= 0x8140 && $word <= 0x9ffc) || ($word >= 0xe040 && $word <= 0xebbf)) {

 						return QR_MODE_KANJI;

 					}

 				}

@@ -95,32 +95,32 @@ 
 			$ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

 			$p = 0;

-			while(self::isdigitat($this->dataStr, $p)) {

+			while (self::isdigitat($this->dataStr, $p)) {

 				$p++;

 			}

             

 			$run = $p;

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

             

-			if($mode == QR_MODE_8) {

+			if ($mode == QR_MODE_8) {

 				$dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

 					 + QRinput::estimateBitsMode8(1)         // + 4 + l8

 					 - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-				if($dif > 0) {

+				if ($dif > 0) {

 					return $this->eat8();

 				}

 			}

-			if($mode == QR_MODE_AN) {

+			if ($mode == QR_MODE_AN) {

 				$dif = QRinput::estimateBitsModeNum($run) + 4 + $ln

 					 + QRinput::estimateBitsModeAn(1)        // + 4 + la

-					 - QRinput::estimateBitsModeAn($run + 1);// - 4 - la

-				if($dif > 0) {

+					 - QRinput::estimateBitsModeAn($run + 1); // - 4 - la

+				if ($dif > 0) {

 					return $this->eatAn();

 				}

 			}

             

 			$ret = $this->input->append(QR_MODE_NUM, $run, str_split($this->dataStr));

-			if($ret < 0)

+			if ($ret < 0)

 				return -1;

 

 			return $run;

@@ -129,15 +129,15 @@ 
 		//----------------------------------------------------------------------

 		public function eatAn()

 		{

-			$la = QRspec::lengthIndicator(QR_MODE_AN,  $this->input->getVersion());

+			$la = QRspec::lengthIndicator(QR_MODE_AN, $this->input->getVersion());

 			$ln = QRspec::lengthIndicator(QR_MODE_NUM, $this->input->getVersion());

 

 			$p = 0;

             

-			while(self::isalnumat($this->dataStr, $p)) {

-				if(self::isdigitat($this->dataStr, $p)) {

+			while (self::isalnumat($this->dataStr, $p)) {

+				if (self::isdigitat($this->dataStr, $p)) {

 					$q = $p;

-					while(self::isdigitat($this->dataStr, $q)) {

+					while (self::isdigitat($this->dataStr, $q)) {

 						$q++;

 					}

                     

@@ -145,7 +145,7 @@ 
 						 + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

 						 - QRinput::estimateBitsModeAn($q); // - 4 - la

                          

-					if($dif < 0) {

+					if ($dif < 0) {

 						break;

 					} else {

 						$p = $q;

@@ -157,17 +157,17 @@ 
 

 			$run = $p;

 

-			if(!self::isalnumat($this->dataStr, $p)) {

+			if (!self::isalnumat($this->dataStr, $p)) {

 				$dif = QRinput::estimateBitsModeAn($run) + 4 + $la

 					 + QRinput::estimateBitsMode8(1) // + 4 + l8

 					  - QRinput::estimateBitsMode8($run + 1); // - 4 - l8

-				if($dif > 0) {

+				if ($dif > 0) {

 					return $this->eat8();

 				}

 			}

 

 			$ret = $this->input->append(QR_MODE_AN, $run, str_split($this->dataStr));

-			if($ret < 0)

+			if ($ret < 0)

 				return -1;

 

 			return $run;

@@ -178,12 +178,12 @@ 
 		{

 			$p = 0;

             

-			while($this->identifyMode($p) == QR_MODE_KANJI) {

+			while ($this->identifyMode($p) == QR_MODE_KANJI) {

 				$p += 2;

 			}

             

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

-			if($ret < 0)

+			if ($ret < 0)

 				return -1;

 

 			return $ret;

@@ -198,34 +198,34 @@ 
 			$p = 1;

 			$dataStrLen = strlen($this->dataStr);

             

-			while($p < $dataStrLen) {

+			while ($p < $dataStrLen) {

                 

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

-				if($mode == QR_MODE_KANJI) {

+				if ($mode == QR_MODE_KANJI) {

 					break;

 				}

-				if($mode == QR_MODE_NUM) {

+				if ($mode == QR_MODE_NUM) {

 					$q = $p;

-					while(self::isdigitat($this->dataStr, $q)) {

+					while (self::isdigitat($this->dataStr, $q)) {

 						$q++;

 					}

 					$dif = QRinput::estimateBitsMode8($p) // + 4 + l8

 						 + QRinput::estimateBitsModeNum($q - $p) + 4 + $ln

 						 - QRinput::estimateBitsMode8($q); // - 4 - l8

-					if($dif < 0) {

+					if ($dif < 0) {

 						break;

 					} else {

 						$p = $q;

 					}

-				} else if($mode == QR_MODE_AN) {

+				} else if ($mode == QR_MODE_AN) {

 					$q = $p;

-					while(self::isalnumat($this->dataStr, $q)) {

+					while (self::isalnumat($this->dataStr, $q)) {

 						$q++;

 					}

 					$dif = QRinput::estimateBitsMode8($p)  // + 4 + l8

 						 + QRinput::estimateBitsModeAn($q - $p) + 4 + $la

 						 - QRinput::estimateBitsMode8($q); // - 4 - l8

-					if($dif < 0) {

+					if ($dif < 0) {

 						break;

 					} else {

 						$p = $q;

@@ -238,7 +238,7 @@ 
 			$run = $p;

 			$ret = $this->input->append(QR_MODE_8, $run, str_split($this->dataStr));

             

-			if($ret < 0)

+			if ($ret < 0)

 				return -1;

 

 			return $run;

@@ -249,7 +249,7 @@ 
 		{

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

 			{

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

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

 					return 0;

 

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

@@ -266,8 +266,8 @@ 
                 

 				}

 

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

 			}

@@ -279,9 +279,9 @@ 
 			$stringLen = strlen($this->dataStr);

 			$p = 0;

             

-			while ($p<$stringLen) {

+			while ($p < $stringLen) {

 				$mode = self::identifyMode(substr($this->dataStr, $p));

-				if($mode == QR_MODE_KANJI) {

+				if ($mode == QR_MODE_KANJI) {

 					$p += 2;

 				} else {

 					if (ord($this->dataStr[$p]) >= ord('a') && ord($this->dataStr[$p]) <= ord('z')) {

@@ -297,13 +297,13 @@ 
 		//----------------------------------------------------------------------

 		public static function splitStringToQRinput($string, QRinput $input, $modeHint, $casesensitive = true)

 		{

-			if(is_null($string) || $string == '\0' || $string == '') {

+			if (is_null($string) || $string == '\0' || $string == '') {

 				throw new Exception('empty string!!!');

 			}

 

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

             

-			if(!$casesensitive)

+			if (!$casesensitive)

 				$split->toUpper();

                 

 			return $split->splitString();

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

Switch Indentation +58 added lines, -58 removed lines

@@ -201,13 +201,13 @@ 
 				$version = 1;

 

 			switch($this->mode) {

-				case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

-				case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-				case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-				case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

-				case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

-				default:

-					return 0;

+			case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

+			case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

+			case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

+			case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+			case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

+			default:

+				return 0;

 			}

 

 			$l = QRspec::lengthIndicator($this->mode, $version);

@@ -247,14 +247,14 @@ 
 					$ret = 0;

                     

 					switch($this->mode) {

-						case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-						case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-						case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-						case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-						case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+					case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

+					case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

+					case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

+					case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

+					case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

                         

-						default:

-							break;

+					default:

+						break;

 					}

                     

 					if($ret < 0)

@@ -404,14 +404,14 @@ 
 			$bits = $w * 10;

             

 			switch($size - $w * 3) {

-				case 1:

-					$bits += 4;

-					break;

-				case 2:

-					$bits += 7;

-					break;

-				default:

-					break;

+			case 1:

+				$bits += 4;

+				break;

+			case 2:

+				$bits += 7;

+				break;

+			default:

+				break;

 			}

 

 			return $bits;

@@ -500,14 +500,14 @@ 
 				return false;

 

 			switch($mode) {

-				case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

-				case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

-				case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

-				case QR_MODE_8:         return true; break;

-				case QR_MODE_STRUCTURE: return true; break;

+			case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

+			case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+			case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

+			case QR_MODE_8:         return true; break;

+			case QR_MODE_STRUCTURE: return true; break;

                 

-				default:

-					break;

+			default:

+				break;

 			}

 

 			return false;

@@ -548,35 +548,35 @@ 
 		{

 			$payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

 			switch($mode) {

-				case QR_MODE_NUM:

-					$chunks = (int)($payload / 10);

-					$remain = $payload - $chunks * 10;

-					$size = $chunks * 3;

-					if($remain >= 7) {

-						$size += 2;

-					} else if($remain >= 4) {

-						$size += 1;

-					}

-					break;

-				case QR_MODE_AN:

-					$chunks = (int)($payload / 11);

-					$remain = $payload - $chunks * 11;

-					$size = $chunks * 2;

-					if($remain >= 6) 

-						$size++;

-					break;

-				case QR_MODE_8:

-					$size = (int)($payload / 8);

-					break;

-				case QR_MODE_KANJI:

-					$size = (int)(($payload / 13) * 2);

-					break;

-				case QR_MODE_STRUCTURE:

-					$size = (int)($payload / 8);

-					break;

-				default:

-					$size = 0;

-					break;

+			case QR_MODE_NUM:

+				$chunks = (int)($payload / 10);

+				$remain = $payload - $chunks * 10;

+				$size = $chunks * 3;

+				if($remain >= 7) {

+					$size += 2;

+				} else if($remain >= 4) {

+					$size += 1;

+				}

+				break;

+			case QR_MODE_AN:

+				$chunks = (int)($payload / 11);

+				$remain = $payload - $chunks * 11;

+				$size = $chunks * 2;

+				if($remain >= 6) 

+					$size++;

+				break;

+			case QR_MODE_8:

+				$size = (int)($payload / 8);

+				break;

+			case QR_MODE_KANJI:

+				$size = (int)(($payload / 13) * 2);

+				break;

+			case QR_MODE_STRUCTURE:

+				$size = (int)($payload / 8);

+				break;

+			default:

+				$size = 0;

+				break;

 			}

             

 			$maxsize = QRspec::maximumWords($mode, $version);

Spacing +98 added lines, -98 removed lines

@@ -25,7 +25,7 @@ 
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

  */

  

-	define('STRUCTURE_HEADER_BITS',  20);

+	define('STRUCTURE_HEADER_BITS', 20);

 	define('MAX_STRUCTURED_SYMBOLS', 16);

 

 	class QRinputItem {

@@ -40,11 +40,11 @@ 
 			$setData = array_slice($data, 0, $size);

             

 			if (count($setData) < $size) {

-				$setData = array_merge($setData, array_fill(0,$size-count($setData),0));

+				$setData = array_merge($setData, array_fill(0, $size - count($setData), 0));

 			}

         

-			if(!QRinput::check($mode, $size, $setData)) {

-				throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',',$setData));

+			if (!QRinput::check($mode, $size, $setData)) {

+				throw new Exception('Error m:'.$mode.',s:'.$size.',d:'.join(',', $setData));

 				return null;

 			}

             

@@ -59,26 +59,26 @@ 
 		{

 			try {

             

-				$words = (int)($this->size / 3);

+				$words = (int) ($this->size / 3);

 				$bs = new QRbitstream();

                 

 				$val = 0x1;

 				$bs->appendNum(4, $val);

 				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_NUM, $version), $this->size);

 

-				for($i=0; $i<$words; $i++) {

-					$val  = (ord($this->data[$i*3  ]) - ord('0')) * 100;

-					$val += (ord($this->data[$i*3+1]) - ord('0')) * 10;

-					$val += (ord($this->data[$i*3+2]) - ord('0'));

+				for ($i = 0; $i < $words; $i++) {

+					$val  = (ord($this->data[$i * 3]) - ord('0')) * 100;

+					$val += (ord($this->data[$i * 3 + 1]) - ord('0')) * 10;

+					$val += (ord($this->data[$i * 3 + 2]) - ord('0'));

 					$bs->appendNum(10, $val);

 				}

 

-				if($this->size - $words * 3 == 1) {

-					$val = ord($this->data[$words*3]) - ord('0');

+				if ($this->size - $words * 3 == 1) {

+					$val = ord($this->data[$words * 3]) - ord('0');

 					$bs->appendNum(4, $val);

-				} else if($this->size - $words * 3 == 2) {

-					$val  = (ord($this->data[$words*3  ]) - ord('0')) * 10;

-					$val += (ord($this->data[$words*3+1]) - ord('0'));

+				} else if ($this->size - $words * 3 == 2) {

+					$val  = (ord($this->data[$words * 3]) - ord('0')) * 10;

+					$val += (ord($this->data[$words * 3 + 1]) - ord('0'));

 					$bs->appendNum(7, $val);

 				}

 

@@ -94,20 +94,20 @@ 
 		public function encodeModeAn($version)

 		{

 			try {

-				$words = (int)($this->size / 2);

+				$words = (int) ($this->size / 2);

 				$bs = new QRbitstream();

                 

 				$bs->appendNum(4, 0x02);

 				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_AN, $version), $this->size);

 

-				for($i=0; $i<$words; $i++) {

-					$val  = (int)QRinput::lookAnTable(ord($this->data[$i*2  ])) * 45;

-					$val += (int)QRinput::lookAnTable(ord($this->data[$i*2+1]));

+				for ($i = 0; $i < $words; $i++) {

+					$val  = (int) QRinput::lookAnTable(ord($this->data[$i * 2])) * 45;

+					$val += (int) QRinput::lookAnTable(ord($this->data[$i * 2 + 1]));

 

 					$bs->appendNum(11, $val);

 				}

 

-				if($this->size & 1) {

+				if ($this->size & 1) {

 					$val = QRinput::lookAnTable(ord($this->data[$words * 2]));

 					$bs->appendNum(6, $val);

 				}

@@ -129,7 +129,7 @@ 
 				$bs->appendNum(4, 0x4);

 				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_8, $version), $this->size);

 

-				for($i=0; $i<$this->size; $i++) {

+				for ($i = 0; $i < $this->size; $i++) {

 					$bs->appendNum(8, ord($this->data[$i]));

 				}

 

@@ -149,11 +149,11 @@ 
 				$bs = new QRbitrtream();

                 

 				$bs->appendNum(4, 0x8);

-				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int)($this->size / 2));

+				$bs->appendNum(QRspec::lengthIndicator(QR_MODE_KANJI, $version), (int) ($this->size / 2));

 

-				for($i=0; $i<$this->size; $i+=2) {

-					$val = (ord($this->data[$i]) << 8) | ord($this->data[$i+1]);

-					if($val <= 0x9ffc) {

+				for ($i = 0; $i < $this->size; $i += 2) {

+					$val = (ord($this->data[$i]) << 8) | ord($this->data[$i + 1]);

+					if ($val <= 0x9ffc) {

 						$val -= 0x8140;

 					} else {

 						$val -= 0xc140;

@@ -177,7 +177,7 @@ 
 		public function encodeModeStructure()

 		{

 			try {

-				$bs =  new QRbitstream();

+				$bs = new QRbitstream();

                 

 				$bs->appendNum(4, 0x03);

 				$bs->appendNum(4, ord($this->data[1]) - 1);

@@ -197,14 +197,14 @@ 
 		{

 			$bits = 0;

 

-			if($version == 0) 

+			if ($version == 0) 

 				$version = 1;

 

-			switch($this->mode) {

-				case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size);    break;

-				case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size);    break;

-				case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size);    break;

-				case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size);break;

+			switch ($this->mode) {

+				case QR_MODE_NUM:        $bits = QRinput::estimateBitsModeNum($this->size); break;

+				case QR_MODE_AN:        $bits = QRinput::estimateBitsModeAn($this->size); break;

+				case QR_MODE_8:            $bits = QRinput::estimateBitsMode8($this->size); break;

+				case QR_MODE_KANJI:        $bits = QRinput::estimateBitsModeKanji($this->size); break;

 				case QR_MODE_STRUCTURE:    return STRUCTURE_HEADER_BITS;            

 				default:

 					return 0;

@@ -212,7 +212,7 @@ 
 

 			$l = QRspec::lengthIndicator($this->mode, $version);

 			$m = 1 << $l;

-			$num = (int)(($this->size + $m - 1) / $m);

+			$num = (int) (($this->size + $m - 1) / $m);

 

 			$bits += $num * (4 + $l);

 

@@ -227,7 +227,7 @@ 
 				unset($this->bstream);

 				$words = QRspec::maximumWords($this->mode, $version);

                 

-				if($this->size > $words) {

+				if ($this->size > $words) {

                 

 					$st1 = new QRinputItem($this->mode, $words, $this->data);

 					$st2 = new QRinputItem($this->mode, $this->size - $words, array_slice($this->data, $words));

@@ -246,18 +246,18 @@ 
                     

 					$ret = 0;

                     

-					switch($this->mode) {

-						case QR_MODE_NUM:        $ret = $this->encodeModeNum($version);    break;

-						case QR_MODE_AN:        $ret = $this->encodeModeAn($version);    break;

-						case QR_MODE_8:            $ret = $this->encodeMode8($version);    break;

-						case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version);break;

-						case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure();    break;

+					switch ($this->mode) {

+						case QR_MODE_NUM:        $ret = $this->encodeModeNum($version); break;

+						case QR_MODE_AN:        $ret = $this->encodeModeAn($version); break;

+						case QR_MODE_8:            $ret = $this->encodeMode8($version); break;

+						case QR_MODE_KANJI:        $ret = $this->encodeModeKanji($version); break;

+						case QR_MODE_STRUCTURE:    $ret = $this->encodeModeStructure(); break;

                         

 						default:

 							break;

 					}

                     

-					if($ret < 0)

+					if ($ret < 0)

 						return -1;

 				}

 

@@ -299,7 +299,7 @@ 
 		//----------------------------------------------------------------------

 		public function setVersion($version)

 		{

-			if($version < 0 || $version > QRSPEC_VERSION_MAX) {

+			if ($version < 0 || $version > QRSPEC_VERSION_MAX) {

 				throw new Exception('Invalid version no');

 				return -1;

 			}

@@ -318,7 +318,7 @@ 
 		//----------------------------------------------------------------------

 		public function setErrorCorrectionLevel($level)

 		{

-			if($level > QR_ECLEVEL_H) {

+			if ($level > QR_ECLEVEL_H) {

 				throw new Exception('Invalid ECLEVEL');

 				return -1;

 			}

@@ -350,11 +350,11 @@ 
         

 		public function insertStructuredAppendHeader($size, $index, $parity)

 		{

-			if( $size > MAX_STRUCTURED_SYMBOLS ) {

+			if ($size > MAX_STRUCTURED_SYMBOLS) {

 				throw new Exception('insertStructuredAppendHeader wrong size');

 			}

             

-			if( $index <= 0 || $index > MAX_STRUCTURED_SYMBOLS ) {

+			if ($index <= 0 || $index > MAX_STRUCTURED_SYMBOLS) {

 				throw new Exception('insertStructuredAppendHeader wrong index');

 			}

 

@@ -374,9 +374,9 @@ 
 		{

 			$parity = 0;

             

-			foreach($this->items as $item) {

-				if($item->mode != QR_MODE_STRUCTURE) {

-					for($i=$item->size-1; $i>=0; $i--) {

+			foreach ($this->items as $item) {

+				if ($item->mode != QR_MODE_STRUCTURE) {

+					for ($i = $item->size - 1; $i >= 0; $i--) {

 						$parity ^= $item->data[$i];

 					}

 				}

@@ -388,8 +388,8 @@ 
 		//----------------------------------------------------------------------

 		public static function checkModeNum($size, $data)

 		{

-			for($i=0; $i<$size; $i++) {

-				if((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))){

+			for ($i = 0; $i < $size; $i++) {

+				if ((ord($data[$i]) < ord('0')) || (ord($data[$i]) > ord('9'))) {

 					return false;

 				}

 			}

@@ -400,10 +400,10 @@ 
 		//----------------------------------------------------------------------

 		public static function estimateBitsModeNum($size)

 		{

-			$w = (int)$size / 3;

+			$w = (int) $size / 3;

 			$bits = $w * 10;

             

-			switch($size - $w * 3) {

+			switch ($size - $w * 3) {

 				case 1:

 					$bits += 4;

 					break;

@@ -422,7 +422,7 @@ 
 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

 			36, -1, -1, -1, 37, 38, -1, -1, -1, -1, 39, 40, -1, 41, 42, 43,

-			 0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 44, -1, -1, -1, -1, -1,

+			 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 44, -1, -1, -1, -1, -1,

 			-1, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,

 			25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1,

 			-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,

@@ -432,13 +432,13 @@ 
 		//----------------------------------------------------------------------

 		public static function lookAnTable($c)

 		{

-			return (($c > 127)?-1:self::$anTable[$c]);

+			return (($c > 127) ?-1 : self::$anTable[$c]);

 		}

         

 		//----------------------------------------------------------------------

 		public static function checkModeAn($size, $data)

 		{

-			for($i=0; $i<$size; $i++) {

+			for ($i = 0; $i < $size; $i++) {

 				if (self::lookAnTable(ord($data[$i])) == -1) {

 					return false;

 				}

@@ -450,10 +450,10 @@ 
 		//----------------------------------------------------------------------

 		public static function estimateBitsModeAn($size)

 		{

-			$w = (int)($size / 2);

+			$w = (int) ($size / 2);

 			$bits = $w * 11;

             

-			if($size & 1) {

+			if ($size & 1) {

 				$bits += 6;

 			}

 

@@ -469,18 +469,18 @@ 
 		//----------------------------------------------------------------------

 		public function estimateBitsModeKanji($size)

 		{

-			return (int)(($size / 2) * 13);

+			return (int) (($size / 2) * 13);

 		}

         

 		//----------------------------------------------------------------------

 		public static function checkModeKanji($size, $data)

 		{

-			if($size & 1)

+			if ($size & 1)

 				return false;

 

-			for($i=0; $i<$size; $i+=2) {

-				$val = (ord($data[$i]) << 8) | ord($data[$i+1]);

-				if( $val < 0x8140 

+			for ($i = 0; $i < $size; $i += 2) {

+				$val = (ord($data[$i]) << 8) | ord($data[$i + 1]);

+				if ($val < 0x8140 

 				|| ($val > 0x9ffc && $val < 0xe040) 

 				|| $val > 0xebbf) {

 					return false;

@@ -496,12 +496,12 @@ 
 

 		public static function check($mode, $size, $data)

 		{

-			if($size <= 0) 

+			if ($size <= 0) 

 				return false;

 

-			switch($mode) {

-				case QR_MODE_NUM:       return self::checkModeNum($size, $data);   break;

-				case QR_MODE_AN:        return self::checkModeAn($size, $data);    break;

+			switch ($mode) {

+				case QR_MODE_NUM:       return self::checkModeNum($size, $data); break;

+				case QR_MODE_AN:        return self::checkModeAn($size, $data); break;

 				case QR_MODE_KANJI:     return self::checkModeKanji($size, $data); break;

 				case QR_MODE_8:         return true; break;

 				case QR_MODE_STRUCTURE: return true; break;

@@ -519,7 +519,7 @@ 
 		{

 			$bits = 0;

 

-			foreach($this->items as $item) {

+			foreach ($this->items as $item) {

 				$bits += $item->estimateBitStreamSizeOfEntry($version);

 			}

 

@@ -534,7 +534,7 @@ 
 			do {

 				$prev = $version;

 				$bits = $this->estimateBitStreamSize($prev);

-				$version = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

+				$version = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);

 				if ($version < 0) {

 					return -1;

 				}

@@ -547,32 +547,32 @@ 
 		public static function lengthOfCode($mode, $version, $bits)

 		{

 			$payload = $bits - 4 - QRspec::lengthIndicator($mode, $version);

-			switch($mode) {

+			switch ($mode) {

 				case QR_MODE_NUM:

-					$chunks = (int)($payload / 10);

+					$chunks = (int) ($payload / 10);

 					$remain = $payload - $chunks * 10;

 					$size = $chunks * 3;

-					if($remain >= 7) {

+					if ($remain >= 7) {

 						$size += 2;

-					} else if($remain >= 4) {

+					} else if ($remain >= 4) {

 						$size += 1;

 					}

 					break;

 				case QR_MODE_AN:

-					$chunks = (int)($payload / 11);

+					$chunks = (int) ($payload / 11);

 					$remain = $payload - $chunks * 11;

 					$size = $chunks * 2;

-					if($remain >= 6) 

+					if ($remain >= 6) 

 						$size++;

 					break;

 				case QR_MODE_8:

-					$size = (int)($payload / 8);

+					$size = (int) ($payload / 8);

 					break;

 				case QR_MODE_KANJI:

-					$size = (int)(($payload / 13) * 2);

+					$size = (int) (($payload / 13) * 2);

 					break;

 				case QR_MODE_STRUCTURE:

-					$size = (int)($payload / 8);

+					$size = (int) ($payload / 8);

 					break;

 				default:

 					$size = 0;

@@ -580,8 +580,8 @@ 
 			}

             

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

 		}

@@ -591,10 +591,10 @@ 
 		{

 			$total = 0;

 

-			foreach($this->items as $item) {

+			foreach ($this->items as $item) {

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

                 

-				if($bits < 0) 

+				if ($bits < 0) 

 					return -1;

                     

 				$total += $bits;

@@ -607,21 +607,21 @@ 
 		public function convertData()

 		{

 			$ver = $this->estimateVersion();

-			if($ver > $this->getVersion()) {

+			if ($ver > $this->getVersion()) {

 				$this->setVersion($ver);

 			}

 

-			for(;;) {

+			for (;;) {

 				$bits = $this->createBitStream();

                 

-				if($bits < 0) 

+				if ($bits < 0) 

 					return -1;

                     

-				$ver = QRspec::getMinimumVersion((int)(($bits + 7) / 8), $this->level);

-				if($ver < 0) {

+				$ver = QRspec::getMinimumVersion((int) (($bits + 7) / 8), $this->level);

+				if ($ver < 0) {

 					throw new Exception('WRONG VERSION');

 					return -1;

-				} else if($ver > $this->getVersion()) {

+				} else if ($ver > $this->getVersion()) {

 					$this->setVersion($ver);

 				} else {

 					break;

@@ -647,26 +647,26 @@ 
 			}

 

 			$bits += 4;

-			$words = (int)(($bits + 7) / 8);

+			$words = (int) (($bits + 7) / 8);

 

 			$padding = new QRbitstream();

 			$ret = $padding->appendNum($words * 8 - $bits + 4, 0);

             

-			if($ret < 0) 

+			if ($ret < 0) 

 				return $ret;

 

 			$padlen = $maxwords - $words;

             

-			if($padlen > 0) {

+			if ($padlen > 0) {

                 

 				$padbuf = array();

-				for($i=0; $i<$padlen; $i++) {

-					$padbuf[$i] = ($i&1)?0x11:0xec;

+				for ($i = 0; $i < $padlen; $i++) {

+					$padbuf[$i] = ($i & 1) ? 0x11 : 0xec;

 				}

                 

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

                 

-				if($ret < 0)

+				if ($ret < 0)

 					return $ret;

                 

 			}

@@ -679,15 +679,15 @@ 
 		//----------------------------------------------------------------------

 		public function mergeBitStream()

 		{

-			if($this->convertData() < 0) {

+			if ($this->convertData() < 0) {

 				return null;

 			}

 

 			$bstream = new QRbitstream();

             

-			foreach($this->items as $item) {

+			foreach ($this->items as $item) {

 				$ret = $bstream->append($item->bstream);

-				if($ret < 0) {

+				if ($ret < 0) {

 					return null;

 				}

 			}

@@ -701,12 +701,12 @@ 
 

 			$bstream = $this->mergeBitStream();

             

-			if($bstream == null) {

+			if ($bstream == null) {

 				return null;

 			}

             

 			$ret = $this->appendPaddingBit($bstream);

-			if($ret < 0) {

+			if ($ret < 0) {

 				return null;

 			}

 

@@ -717,7 +717,7 @@ 
 		public function getByteStream()

 		{

 			$bstream = $this->getBitStream();

-			if($bstream == null) {

+			if ($bstream == null) {

 				return null;

 			}

             

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/bindings/tcpdf/qrcode.php

Spacing +18 added lines, -18 removed lines

@@ -180,12 +180,12 @@ 
 	/**
 	 * Matrix index to get width from $capacity array.
 	 */
-	define('QRCAP_WIDTH',    0);
+	define('QRCAP_WIDTH', 0);
 
 	/**
 	 * Matrix index to get number of words from $capacity array.
 	 */
-	define('QRCAP_WORDS',    1);
+	define('QRCAP_WORDS', 1);
 
 	/**
 	 * Matrix index to get remainder from $capacity array.
@@ -195,7 +195,7 @@ 
 	/**
 	 * Matrix index to get error correction level from $capacity array.
 	 */
-	define('QRCAP_EC',       3);
+	define('QRCAP_EC', 3);
 
 	// -----------------------------------------------------
 
@@ -204,7 +204,7 @@ 
 	/**
 	 * Number of header bits for structured mode
 	 */
-	define('STRUCTURE_HEADER_BITS',  20);
+	define('STRUCTURE_HEADER_BITS', 20);
 
 	/**
 	 * Max number of symbols for structured mode
@@ -218,12 +218,12 @@ 
 	/**
 	 * Down point base value for case 1 mask pattern (concatenation of same color in a line or a column)
 	 */
-	define('N1',  3);
+	define('N1', 3);
 
 	/**
 	 * Down point base value for case 2 mask pattern (module block of same color)
 	 */
-	define('N2',  3);
+	define('N2', 3);
 
 	/**
 	 * Down point base value for case 3 mask pattern (1:1:3:1:1(dark:bright:dark:bright:dark)pattern in a line or a column)
@@ -270,7 +270,7 @@ 
 		 * @param int $split_length Maximum length of the chunk.
 		 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
 		 */
-		function str_split($string, $split_length=1) {
+		function str_split($string, $split_length = 1) {
 			if ((strlen($string) > $split_length) OR (!$split_length)) {
 				do {
 					$c = strlen($string);
@@ -1664,7 +1664,7 @@ 
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st1['bstream']);
 				$inputitem['bstream'] = $this->appendBitstream($inputitem['bstream'], $st2['bstream']);
 			} else {
-				switch($inputitem['mode']) {
+				switch ($inputitem['mode']) {
 				case QR_MODE_NM: {
 					$inputitem = $this->encodeModeNum($inputitem, $version);
 					break;
@@ -1771,9 +1771,9 @@ 
 		 * @return int number of bits
 		 */
 		 protected function estimateBitsModeNum($size) {
-			$w = (int)$size / 3;
+			$w = (int) $size / 3;
 			$bits = $w * 10;
-			switch($size - $w * 3) {
+			switch ($size - $w * 3) {
 			case 1: {
 				$bits += 4;
 				break;
@@ -1875,7 +1875,7 @@ 
 			if ($size <= 0) {
 				return false;
 			}
-			switch($mode) {
+			switch ($mode) {
 			case QR_MODE_NM: {
 				return $this->checkModeNum($size, $data);
 			}
@@ -1910,7 +1910,7 @@ 
 				$version = 1;
 			}
 			foreach ($items as $item) {
-				switch($item['mode']) {
+				switch ($item['mode']) {
 				case QR_MODE_NM: {
 					$bits = $this->estimateBitsModeNum($item['size']);
 					break;
@@ -1970,9 +1970,9 @@ 
 		 */
 		 protected function lengthOfCode($mode, $version, $bits) {
 			$payload = $bits - 4 - $this->lengthIndicator($mode, $version);
-			switch($mode) {
+			switch ($mode) {
 			case QR_MODE_NM: {
-				$chunks = (int)($payload / 10);
+				$chunks = (int) ($payload / 10);
 				$remain = $payload - $chunks * 10;
 				$size = $chunks * 3;
 				if ($remain >= 7) {
@@ -1983,7 +1983,7 @@ 
 				break;
 			}
 			case QR_MODE_AN: {
-				$chunks = (int)($payload / 11);
+				$chunks = (int) ($payload / 11);
 				$remain = $payload - $chunks * 11;
 				$size = $chunks * 2;
 				if ($remain >= 6) {
@@ -1992,15 +1992,15 @@ 
 				break;
 			}
 			case QR_MODE_8B: {
-				$size = (int)($payload / 8);
+				$size = (int) ($payload / 8);
 				break;
 			}
 			case QR_MODE_KJ: {
-				$size = (int)(($payload / 13) * 2);
+				$size = (int) (($payload / 13) * 2);
 				break;
 			}
 			case QR_MODE_ST: {
-				$size = (int)($payload / 8);
+				$size = (int) ($payload / 8);
 				break;
 			}
 			default: {