codysnider / tt-rss

lib/gettext/streams.php

Indentation +64 added lines, -64 removed lines

@@ -26,22 +26,22 @@ 
 class StreamReader {
   // should return a string [FIXME: perhaps return array of bytes?]
   function read($bytes) {
-    return false;
+	return false;
   }
 
   // should return new position
   function seekto($position) {
-    return false;
+	return false;
   }
 
   // returns current position
   function currentpos() {
-    return false;
+	return false;
   }
 
   // returns length of entire stream (limit for seekto()s)
   function length() {
-    return false;
+	return false;
   }
 };
 
@@ -50,32 +50,32 @@ 
   var $_str;
 
   function StringReader($str='') {
-    $this->_str = $str;
-    $this->_pos = 0;
+	$this->_str = $str;
+	$this->_pos = 0;
   }
 
   function read($bytes) {
-    $data = substr($this->_str, $this->_pos, $bytes);
-    $this->_pos += $bytes;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
+	$data = substr($this->_str, $this->_pos, $bytes);
+	$this->_pos += $bytes;
+	if (strlen($this->_str)<$this->_pos)
+	  $this->_pos = strlen($this->_str);
 
-    return $data;
+	return $data;
   }
 
   function seekto($pos) {
-    $this->_pos = $pos;
-    if (strlen($this->_str)<$this->_pos)
-      $this->_pos = strlen($this->_str);
-    return $this->_pos;
+	$this->_pos = $pos;
+	if (strlen($this->_str)<$this->_pos)
+	  $this->_pos = strlen($this->_str);
+	return $this->_pos;
   }
 
   function currentpos() {
-    return $this->_pos;
+	return $this->_pos;
   }
 
   function length() {
-    return strlen($this->_str);
+	return strlen($this->_str);
   }
 
 };
@@ -87,55 +87,55 @@ 
   var $_length;
 
   function FileReader($filename) {
-    if (file_exists($filename)) {
+	if (file_exists($filename)) {
 
-      $this->_length=filesize($filename);
-      $this->_pos = 0;
-      $this->_fd = fopen($filename,'rb');
-      if (!$this->_fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
+	  $this->_length=filesize($filename);
+	  $this->_pos = 0;
+	  $this->_fd = fopen($filename,'rb');
+	  if (!$this->_fd) {
+		$this->error = 3; // Cannot read file, probably permissions
+		return false;
+	  }
+	} else {
+	  $this->error = 2; // File doesn't exist
+	  return false;
+	}
   }
 
   function read($bytes) {
-    if ($bytes) {
-      fseek($this->_fd, $this->_pos);
+	if ($bytes) {
+	  fseek($this->_fd, $this->_pos);
 
-      // PHP 5.1.1 does not read more than 8192 bytes in one fread()
-      // the discussions at PHP Bugs suggest it's the intended behaviour
-      $data = '';
-      while ($bytes > 0) {
-        $chunk  = fread($this->_fd, $bytes);
-        $data  .= $chunk;
-        $bytes -= strlen($chunk);
-      }
-      $this->_pos = ftell($this->_fd);
+	  // PHP 5.1.1 does not read more than 8192 bytes in one fread()
+	  // the discussions at PHP Bugs suggest it's the intended behaviour
+	  $data = '';
+	  while ($bytes > 0) {
+		$chunk  = fread($this->_fd, $bytes);
+		$data  .= $chunk;
+		$bytes -= strlen($chunk);
+	  }
+	  $this->_pos = ftell($this->_fd);
 
-      return $data;
-    } else return '';
+	  return $data;
+	} else return '';
   }
 
   function seekto($pos) {
-    fseek($this->_fd, $pos);
-    $this->_pos = ftell($this->_fd);
-    return $this->_pos;
+	fseek($this->_fd, $pos);
+	$this->_pos = ftell($this->_fd);
+	return $this->_pos;
   }
 
   function currentpos() {
-    return $this->_pos;
+	return $this->_pos;
   }
 
   function length() {
-    return $this->_length;
+	return $this->_length;
   }
 
   function close() {
-    fclose($this->_fd);
+	fclose($this->_fd);
   }
 
 };
@@ -144,22 +144,22 @@ 
 // over it (it assumes knowledge of StringReader internals)
 class CachedFileReader extends StringReader {
   function CachedFileReader($filename) {
-    if (file_exists($filename)) {
-
-      $length=filesize($filename);
-      $fd = fopen($filename,'rb');
-
-      if (!$fd) {
-        $this->error = 3; // Cannot read file, probably permissions
-        return false;
-      }
-      $this->_str = fread($fd, $length);
-      fclose($fd);
-
-    } else {
-      $this->error = 2; // File doesn't exist
-      return false;
-    }
+	if (file_exists($filename)) {
+
+	  $length=filesize($filename);
+	  $fd = fopen($filename,'rb');
+
+	  if (!$fd) {
+		$this->error = 3; // Cannot read file, probably permissions
+		return false;
+	  }
+	  $this->_str = fread($fd, $length);
+	  fclose($fd);
+
+	} else {
+	  $this->error = 2; // File doesn't exist
+	  return false;
+	}
   }
 };
 

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;
+	}
 
   }
 }

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>

