codysnider / tt-rss

lib/accept-to-gettext.php

Spacing +51 added lines, -53 removed lines

@@ -69,17 +69,17 @@ 
 
 /* not really important, this one; perhaps I could've put it inline with
  * the rest. */
-function find_match($curlscore,$curcscore,$curgtlang,$langval,$charval,
+function find_match($curlscore, $curcscore, $curgtlang, $langval, $charval,
                     $gtlang)
 {
-  if($curlscore < $langval) {
-    $curlscore=$langval;
-    $curcscore=$charval;
-    $curgtlang=$gtlang;
+  if ($curlscore < $langval) {
+    $curlscore = $langval;
+    $curcscore = $charval;
+    $curgtlang = $gtlang;
   } else if ($curlscore == $langval) {
-    if($curcscore < $charval) {
-      $curcscore=$charval;
-      $curgtlang=$gtlang;
+    if ($curcscore < $charval) {
+      $curcscore = $charval;
+      $curgtlang = $gtlang;
     }
   }
   return array($curlscore, $curcscore, $curgtlang);
@@ -87,22 +87,20 @@ 
 
 function al2gt($gettextlangs, $mime) {
   /* default to "everything is acceptable", as RFC2616 specifies */
-  $acceptLang=(($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
-  $acceptChar=(($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' :
-      $_SERVER["HTTP_ACCEPT_CHARSET"]);
-  $alparts=@preg_split("/,/",$acceptLang);
-  $acparts=@preg_split("/,/",$acceptChar);
+  $acceptLang = (($_SERVER["HTTP_ACCEPT_LANGUAGE"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_LANGUAGE"]);
+  $acceptChar = (($_SERVER["HTTP_ACCEPT_CHARSET"] == '') ? '*' : $_SERVER["HTTP_ACCEPT_CHARSET"]);
+  $alparts = @preg_split("/,/", $acceptLang);
+  $acparts = @preg_split("/,/", $acceptChar);
   
   /* Parse the contents of the Accept-Language header.*/
-  foreach($alparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $lang=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$lang[1]);
-      $alscores[$lang[0]]=$score[1];
+  foreach ($alparts as $part) {
+    $part = trim($part);
+    if (preg_match("/;/", $part)) {
+      $lang = @preg_split("/;/", $part);
+      $score = @preg_split("/=/", $lang[1]);
+      $alscores[$lang[0]] = $score[1];
     } else {
-      $alscores[$part]=1;
+      $alscores[$part] = 1;
     }
   }
 
@@ -116,20 +114,20 @@ 
    * Making it 2 for the time being, so that we
    * can distinguish between "not specified" and "specified as 1" later
    * on. */
-  $acscores["ISO-8859-1"]=2;
+  $acscores["ISO-8859-1"] = 2;
 
-  foreach($acparts as $part) {
-    $part=trim($part);
-    if(preg_match("/;/", $part)) {
-      $cs=@preg_split("/;/",$part);
-      $score=@preg_split("/=/",$cs[1]);
-      $acscores[strtoupper($cs[0])]=$score[1];
+  foreach ($acparts as $part) {
+    $part = trim($part);
+    if (preg_match("/;/", $part)) {
+      $cs = @preg_split("/;/", $part);
+      $score = @preg_split("/=/", $cs[1]);
+      $acscores[strtoupper($cs[0])] = $score[1];
     } else {
-      $acscores[strtoupper($part)]=1;
+      $acscores[strtoupper($part)] = 1;
     }
   }
-  if($acscores["ISO-8859-1"]==2) {
-    $acscores["ISO-8859-1"]=(isset($acscores["*"])?$acscores["*"]:1);
+  if ($acscores["ISO-8859-1"] == 2) {
+    $acscores["ISO-8859-1"] = (isset($acscores["*"]) ? $acscores["*"] : 1);
   }
 
   /* 
@@ -137,18 +135,18 @@ 
    * with the highest score, excluding the ones with a charset the user
    * did not include.
    */
-  $curlscore=0;
-  $curcscore=0;
-  $curgtlang=NULL;
-  foreach($gettextlangs as $gtlang) {
+  $curlscore = 0;
+  $curcscore = 0;
+  $curgtlang = NULL;
+  foreach ($gettextlangs as $gtlang) {
 
-    $tmp1=preg_replace("/\_/","-",$gtlang);
-    $tmp2=@preg_split("/\./",$tmp1);
-    $allang=strtolower($tmp2[0]);
-    $gtcs=strtoupper($tmp2[1]);
-    $noct=@preg_split("/-/",$allang);
+    $tmp1 = preg_replace("/\_/", "-", $gtlang);
+    $tmp2 = @preg_split("/\./", $tmp1);
+    $allang = strtolower($tmp2[0]);
+    $gtcs = strtoupper($tmp2[1]);
+    $noct = @preg_split("/-/", $allang);
 
-    $testvals=array(
+    $testvals = array(
          array(@$alscores[$allang], @$acscores[$gtcs]),
      array(@$alscores[$noct[0]], @$acscores[$gtcs]),
      array(@$alscores[$allang], @$acscores["*"]),
@@ -156,15 +154,15 @@ 
      array(@$alscores["*"], @$acscores[$gtcs]),
      array(@$alscores["*"], @$acscores["*"]));
 
-    $found=FALSE;
-    foreach($testvals as $tval) {
-      if(!$found && isset($tval[0]) && isset($tval[1])) {
-        $arr=find_match($curlscore, $curcscore, $curgtlang, $tval[0],
+    $found = FALSE;
+    foreach ($testvals as $tval) {
+      if (!$found && isset($tval[0]) && isset($tval[1])) {
+        $arr = find_match($curlscore, $curcscore, $curgtlang, $tval[0],
               $tval[1], $gtlang);
-        $curlscore=$arr[0];
-        $curcscore=$arr[1];
-        $curgtlang=$arr[2];
-    $found=TRUE;
+        $curlscore = $arr[0];
+        $curcscore = $arr[1];
+        $curgtlang = $arr[2];
+    $found = TRUE;
       }
     }
   }
@@ -172,10 +170,10 @@ 
   /* We must re-parse the gettext-string now, since we may have found it
    * through a "*" qualifier.*/
   
-  $gtparts=@preg_split("/\./",$curgtlang);
-  $tmp=strtolower($gtparts[0]);
-  $lang=preg_replace("/\_/", "-", $tmp);
-  $charset=$gtparts[1];
+  $gtparts = @preg_split("/\./", $curgtlang);
+  $tmp = strtolower($gtparts[0]);
+  $lang = preg_replace("/\_/", "-", $tmp);
+  $charset = $gtparts[1];
 
   header("Content-Language: $lang");
   header("Content-Type: $mime; charset=$charset");

lib/gettext/gettext.inc

Spacing +10 added lines, -10 removed lines

@@ -35,7 +35,7 @@ 
 // LC_MESSAGES is not available if php-gettext is not loaded
 // while the other constants are already available from session extension.
 if (!defined('LC_MESSAGES')) {
-  define('LC_MESSAGES',	5);
+  define('LC_MESSAGES', 5);
 }
 
 require('streams.php');
@@ -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)) {

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

lib/gettext/gettext.php

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;

index.php

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