codysnider / tt-rss

lib/gettext/gettext.php

Indentation +241 added lines, -241 removed lines

@@ -61,19 +61,19 @@ 
    * @return Integer from the Stream
    */
   function readint() {
-      if ($this->BYTEORDER == 0) {
-        // low endian
-        $input=unpack('V', $this->STREAM->read(4));
-        return array_shift($input);
-      } else {
-        // big endian
-        $input=unpack('N', $this->STREAM->read(4));
-        return array_shift($input);
-      }
-    }
+	  if ($this->BYTEORDER == 0) {
+		// low endian
+		$input=unpack('V', $this->STREAM->read(4));
+		return array_shift($input);
+	  } else {
+		// big endian
+		$input=unpack('N', $this->STREAM->read(4));
+		return array_shift($input);
+	  }
+	}
 
   function read($bytes) {
-    return $this->STREAM->read($bytes);
+	return $this->STREAM->read($bytes);
   }
 
   /**
@@ -83,13 +83,13 @@ 
    * @return Array of Integers
    */
   function readintarray($count) {
-    if ($this->BYTEORDER == 0) {
-        // low endian
-        return unpack('V'.$count, $this->STREAM->read(4 * $count));
-      } else {
-        // big endian
-        return unpack('N'.$count, $this->STREAM->read(4 * $count));
-      }
+	if ($this->BYTEORDER == 0) {
+		// low endian
+		return unpack('V'.$count, $this->STREAM->read(4 * $count));
+	  } else {
+		// big endian
+		return unpack('N'.$count, $this->STREAM->read(4 * $count));
+	  }
   }
 
   /**
@@ -99,35 +99,35 @@ 
    * @param boolean enable_cache Enable or disable caching of strings (default on)
    */
   function __construct($Reader, $enable_cache = true) {
-    // If there isn't a StreamReader, turn on short circuit mode.
-    if (! $Reader || isset($Reader->error) ) {
-      $this->short_circuit = true;
-      return;
-    }
-
-    // Caching can be turned off
-    $this->enable_cache = $enable_cache;
-
-    $MAGIC1 = "\x95\x04\x12\xde";
-    $MAGIC2 = "\xde\x12\x04\x95";
-
-    $this->STREAM = $Reader;
-    $magic = $this->read(4);
-    if ($magic == $MAGIC1) {
-      $this->BYTEORDER = 1;
-    } elseif ($magic == $MAGIC2) {
-      $this->BYTEORDER = 0;
-    } else {
-      $this->error = 1; // not MO file
-      return false;
-    }
-
-    // FIXME: Do we care about revision? We should.
-    $revision = $this->readint();
-
-    $this->total = $this->readint();
-    $this->originals = $this->readint();
-    $this->translations = $this->readint();
+	// If there isn't a StreamReader, turn on short circuit mode.
+	if (! $Reader || isset($Reader->error) ) {
+	  $this->short_circuit = true;
+	  return;
+	}
+
+	// Caching can be turned off
+	$this->enable_cache = $enable_cache;
+
+	$MAGIC1 = "\x95\x04\x12\xde";
+	$MAGIC2 = "\xde\x12\x04\x95";
+
+	$this->STREAM = $Reader;
+	$magic = $this->read(4);
+	if ($magic == $MAGIC1) {
+	  $this->BYTEORDER = 1;
+	} elseif ($magic == $MAGIC2) {
+	  $this->BYTEORDER = 0;
+	} else {
+	  $this->error = 1; // not MO file
+	  return false;
+	}
+
+	// FIXME: Do we care about revision? We should.
+	$revision = $this->readint();
+
+	$this->total = $this->readint();
+	$this->originals = $this->readint();
+	$this->translations = $this->readint();
   }
 
   /**
@@ -138,32 +138,32 @@ 
    * @access private
    */
   function load_tables() {
-    if (is_array($this->cache_translations) &&
-      is_array($this->table_originals) &&
-      is_array($this->table_translations))
-      return;
-
-    /* get original and translations tables */
-    if (!is_array($this->table_originals)) {
-      $this->STREAM->seekto($this->originals);
-      $this->table_originals = $this->readintarray($this->total * 2);
-    }
-    if (!is_array($this->table_translations)) {
-      $this->STREAM->seekto($this->translations);
-      $this->table_translations = $this->readintarray($this->total * 2);
-    }
-
-    if ($this->enable_cache) {
-      $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]);
-        $original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
-        $this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
-        $translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
-        $this->cache_translations[$original] = $translation;
-      }
-    }
+	if (is_array($this->cache_translations) &&
+	  is_array($this->table_originals) &&
+	  is_array($this->table_translations))
+	  return;
+
+	/* get original and translations tables */
+	if (!is_array($this->table_originals)) {
+	  $this->STREAM->seekto($this->originals);
+	  $this->table_originals = $this->readintarray($this->total * 2);
+	}
+	if (!is_array($this->table_translations)) {
+	  $this->STREAM->seekto($this->translations);
+	  $this->table_translations = $this->readintarray($this->total * 2);
+	}
+
+	if ($this->enable_cache) {
+	  $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]);
+		$original = $this->STREAM->read($this->table_originals[$i * 2 + 1]);
+		$this->STREAM->seekto($this->table_translations[$i * 2 + 2]);
+		$translation = $this->STREAM->read($this->table_translations[$i * 2 + 1]);
+		$this->cache_translations[$original] = $translation;
+	  }
+	}
   }
 
   /**
@@ -174,13 +174,13 @@ 
    * @return string Requested string if found, otherwise ''
    */
   function get_original_string($num) {
-    $length = $this->table_originals[$num * 2 + 1];
-    $offset = $this->table_originals[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
+	$length = $this->table_originals[$num * 2 + 1];
+	$offset = $this->table_originals[$num * 2 + 2];
+	if (! $length)
+	  return '';
+	$this->STREAM->seekto($offset);
+	$data = $this->STREAM->read($length);
+	return (string)$data;
   }
 
   /**
@@ -191,13 +191,13 @@ 
    * @return string Requested string if found, otherwise ''
    */
   function get_translation_string($num) {
-    $length = $this->table_translations[$num * 2 + 1];
-    $offset = $this->table_translations[$num * 2 + 2];
-    if (! $length)
-      return '';
-    $this->STREAM->seekto($offset);
-    $data = $this->STREAM->read($length);
-    return (string)$data;
+	$length = $this->table_translations[$num * 2 + 1];
+	$offset = $this->table_translations[$num * 2 + 2];
+	if (! $length)
+	  return '';
+	$this->STREAM->seekto($offset);
+	$data = $this->STREAM->read($length);
+	return (string)$data;
   }
 
   /**
@@ -210,35 +210,35 @@ 
    * @return int string number (offset in originals table)
    */
   function find_string($string, $start = -1, $end = -1) {
-    if (($start == -1) or ($end == -1)) {
-      // find_string is called with only one parameter, set start end end
-      $start = 0;
-      $end = $this->total;
-    }
-    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;
-    } else if ($start > $end) {
-      // start > end -> turn around and start over
-      return $this->find_string($string, $end, $start);
-    } else {
-      // 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
-        return $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
-        return $this->find_string($string, $half, $end);
-    }
+	if (($start == -1) or ($end == -1)) {
+	  // find_string is called with only one parameter, set start end end
+	  $start = 0;
+	  $end = $this->total;
+	}
+	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;
+	} else if ($start > $end) {
+	  // start > end -> turn around and start over
+	  return $this->find_string($string, $end, $start);
+	} else {
+	  // 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
+		return $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
+		return $this->find_string($string, $half, $end);
+	}
   }
 
   /**
@@ -249,24 +249,24 @@ 
    * @return string translated string (or original, if not found)
    */
   function translate($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;
-    } 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 ($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;
+	} 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);
+	}
   }
 
   /**
@@ -276,32 +276,32 @@ 
    * @return string sanitized plural form expression
    */
   function sanitize_plural_expression($expr) {
-    // Get rid of disallowed characters.
-    $expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
-
-    // Add parenthesis for tertiary '?' operator.
-    $expr .= ';';
-    $res = '';
-    $p = 0;
-    for ($i = 0; $i < strlen($expr); $i++) {
-      $ch = $expr[$i];
-      switch ($ch) {
-      case '?':
-        $res .= ' ? (';
-        $p++;
-        break;
-      case ':':
-        $res .= ') : (';
-        break;
-      case ';':
-        $res .= str_repeat( ')', $p) . ';';
-        $p = 0;
-        break;
-      default:
-        $res .= $ch;
-      }
-    }
-    return $res;
+	// Get rid of disallowed characters.
+	$expr = preg_replace('@[^a-zA-Z0-9_:;\(\)\?\|\&=!<>+*/\%-]@', '', $expr);
+
+	// Add parenthesis for tertiary '?' operator.
+	$expr .= ';';
+	$res = '';
+	$p = 0;
+	for ($i = 0; $i < strlen($expr); $i++) {
+	  $ch = $expr[$i];
+	  switch ($ch) {
+	  case '?':
+		$res .= ' ? (';
+		$p++;
+		break;
+	  case ':':
+		$res .= ') : (';
+		break;
+	  case ';':
+		$res .= str_repeat( ')', $p) . ';';
+		$p = 0;
+		break;
+	  default:
+		$res .= $ch;
+	  }
+	}
+	return $res;
   }
 
   /**
@@ -311,11 +311,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;";
-    return $expr;
+	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;
   }
 
   /**
@@ -325,21 +325,21 @@ 
    * @return string plural form header
    */
   function get_plural_forms() {
-    // lets assume message number 0 is header
-    // this is true, right?
-    $this->load_tables();
-
-    // cache header field for plural forms
-    if (! is_string($this->pluralheader)) {
-      if ($this->enable_cache) {
-        $header = $this->cache_translations[""];
-      } else {
-        $header = $this->get_translation_string(0);
-      }
-      $expr = $this->extract_plural_forms_header_from_po_header($header);
-      $this->pluralheader = $this->sanitize_plural_expression($expr);
-    }
-    return $this->pluralheader;
+	// lets assume message number 0 is header
+	// this is true, right?
+	$this->load_tables();
+
+	// cache header field for plural forms
+	if (! is_string($this->pluralheader)) {
+	  if ($this->enable_cache) {
+		$header = $this->cache_translations[""];
+	  } else {
+		$header = $this->get_translation_string(0);
+	  }
+	  $expr = $this->extract_plural_forms_header_from_po_header($header);
+	  $this->pluralheader = $this->sanitize_plural_expression($expr);
+	}
+	return $this->pluralheader;
   }
 
   /**
@@ -350,21 +350,21 @@ 
    * @return int array index of the right plural form
    */
   function select_string($n) {
-    if (!is_int($n)) {
-      throw new InvalidArgumentException(
-        "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);
-
-    $total = 0;
-    $plural = 0;
-
-    eval("$string");
-    if ($plural >= $total) $plural = $total - 1;
-    return $plural;
+	if (!is_int($n)) {
+	  throw new InvalidArgumentException(
+		"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);
+
+	$total = 0;
+	$plural = 0;
+
+	eval("$string");
+	if ($plural >= $total) $plural = $total - 1;
+	return $plural;
   }
 
   /**
@@ -377,58 +377,58 @@ 
    * @return translated plural form
    */
   function ngettext($single, $plural, $number) {
-    if ($this->short_circuit) {
-      if ($number != 1)
-        return $plural;
-      else
-        return $single;
-    }
-
-    // find out the appropriate form
-    $select = $this->select_string($number);
-
-    // this should contains all strings separated by NULLs
-    $key = $single . chr(0) . $plural;
-
-
-    if ($this->enable_cache) {
-      if (! array_key_exists($key, $this->cache_translations)) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->cache_translations[$key];
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    } else {
-      $num = $this->find_string($key);
-      if ($num == -1) {
-        return ($number != 1) ? $plural : $single;
-      } else {
-        $result = $this->get_translation_string($num);
-        $list = explode(chr(0), $result);
-        return $list[$select];
-      }
-    }
+	if ($this->short_circuit) {
+	  if ($number != 1)
+		return $plural;
+	  else
+		return $single;
+	}
+
+	// find out the appropriate form
+	$select = $this->select_string($number);
+
+	// this should contains all strings separated by NULLs
+	$key = $single . chr(0) . $plural;
+
+
+	if ($this->enable_cache) {
+	  if (! array_key_exists($key, $this->cache_translations)) {
+		return ($number != 1) ? $plural : $single;
+	  } else {
+		$result = $this->cache_translations[$key];
+		$list = explode(chr(0), $result);
+		return $list[$select];
+	  }
+	} else {
+	  $num = $this->find_string($key);
+	  if ($num == -1) {
+		return ($number != 1) ? $plural : $single;
+	  } else {
+		$result = $this->get_translation_string($num);
+		$list = explode(chr(0), $result);
+		return $list[$select];
+	  }
+	}
   }
 
   function pgettext($context, $msgid) {
-    $key = $context . chr(4) . $msgid;
-    $ret = $this->translate($key);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $msgid;
-    } else {
-      return $ret;
-    }
+	$key = $context . chr(4) . $msgid;
+	$ret = $this->translate($key);
+	if (strpos($ret, "\004") !== FALSE) {
+	  return $msgid;
+	} else {
+	  return $ret;
+	}
   }
 
   function npgettext($context, $singular, $plural, $number) {
-    $key = $context . chr(4) . $singular;
-    $ret = $this->ngettext($key, $plural, $number);
-    if (strpos($ret, "\004") !== FALSE) {
-      return $singular;
-    } else {
-      return $ret;
-    }
+	$key = $context . chr(4) . $singular;
+	$ret = $this->ngettext($key, $plural, $number);
+	if (strpos($ret, "\004") !== FALSE) {
+	  return $singular;
+	} else {
+	  return $ret;
+	}
 
   }
 }

Spacing +27 added lines, -27 removed lines

@@ -38,17 +38,17 @@ 
    var $error = 0; // public variable that holds error code (0 if no error)
 
    //private:
-  var $BYTEORDER = 0;        // 0: low endian, 1: big endian
+  var $BYTEORDER = 0; // 0: low endian, 1: big endian
   var $STREAM = NULL;
   var $short_circuit = false;
   var $enable_cache = false;
-  var $originals = NULL;      // offset of original table
-  var $translations = NULL;    // offset of translation table
-  var $pluralheader = NULL;    // cache header field for plural forms
-  var $total = 0;          // total string count
-  var $table_originals = NULL;  // table for original strings (offsets)
-  var $table_translations = NULL;  // table for translated strings (offsets)
-  var $cache_translations = NULL;  // original -> translation mapping
+  var $originals = NULL; // offset of original table
+  var $translations = NULL; // offset of translation table
+  var $pluralheader = NULL; // cache header field for plural forms
+  var $total = 0; // total string count
+  var $table_originals = NULL; // table for original strings (offsets)
+  var $table_translations = NULL; // table for translated strings (offsets)
+  var $cache_translations = NULL; // original -> translation mapping
 
 
   /* Methods */
@@ -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

index.php

Indentation +18 added lines, -18 removed lines

@@ -93,9 +93,9 @@ 
 	<?php
 		foreach (PluginHost::getInstance()->get_plugins() as $n => $p) {
 			if (method_exists($p, "get_js")) {
-			    $script = $p->get_js();
+				$script = $p->get_js();
 
-			    if ($script) {
+				if ($script) {
 					echo "try {
 					    $script
 					} catch (e) {
@@ -146,10 +146,10 @@ 
             <img src='images/indicator_tiny.gif'/>
             <?php echo  __("Loading, please wait..."); ?></div>
         <?php
-          foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
-            echo $p->hook_feed_tree();
-          }
-        ?>
+		  foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_FEED_TREE) as $p) {
+			echo $p->hook_feed_tree();
+		  }
+		?>
         <div id="feedTree"></div>
     </div>
 
@@ -167,10 +167,10 @@ 
                title="<?php echo __('Updates are available from Git.') ?>">new_releases</i>
 
             <?php
-            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
-                echo $p->hook_main_toolbar_button();
-            }
-            ?>
+			foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_MAIN_TOOLBAR_BUTTON) as $p) {
+				echo $p->hook_main_toolbar_button();
+			}
+			?>
 
             <form id="toolbar-headlines" action="" style="order : 10" onsubmit='return false'>
 