errors.php

Indentation +9 added lines, -9 removed lines

@@ -7,10 +7,10 @@ 
 $ERRORS[0] = "";
 
 $ERRORS[1] = __("This program requires XmlHttpRequest " .
-        "to function properly. Your browser doesn't seem to support it.");
+		"to function properly. Your browser doesn't seem to support it.");
 
 $ERRORS[2] = __("This program requires cookies " .
-        "to function properly. Your browser doesn't seem to support them.");
+		"to function properly. Your browser doesn't seem to support them.");
 
 $ERRORS[3] = __("Backend sanity check failed.");
 
@@ -41,15 +41,15 @@ 
 $ERRORS[15] = __("Encoding data as JSON failed");
 
 if ($_REQUEST['mode'] == 'js') {
-    header("Content-Type: text/javascript; charset=UTF-8");
+	header("Content-Type: text/javascript; charset=UTF-8");
 
-    print "var ERRORS = [];\n";
+	print "var ERRORS = [];\n";
 
-    foreach ($ERRORS as $id => $error) {
+	foreach ($ERRORS as $id => $error) {
 
-        $error = preg_replace("/\n/", "", $error);
-        $error = preg_replace("/\"/", "\\\"", $error);
+		$error = preg_replace("/\n/", "", $error);
+		$error = preg_replace("/\"/", "\\\"", $error);
 
-        print "ERRORS[$id] = \"$error\";\n";
-    }
+		print "ERRORS[$id] = \"$error\";\n";
+	}
 }

classes/article.php