@@ -220,10 +220,10 @@ 
             <div class="action-chooser" style="order : 30">
 
                 <?php
-                    foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
-                         echo $p->hook_toolbar_button();
-                    }
-                ?>
+					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_TOOLBAR_BUTTON) as $p) {
+						 echo $p->hook_toolbar_button();
+					}
+				?>
 
                 <div dojoType="fox.form.DropDownButton" class="action-button" title="<?php echo __('Actions...') ?>">
 					<span><i class="material-icons">menu</i></span>
@@ -242,10 +242,10 @@ 
                         <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcHKhelp')"><?php echo __('Keyboard shortcuts help') ?></div>
 
                         <?php
-                            foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
-                             echo $p->hook_action_item();
-                            }
-                        ?>
+							foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ACTION_ITEM) as $p) {
+							 echo $p->hook_action_item();
+							}
+						?>
 
                         <?php if (!$_SESSION["hide_logout"]) { ?>
                             <div dojoType="dijit.MenuItem" onclick="App.onActionSelected('qmcLogout')"><?php echo __('Logout') ?></div>

Spacing +2 added lines, -2 removed lines

@@ -12,11 +12,11 @@
 	// we need a separate check here because functions.php might get parsed
 	// incorrectly before 5.3 because of :: syntax.
 	if (version_compare(PHP_VERSION, '5.6.0', '<')) {
-		print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using " . PHP_VERSION . ".\n";
+		print "<b>Fatal Error</b>: PHP version 5.6.0 or newer required. You're using ".PHP_VERSION.".\n";
 		exit;
 	}
 
-	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__)."/include".PATH_SEPARATOR.
 		get_include_path());
 
 	require_once "autoload.php";

Braces +3 added lines, -1 removed lines

@@ -26,7 +26,9 @@
 	require_once "config.php";
 	require_once "db-prefs.php";
 
-	if (!init_plugins()) return;
+	if (!init_plugins()) {
+		return;
+	}
 
 	login_sequence();