Indentation +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
 		$sth = $this->pdo->prepare("SELECT link FROM ttrss_entries, ttrss_user_entries
 						WHERE id = ? AND id = ref_id AND owner_uid = ?
 						LIMIT 1");
-        $sth->execute([$id, $_SESSION['uid']]);
+		$sth->execute([$id, $_SESSION['uid']]);
 
 		if ($row = $sth->fetch()) {
 			$article_url = $row['link'];
@@ -76,7 +76,7 @@ 
 
 			$sth = $pdo->prepare("SELECT int_id FROM ttrss_user_entries WHERE
 				ref_id = ? AND owner_uid = ? LIMIT 1");
-            $sth->execute([$ref_id, $owner_uid]);
+			$sth->execute([$ref_id, $owner_uid]);
 
 			if ($row = $sth->fetch()) {
 				$int_id = $row['int_id'];
@@ -616,22 +616,22 @@ 
 
 	public static function purge_orphans() {
 
-        // purge orphaned posts in main content table
+		// purge orphaned posts in main content table
 
-        if (DB_TYPE == "mysql")
-            $limit_qpart = "LIMIT 5000";
-        else
-            $limit_qpart = "";
+		if (DB_TYPE == "mysql")
+			$limit_qpart = "LIMIT 5000";
+		else
+			$limit_qpart = "";
 
-        $pdo = Db::pdo();
-        $res = $pdo->query("DELETE FROM ttrss_entries WHERE
+		$pdo = Db::pdo();
+		$res = $pdo->query("DELETE FROM ttrss_entries WHERE
 			NOT EXISTS (SELECT ref_id FROM ttrss_user_entries WHERE ref_id = id) $limit_qpart");
 
-        if (Debug::enabled()) {
-            $rows = $res->rowCount();
-            Debug::log("Purged $rows orphaned posts.");
-        }
-    }
+		if (Debug::enabled()) {
+			$rows = $res->rowCount();
+			Debug::log("Purged $rows orphaned posts.");
+		}
+	}
 
 	public static function catchupArticlesById($ids, $cmode, $owner_uid = false) {
 

classes/feeds.php

Indentation +77 added lines, -77 removed lines

@@ -5,9 +5,9 @@ 
 	const NEVER_GROUP_FEEDS = [ -6, 0 ];
 	const NEVER_GROUP_BY_DATE = [ -2, -1, -3 ];
 
-    private $params;
+	private $params;
 
-    function csrf_ignore($method) {
+	function csrf_ignore($method) {
 		$csrf_ignored = array("index", "quickaddfeed", "search");
 
 		return array_search($method, $csrf_ignored) !== false;
@@ -101,7 +101,7 @@ 
 		//$reply .= "<option value=\"catchupPage()\">".__('Mark as read')."</option>";
 
 		$reply .= "<option value=\"App.displayDlg('".__("Show as feed")."','generatedFeed', '$feed_id:$is_cat:$rss_link')\">".
-            __('Show as feed')."</option>";
+			__('Show as feed')."</option>";
 
 		$reply .= "</select>";
 
@@ -133,10 +133,10 @@ 
 		$method_split = explode(":", $method);
 
 		if ($method == "ForceUpdate" && $feed > 0 && is_numeric($feed)) {
-            $sth = $this->pdo->prepare("UPDATE ttrss_feeds
+			$sth = $this->pdo->prepare("UPDATE ttrss_feeds
                             SET last_updated = '1970-01-01', last_update_started = '1970-01-01'
                             WHERE id = ?");
-            $sth->execute([$feed]);
+			$sth->execute([$feed]);
 		}
 
 		if ($method_split[0] == "MarkAllReadGR")  {
@@ -197,7 +197,7 @@ 
 				"include_children" => $include_children,
 				"check_first_id" => $check_first_id,
 				"skip_first_id_check" => $skip_first_id_check,
-                "order_by" => $order_by
+				"order_by" => $order_by
 			);
 
 			$qfh_ret = $this->queryFeedHeadlines($params);
@@ -235,7 +235,7 @@ 
 
 		$headlines_count = 0;
 
-        if (is_object($result)) {
+		if (is_object($result)) {
 			while ($line = $result->fetch(PDO::FETCH_ASSOC)) {
 
 				++$headlines_count;
@@ -248,7 +248,7 @@ 
 					foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_QUERY_HEADLINES) as $p) {
 						$line = $p->hook_query_headlines($line, 250, false);
 					}
-                }
+				}
 
 				$id = $line["id"];
 
@@ -295,53 +295,53 @@ 
 
 				if (!$line["feed_title"]) $line["feed_title"] = "";
 
-                $line["buttons_left"] = "";
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
-                    $line["buttons_left"] .= $p->hook_article_left_button($line);
-                }
+				$line["buttons_left"] = "";
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_LEFT_BUTTON) as $p) {
+					$line["buttons_left"] .= $p->hook_article_left_button($line);
+				}
 
-                $line["buttons"] = "";
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
-                    $line["buttons"] .= $p->hook_article_button($line);
-                }
+				$line["buttons"] = "";
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_ARTICLE_BUTTON) as $p) {
+					$line["buttons"] .= $p->hook_article_button($line);
+				}
 
-                $line["content"] = sanitize($line["content"],
-                    $line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
+				$line["content"] = sanitize($line["content"],
+					$line['hide_images'], false, $line["site_url"], $highlight_words, $line["id"]);
 
-                foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
-                    $line = $p->hook_render_article_cdm($line);
-                }
+				foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_RENDER_ARTICLE_CDM) as $p) {
+					$line = $p->hook_render_article_cdm($line);
+				}
 
-                $line['content'] = DiskCache::rewriteUrls($line['content']);
+				$line['content'] = DiskCache::rewriteUrls($line['content']);
 
-                if ($line['note'])
-                    $line['note'] = Article::format_article_note($id, $line['note']);
-                else
-                    $line['note'] = "";
+				if ($line['note'])
+					$line['note'] = Article::format_article_note($id, $line['note']);
+				else
+					$line['note'] = "";
 
-                if (!get_pref("CDM_EXPANDED")) {
-                    $line["cdm_excerpt"] = "<span class='collapse'>
+				if (!get_pref("CDM_EXPANDED")) {
+					$line["cdm_excerpt"] = "<span class='collapse'>
                         <i class='material-icons' onclick='return Article.cdmUnsetActive(event)'
                             title=\"" . __("Collapse article") . "\">remove_circle</i></span>";
 
-                    if (get_pref('SHOW_CONTENT_PREVIEW')) {
-                        $line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
-                    }
-                }
+					if (get_pref('SHOW_CONTENT_PREVIEW')) {
+						$line["cdm_excerpt"] .= "<span class='excerpt'>" . $line["content_preview"] . "</span>";
+					}
+				}
 
-                $line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"],
-                    $line["content"], $line["hide_images"]);
+				$line["enclosures"] = Article::format_article_enclosures($id, $line["always_display_enclosures"],
+					$line["content"], $line["hide_images"]);
 
-                if ($line["orig_feed_id"]) {
+				if ($line["orig_feed_id"]) {
 
-                    $ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
+					$ofgh = $this->pdo->prepare("SELECT * FROM ttrss_archived_feeds
                     WHERE id = ? AND owner_uid = ?");
-                    $ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
+					$ofgh->execute([$line["orig_feed_id"], $_SESSION['uid']]);
 
-                    if ($tmp_line = $ofgh->fetch()) {
-                        $line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
-                    }
-                }
+					if ($tmp_line = $ofgh->fetch()) {
+						$line["orig_feed"] = [ $tmp_line["title"], $tmp_line["site_url"], $tmp_line["feed_url"] ];
+					}
+				}
 
 				$line["updated_long"] = make_local_datetime($line["updated"],true);
 				$line["updated"] = make_local_datetime($line["updated"], false, false, false, true);
@@ -363,7 +363,7 @@ 
 					$line['feed_icon'] = "<i class='icon-no-feed material-icons'>rss_feed</i>";
 				}
 
-			    //setting feed headline background color, needs to change text color based on dark/light
+				//setting feed headline background color, needs to change text color based on dark/light
 				$fav_color = $line['favicon_avg_color'];
 
 				require_once "colors.php";
@@ -377,18 +377,18 @@ 
 				}
 
 				if (isset($rgba_cache[$feed_id])) {
-				    $line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
-                }
+					$line['feed_bg_color'] = 'rgba(' . implode(",", $rgba_cache[$feed_id]) . ',0.3)';
+				}
 
 				/* we don't need those */
 
-                foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
-                             "uuid", "label_cache", "yyiw"] as $k)
-                    unset($line[$k]);
+				foreach (["date_entered", "guid", "last_published", "last_marked", "tag_cache", "favicon_avg_color",
+							 "uuid", "label_cache", "yyiw"] as $k)
+					unset($line[$k]);
 
 				array_push($reply['content'], $line);
 			}
-        }
+		}
 
 		if (!$headlines_count) {
 
@@ -570,7 +570,7 @@ 
 		$reply['headlines']['is_cat'] = (bool) $cat_view;
 
 		$reply['headlines-info'] = ["count" => (int) $headlines_count,
-            						"disable_cache" => (bool) $disable_cache];
+									"disable_cache" => (bool) $disable_cache];
 
 		// this is parsed by handleRpcJson() on first viewfeed() to set cdm expanded, etc
 		$reply['runtime-info'] = make_runtime_info();
@@ -578,9 +578,9 @@ 
 		$reply_json = json_encode($reply);
 
 		if (!$reply_json) {
-		    $reply_json = json_encode(["error" => ["code" => 15,
-                "message" => json_last_error_msg()]]);
-        }
+			$reply_json = json_encode(["error" => ["code" => 15,
+				"message" => json_last_error_msg()]]);
+		}
 
 		print $reply_json;
 
@@ -780,9 +780,9 @@ 
 		$sth->execute([$feed_id, $_SESSION['uid']]);
 
 		if (!$sth->fetch()) {
-		    print "Access denied.";
-		    return;
-        }
+			print "Access denied.";
+			return;
+		}
 
 		$refetch_checked = isset($_REQUEST["force_refetch"]) ? "checked" : "";
 		$rehash_checked = isset($_REQUEST["force_rehash"]) ? "checked" : "";
@@ -1230,7 +1230,7 @@ 
 				} else {
 					$icon = self::getIconFile($id);
 
-                    if ($icon && file_exists($icon)) {
+					if ($icon && file_exists($icon)) {
 						return ICONS_URL . "/" . basename($icon) . "?" . filemtime($icon);
 					}
 				}
@@ -1240,7 +1240,7 @@ 
 	}
 
 	public static function getFeedTitle($id, $cat = false) {
-	    $pdo = Db::pdo();
+		$pdo = Db::pdo();
 
 		if ($cat) {
 			return Feeds::getCategoryTitle($id);
@@ -1271,10 +1271,10 @@ 
 
 		} else if (is_numeric($id) && $id > 0) {
 
-		    $sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
-		    $sth->execute([$id]);
+			$sth = $pdo->prepare("SELECT title FROM ttrss_feeds WHERE id = ?");
+			$sth->execute([$id]);
 
-		    if ($row = $sth->fetch()) {
+			if ($row = $sth->fetch()) {
 				return $row["title"];
 			} else {
 				return "Unknown feed ($id)";
@@ -1293,7 +1293,7 @@ 
 
 		if ($cat >= 0) {
 
-		    if (!$cat) $cat = null;
+			if (!$cat) $cat = null;
 
 			$sth = $pdo->prepare("SELECT id FROM ttrss_feeds
                     WHERE (cat_id = :cat OR (:cat IS NULL AND cat_id IS NULL))
@@ -1333,7 +1333,7 @@ 
 				WHERE article_id = ref_id AND unread = true
 					AND ttrss_user_entries.owner_uid = ?");
 			$sth->execute([$owner_uid]);
-            $row = $sth->fetch();
+			$row = $sth->fetch();
 
 			return $row["unread"];
 		}
@@ -1381,7 +1381,7 @@ 
 			return __("Labels");
 		} else {
 
-		    $pdo = Db::pdo();
+			$pdo = Db::pdo();
 
 			$sth = $pdo->prepare("SELECT title FROM ttrss_feed_categories WHERE
 				id = ?");
@@ -1417,7 +1417,7 @@ 
 		$pdo = Db::pdo();
 
 		// WARNING: due to highly dynamic nature of this query its going to quote parameters
-        // right before adding them to SQL part
+		// right before adding them to SQL part
 
 		$feed = $params["feed"];
 		$limit = isset($params["limit"]) ? $params["limit"] : 30;
@@ -1661,7 +1661,7 @@ 
 					$ssth = $pdo->prepare("SELECT title,site_url,last_error,last_updated
 							FROM ttrss_feeds WHERE id = ? AND owner_uid = ?");
 					$ssth->execute([$feed, $owner_uid]);
-                    $row = $ssth->fetch();
+					$row = $ssth->fetch();
 
 					$feed_title = $row["title"];
 					$feed_site_url = $row["site_url"];
@@ -1899,9 +1899,9 @@ 
 	public static function getFeedCategory($feed) {
 		$pdo = Db::pdo();
 
-	    $sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
+		$sth = $pdo->prepare("SELECT cat_id FROM ttrss_feeds
 				WHERE id = ?");
-	    $sth->execute([$feed]);
+		$sth->execute([$feed]);
 
 		if ($row = $sth->fetch()) {
 			return $row["cat_id"];
@@ -1911,20 +1911,20 @@ 
 
 	}
 
-    function color_of($name) {
-        $colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
-            "#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
-            "#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
+	function color_of($name) {
+		$colormap = [ "#1cd7d7","#d91111","#1212d7","#8e16e5","#7b7b7b",
+			"#39f110","#0bbea6","#ec0e0e","#1534f2","#b9e416",
+			"#479af2","#f36b14","#10c7e9","#1e8fe7","#e22727" ];
 
-        $sum = 0;
+		$sum = 0;
 
-        for ($i = 0; $i < strlen($name); $i++) {
-            $sum += ord($name[$i]);
-        }
+		for ($i = 0; $i < strlen($name); $i++) {
+			$sum += ord($name[$i]);
+		}
 
-        $sum %= count($colormap);
+		$sum %= count($colormap);
 
-        return $colormap[$sum];
+		return $colormap[$sum];
 	}
 
 	public static function get_feeds_from_html($url, $content) {

classes/pref/feeds.php

Indentation +2 added lines, -2 removed lines

@@ -1568,8 +1568,8 @@
 	public static function remove_feed($id, $owner_uid) {
 		foreach (PluginHost::getInstance()->get_hooks(PluginHost::HOOK_UNSUBSCRIBE_FEED) as $p) {
 			if (! $p->hook_unsubscribe_feed($id, $owner_uid)) {
-                user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
-                return;
+				user_error("Feed $id (owner: $owner_uid) not removed due to plugin error (HOOK_UNSUBSCRIBE_FEED).", E_USER_WARNING);
+				return;
 			}
 		}
 

classes/logger.php

Indentation +58 added lines, -58 removed lines

@@ -2,72 +2,72 @@
 
 class Logger {
 
-    /**
-     * @var Logger
-     */
-    private static $instance;
+	/**
+	 * @var Logger
+	 */
+	private static $instance;
 
-    /**
-     * @var bool|Logger_SQL|Logger_Syslog
-     */
-    private $adapter;
+	/**
+	 * @var bool|Logger_SQL|Logger_Syslog
+	 */
+	private $adapter;
 
-    public static $errornames = array(
-        1 => 'E_ERROR',
-        2 => 'E_WARNING',
-        4 => 'E_PARSE',
-        8 => 'E_NOTICE',
-        16 => 'E_CORE_ERROR',
-        32 => 'E_CORE_WARNING',
-        64 => 'E_COMPILE_ERROR',
-        128 => 'E_COMPILE_WARNING',
-        256 => 'E_USER_ERROR',
-        512 => 'E_USER_WARNING',
-        1024 => 'E_USER_NOTICE',
-        2048 => 'E_STRICT',
-        4096 => 'E_RECOVERABLE_ERROR',
-        8192 => 'E_DEPRECATED',
-        16384 => 'E_USER_DEPRECATED',
-        32767 => 'E_ALL');
+	public static $errornames = array(
+		1 => 'E_ERROR',
+		2 => 'E_WARNING',
+		4 => 'E_PARSE',
+		8 => 'E_NOTICE',
+		16 => 'E_CORE_ERROR',
+		32 => 'E_CORE_WARNING',
+		64 => 'E_COMPILE_ERROR',
+		128 => 'E_COMPILE_WARNING',
+		256 => 'E_USER_ERROR',
+		512 => 'E_USER_WARNING',
+		1024 => 'E_USER_NOTICE',
+		2048 => 'E_STRICT',
+		4096 => 'E_RECOVERABLE_ERROR',
+		8192 => 'E_DEPRECATED',
+		16384 => 'E_USER_DEPRECATED',
+		32767 => 'E_ALL');
 
-    public function log_error($errno, $errstr, $file, $line, $context) {
-        if ($errno === E_NOTICE) {
-            return false;
-        }
+	public function log_error($errno, $errstr, $file, $line, $context) {
+		if ($errno === E_NOTICE) {
+			return false;
+		}
 
-        if ($this->adapter) {
-            return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
-        }
+		if ($this->adapter) {
+			return $this->adapter->log_error($errno, $errstr, $file, $line, $context);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public function log($string, $context = "") {
-        if ($this->adapter) {
-            return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
-        }
+	public function log($string, $context = "") {
+		if ($this->adapter) {
+			return $this->adapter->log_error(E_USER_NOTICE, $string, '', 0, $context);
+		}
 
-        return false;
-    }
+		return false;
+	}
 
-    public function __construct() {
-        switch (LOG_DESTINATION) {
-            case "sql":
-                $this->adapter = new Logger_SQL();
-                break;
-            case "syslog":
-                $this->adapter = new Logger_Syslog();
-                break;
-            default:
-                $this->adapter = false;
-        }
-    }
+	public function __construct() {
+		switch (LOG_DESTINATION) {
+			case "sql":
+				$this->adapter = new Logger_SQL();
+				break;
+			case "syslog":
+				$this->adapter = new Logger_Syslog();
+				break;
+			default:
+				$this->adapter = false;
+		}
+	}
 
-    public static function get(): Logger {
-        if (self::$instance == null) {
-            self::$instance = new self();
-        }
-        return self::$instance;
-    }
+	public static function get(): Logger {
+		if (self::$instance == null) {
+			self::$instance = new self();
+		}
+		return self::$instance;
+	}
 
 }

classes/dlg.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 class Dlg extends Handler_Protected {
 	private $param;
-    private $params;
+	private $params;
 
-    function before($method) {
+	function before($method) {
 		if (parent::before($method)) {
 			header("Content-Type: text/html"); # required for iframe
 
@@ -108,7 +108,7 @@ 
 			$tags[$line["tag_name"]] = $line["count"];
 		}
 
-        if(count($tags) == 0 ){ return; }
+		if(count($tags) == 0 ){ return; }
 
 		ksort($tags);
 
@@ -193,7 +193,7 @@ 
 
 	public function defaultPasswordWarning() {
 
-    	print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
+		print_warning(__("You are using default tt-rss password. Please change it in the Preferences (Personal data / Authentication)."));
 
 		print "<footer class='text-center'>";
 		print "<button dojoType='dijit.form.Button' onclick=\"document.location.href = 'prefs.php'\">".