mbirth / cops

serie.php

Braces +18 added lines, -9 removed lines

@@ -6,7 +6,8 @@ 
  * @author     Sébastien Lucas <sebastien@slucas.fr>
  */
 
-class Serie extends Base {
+class Serie extends Base
+{
     const ALL_SERIES_ID = "cops:series";
     const SERIES_COLUMNS = "series.id as id, series.name as name, series.sort as sort, count(*) as count";
     const SQL_ALL_SERIES = "select {0} from series, books_series_link where series.id = series group by series.id, series.name, series.sort order by series.sort";
@@ -15,25 +16,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_SERIE_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_SERIES_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("series.alphabetical", count(array))
         return parent::getCountGeneric ("series", self::ALL_SERIES_ID, parent::PAGE_ALL_SERIES);
     }
 
-    public static function getSerieByBookId ($bookId) {
+    public static function getSerieByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select  series.id as id, name
 from books_series_link, series
 where series.id = series and book = ?');
@@ -44,7 +50,8 @@ 
         return NULL;
     }
 
-    public static function getSerieById ($serieId) {
+    public static function getSerieById ($serieId)
+    {
         $result = parent::getDb ()->prepare('select id, name  from series where id = ?');
         $result->execute (array ($serieId));
         if ($post = $result->fetchObject ()) {
@@ -53,11 +60,13 @@ 
         return NULL;
     }
 
-    public static function getAllSeries() {
+    public static function getAllSeries()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_SERIES, self::SERIES_COLUMNS, array (), "Serie");
     }
 
-    public static function getAllSeriesByQuery($query) {
+    public static function getAllSeriesByQuery($query)
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_SERIES_FOR_SEARCH, self::SERIES_COLUMNS, array ('%' . $query . '%'), "Serie");
     }
 }

fetch.php

Braces +7 added lines, -15 removed lines

@@ -25,12 +25,9 @@ 
     $bookId = getURLParam ("id", NULL);
     $type = getURLParam ("type", "jpg");
     $idData = getURLParam ("data", NULL);
-    if (is_null ($bookId))
-    {
+    if (is_null ($bookId)) {
         $book = Book::getBookByDataId($idData);
-    }
-    else
-    {
+    } else {
         $book = Book::getBookById($bookId);
     }
 
@@ -51,8 +48,7 @@ 
         }
     }
 
-    switch ($type)
-    {
+    switch ($type) {
         case "jpg":
             header("Content-Type: image/jpeg");
             //by default, we don't cache
@@ -69,8 +65,7 @@ 
                     //we name the thumbnail from the book's uuid and it's dimensions (width and/or height)
                     $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam ("width") . 'x' . getURLParam ("height") . '.jpg';
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
-                }
-                else {
+                } else {
                     //error creating the folder, so we don't cache
                     $thumbnailCacheFullpath = null;
                 }
@@ -87,8 +82,7 @@ 
                 if ( $thumbnailCacheFullpath === null ) {
                     // The cover had to be resized
                     return;
-                }
-                else {
+                } else {
                     //return the just cached thumbnail
                     readfile( $thumbnailCacheFullpath );
                     return;
@@ -101,8 +95,7 @@ 
             break;
     }
     $file = $book->getFilePath ($type, $idData, true);
-    if ($type == "epub" && $config['cops_update_epub-metadata'])
-    {
+    if ($type == "epub" && $config['cops_update_epub-metadata']) {
         $book->getUpdatedEpub ($idData);
         return;
     }
@@ -122,7 +115,6 @@ 
         $fp = fopen($filename, 'rb');
         header("Content-Length: " . filesize($filename));
         fpassthru($fp);
-    }
-    else {
+    } else {
         header ($config['cops_x_accel_redirect'] . ": " . $dir . $file);
     }

rating.php

Braces +17 added lines, -10 removed lines

@@ -6,7 +6,8 @@ 
  * @author     Michael Pfitzner
  */
 
-class Rating extends Base {
+class Rating extends Base
+{
     const ALL_RATING_ID = "cops:rating";
 
     const RATING_COLUMNS = "ratings.id as id, ratings.rating as rating, count(*) as count";
@@ -14,33 +15,38 @@ 
     public $id;
     public $name;
 
-    public function __construct($pid, $pname) {
+    public function __construct($pid, $pname)
+    {
         $this->id = $pid;
         $this->name = $pname;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_RATING_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_RATING_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("ratings", count(array))
         return parent::getCountGeneric ("ratings", self::ALL_RATING_ID, parent::PAGE_ALL_RATINGS, "ratings");
     }
 
-    public static function getAllRatings() {
+    public static function getAllRatings()
+    {
         return self::getEntryArray (self::SQL_ALL_RATINGS, array ());
     }
 
-    public static function getEntryArray ($query, $params) {
+    public static function getEntryArray ($query, $params)
+    {
         list (, $result) = parent::executeQuery ($query, self::RATING_COLUMNS, "", $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $ratingObj = new Rating ($post->id, $post->rating);
             $rating=$post->rating/2;
             $rating = str_format (localize("ratingword", $rating), $rating);
@@ -51,7 +57,8 @@ 
         return $entryArray;
     }
 
-    public static function getRatingById ($ratingId) {
+    public static function getRatingById ($ratingId)
+    {
         $result = parent::getDb ()->prepare('select rating from ratings where id = ?');
         $result->execute (array ($ratingId));
         return new Rating ($ratingId, $result->fetchColumn ());

sendtomail.php

Braces +13 added lines, -5 removed lines

@@ -2,7 +2,8 @@ 
 
 require_once ("config.php");
 
-function checkConfiguration () {
+function checkConfiguration ()
+{
     global $config;
 
     if (is_null ($config['cops_mail_configuration']) ||
@@ -14,7 +15,8 @@ 
     return False;
 }
 
-function checkRequest ($idData, $emailDest) {
+function checkRequest ($idData, $emailDest)
+{
     if (empty ($idData)) {
         return 'No data sent.';
     }
@@ -58,9 +60,15 @@ 
     $mail->Port = 465;
 }
 $mail->SMTPAuth = !empty ($config['cops_mail_configuration']["smtp.username"]);
-if (!empty ($config['cops_mail_configuration']["smtp.username"])) $mail->Username = $config['cops_mail_configuration']["smtp.username"];
-if (!empty ($config['cops_mail_configuration']["smtp.password"])) $mail->Password = $config['cops_mail_configuration']["smtp.password"];
-if (!empty ($config['cops_mail_configuration']["smtp.secure"])) $mail->SMTPSecure = $config['cops_mail_configuration']["smtp.secure"];
+if (!empty ($config['cops_mail_configuration']["smtp.username"])) {
+    $mail->Username = $config['cops_mail_configuration']["smtp.username"];
+}
+if (!empty ($config['cops_mail_configuration']["smtp.password"])) {
+    $mail->Password = $config['cops_mail_configuration']["smtp.password"];
+}
+if (!empty ($config['cops_mail_configuration']["smtp.secure"])) {
+    $mail->SMTPSecure = $config['cops_mail_configuration']["smtp.secure"];
+}
 
 $mail->From = $config['cops_mail_configuration']["address.from"];
 $mail->FromName = $config['cops_title_default'];

epubfs.php

Braces +9 added lines, -5 removed lines

@@ -9,7 +9,8 @@ 
 require_once ("config.php");
 require_once ("base.php");
 
-function getComponentContent ($book, $component, $add) {
+function getComponentContent ($book, $component, $add)
+{
     $data = $book->component ($component);
 
     $callback = function ($m) use ($book, $component, $add) {
@@ -28,7 +29,9 @@ 
             $hash = "#" . $matches [2];
         }
         $comp = $book->getComponentName ($component, $path);
-        if (!$comp) return "{$method}'#'{$end}";
+        if (!$comp) {
+            return "{$method}'#'{$end}";
+        }
         $out = "{$method}'epubfs.php?{$add}comp={$comp}{$hash}'{$end}";
         if ($end) {
             return $out;
@@ -48,7 +51,9 @@ 
 
 $idData = getURLParam ("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null (GetUrlParam (DB))) {
+    $add .= DB . "=" . GetUrlParam (DB) . "&";
+}
 $myBook = Book::getBookByDataId($idData);
 
 $book = new EPub ($myBook->getFilePath ("EPUB", $idData));
@@ -71,8 +76,7 @@ 
     header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
     header ("Content-Type: " . $book->componentContentType($component));
     echo $data;
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     error_log ($e);
     notFound ();
 }
\ No newline at end of file

transliteration.php

Braces +21 added lines, -36 removed lines

@@ -25,7 +25,8 @@ 
  * @return
  *   Transliterated text.
  */
-function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
+function _transliteration_process($string, $unknown = '?', $source_langcode = NULL)
+{
   // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
   // avoid the overhead of initializing the decomposition tables by skipping
   // out early.
@@ -41,23 +42,17 @@ 
     for ($n = 0; $n < 256; $n++) {
       if ($n < 0xc0) {
         $remaining = 0;
-      }
-      elseif ($n < 0xe0) {
+      } elseif ($n < 0xe0) {
         $remaining = 1;
-      }
-      elseif ($n < 0xf0) {
+      } elseif ($n < 0xf0) {
         $remaining = 2;
-      }
-      elseif ($n < 0xf8) {
+      } elseif ($n < 0xf8) {
         $remaining = 3;
-      }
-      elseif ($n < 0xfc) {
+      } elseif ($n < 0xfc) {
         $remaining = 4;
-      }
-      elseif ($n < 0xfe) {
+      } elseif ($n < 0xfe) {
         $remaining = 5;
-      }
-      else {
+      } else {
         $remaining = 0;
       }
       $tail_bytes[chr($n)] = $remaining;
@@ -100,15 +95,13 @@ 
           if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
             // Legal tail bytes are nice.
             $sequence .= $c;
-          }
-          else {
+          } else {
             if ($len == 0) {
               // Premature end of string! Drop a replacement character into
               // output to represent the invalid UTF-8 sequence.
               $result .= $unknown;
               break 2;
-            }
-            else {
+            } else {
               // Illegal tail byte; abandon the sequence.
               $result .= $unknown;
               // Back up and reprocess this byte; it may itself be a legal
@@ -123,34 +116,27 @@ 
         $n = ord($head);
         if ($n <= 0xdf) {
           $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
-        }
-        elseif ($n <= 0xef) {
+        } elseif ($n <= 0xef) {
           $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
-        }
-        elseif ($n <= 0xf7) {
+        } elseif ($n <= 0xf7) {
           $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
-        }
-        elseif ($n <= 0xfb) {
+        } elseif ($n <= 0xfb) {
           $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
-        }
-        elseif ($n <= 0xfd) {
+        } elseif ($n <= 0xfd) {
           $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128);
         }
         $result .= _transliteration_replace($ord, $unknown, $source_langcode);
         $head = '';
-      }
-      elseif ($c < "\x80") {
+      } elseif ($c < "\x80") {
         // ASCII byte.
         $result .= $c;
         $head = '';
-      }
-      elseif ($c < "\xc0") {
+      } elseif ($c < "\xc0") {
         // Illegal tail bytes.
         if ($head == '') {
           $result .= $unknown;
         }
-      }
-      else {
+      } else {
         // Miscellaneous freaks.
         $result .= $unknown;
         $head = '';
@@ -175,7 +161,8 @@ 
  * @return
  *   ASCII replacement character.
  */
-function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
+function _transliteration_replace($ord, $unknown = '?', $langcode = NULL)
+{
   static $map = array();
 
   //GL: set language later
@@ -195,12 +182,10 @@ 
       if ($langcode != 'en' && isset($variant[$langcode])) {
         // Merge in language specific mappings.
         $map[$bank][$langcode] = $variant[$langcode] + $base;
-      }
-      else {
+      } else {
         $map[$bank][$langcode] = $base;
       }
-    }
-    else {
+    } else {
       $map[$bank][$langcode] = array();
     }
   }

publisher.php

Braces +18 added lines, -9 removed lines

@@ -6,7 +6,8 @@ 
  * @author     At Libitum <eljarec@yahoo.com>
  */
 
-class Publisher extends Base {
+class Publisher extends Base
+{
     const ALL_PUBLISHERS_ID = "cops:publishers";
     const PUBLISHERS_COLUMNS = "publishers.id as id, publishers.name as name, count(*) as count";
     const SQL_ALL_PUBLISHERS = "select {0} from publishers, books_publishers_link where publishers.id = publisher group by publishers.id, publishers.name order by publishers.name";
@@ -16,25 +17,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_PUBLISHER_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_PUBLISHERS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("publishers.alphabetical", count(array))
         return parent::getCountGeneric ("publishers", self::ALL_PUBLISHERS_ID, parent::PAGE_ALL_PUBLISHERS);
     }
 
-    public static function getPublisherByBookId ($bookId) {
+    public static function getPublisherByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select publishers.id as id, name
 from books_publishers_link, publishers
 where publishers.id = publisher and book = ?');
@@ -45,7 +51,8 @@ 
         return NULL;
     }
 
-    public static function getPublisherById ($publisherId) {
+    public static function getPublisherById ($publisherId)
+    {
         $result = parent::getDb ()->prepare('select id, name
 from publishers where id = ?');
         $result->execute (array ($publisherId));
@@ -55,11 +62,13 @@ 
         return NULL;
     }
 
-    public static function getAllPublishers() {
+    public static function getAllPublishers()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_PUBLISHERS, self::PUBLISHERS_COLUMNS, array (), "Publisher");
     }
 
-    public static function getAllPublishersByQuery($query) {
+    public static function getAllPublishersByQuery($query)
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_PUBLISHERS_FOR_SEARCH, self::PUBLISHERS_COLUMNS, array ('%' . $query . '%'), "Publisher");
     }
 }

base.php

Braces +186 added lines, -99 removed lines

@@ -13,12 +13,14 @@ 
 date_default_timezone_set($config['default_timezone']);
 
 
-function useServerSideRendering () {
+function useServerSideRendering ()
+{
     global $config;
     return preg_match("/" . $config['cops_server_side_render'] . "/", $_SERVER['HTTP_USER_AGENT']);
 }
 
-function serverSideRender ($data) {
+function serverSideRender ($data)
+{
     // Get the templates
     $theme = getCurrentTemplate ();
     $header = file_get_contents('templates/' . $theme . '/header.html');
@@ -46,28 +48,32 @@ 
     return NULL;
 }
 
-function getQueryString () {
+function getQueryString ()
+{
     if ( isset($_SERVER['QUERY_STRING']) ) {
         return $_SERVER['QUERY_STRING'];
     }
     return "";
 }
 
-function notFound () {
+function notFound ()
+{
     header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
     header("Status: 404 Not Found");
 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
-function getURLParam ($name, $default = NULL) {
+function getURLParam ($name, $default = NULL)
+{
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
         return $_GET[$name];
     }
     return $default;
 }
 
-function getCurrentOption ($option) {
+function getCurrentOption ($option)
+{
     global $config;
     if (isset($_COOKIE[$option])) {
         if (isset($config ["cops_" . $option]) && is_array ($config ["cops_" . $option])) {
@@ -83,19 +89,23 @@ 
     return "";
 }
 
-function getCurrentCss () {
+function getCurrentCss ()
+{
     return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
 }
 
-function getCurrentTemplate () {
+function getCurrentTemplate ()
+{
     return getCurrentOption ("template");
 }
 
-function getUrlWithVersion ($url) {
+function getUrlWithVersion ($url)
+{
     return $url . "?v=" . VERSION;
 }
 
-function xml2xhtml($xml) {
+function xml2xhtml($xml)
+{
     return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', create_function('$m', '
         $xhtml_tags = array("br", "hr", "input", "frame", "img", "area", "link", "col", "base", "basefont", "param");
         return in_array($m[1], $xhtml_tags) ? "<$m[1]$m[2] />" : "<$m[1]$m[2]></$m[1]>";
@@ -135,12 +145,15 @@ 
     $errors = libxml_get_errors();
 
     foreach ($errors as $error) {
-        if ($error->code == 801) return false;
+        if ($error->code == 801) {
+            return false;
+        }
     }
     return true;
 }
 
-function html2xhtml ($html) {
+function html2xhtml ($html)
+{
     $doc = new DOMDocument();
     libxml_use_internal_errors(true);
 
@@ -160,7 +173,9 @@ 
     }
     */
 
-    if (!are_libxml_errors_ok ()) $output = "HTML code not valid.";
+    if (!are_libxml_errors_ok ()) {
+        $output = "HTML code not valid.";
+    }
 
     libxml_use_internal_errors(false);
     return $output;
@@ -170,7 +185,8 @@ 
  * This method is a direct copy-paste from
  * http://tmont.com/blargh/2010/1/string-format-in-php
  */
-function str_format($format) {
+function str_format($format)
+{
     $args = func_get_args();
     $format = array_shift($args);
 
@@ -190,7 +206,8 @@ 
  * languages id are normalized : fr-fr -> fr_FR
  * @return array of languages
  */
-function getAcceptLanguages() {
+function getAcceptLanguages()
+{
     $langs = array();
 
     if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
@@ -218,7 +235,9 @@ 
 
             // set default to 1 for any without q factor
             foreach ($langs as $lang => $val) {
-                if ($val === '') $langs[$lang] = 1;
+                if ($val === '') {
+                    $langs[$lang] = 1;
+                }
             }
 
             // sort list based on value
@@ -233,14 +252,14 @@ 
  * Find the best translation file possible based on the accepted languages
  * @return array of language and language file
  */
-function getLangAndTranslationFile() {
+function getLangAndTranslationFile()
+{
     global $config;
     $langs = array();
     $lang = "en";
     if (!empty($config['cops_language'])) {
         $lang = $config['cops_language'];
-    }
-    elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+    } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
         $langs = getAcceptLanguages();
     }
     //echo var_dump($langs);
@@ -263,14 +282,18 @@ 
  * This method is based on this page
  * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
  */
-function localize($phrase, $count=-1, $reset=false) {
+function localize($phrase, $count=-1, $reset=false)
+{
     global $config;
-    if ($count == 0)
-        $phrase .= ".none";
-    if ($count == 1)
-        $phrase .= ".one";
-    if ($count > 1)
-        $phrase .= ".many";
+    if ($count == 0) {
+            $phrase .= ".none";
+    }
+    if ($count == 1) {
+            $phrase .= ".one";
+    }
+    if ($count > 1) {
+            $phrase .= ".many";
+    }
 
     /* Static keyword is used to ensure the file is loaded only once */
     static $translations = NULL;
@@ -295,8 +318,7 @@ 
                 unset ($translations [$key]);
             }
         }
-        if ($lang_file_en)
-        {
+        if ($lang_file_en) {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
             $translations = array_merge ($translations_en, $translations);
@@ -308,7 +330,8 @@ 
     return $phrase;
 }
 
-function addURLParameter($urlParams, $paramName, $paramValue) {
+function addURLParameter($urlParams, $paramName, $paramValue)
+{
     if (empty ($urlParams)) {
         $urlParams = "";
     }
@@ -327,17 +350,20 @@ 
     return $start . http_build_query($params);
 }
 
-function useNormAndUp () {
+function useNormAndUp ()
+{
     global $config;
     return $config ['cops_normalized_search'] == "1";
 }
 
-function normalizeUtf8String( $s) {
+function normalizeUtf8String( $s)
+{
     include_once 'transliteration.php';
     return _transliteration_process($s);
 }
 
-function normAndUp ($s) {
+function normAndUp ($s)
+{
     return mb_strtoupper (normalizeUtf8String($s), 'UTF-8');
 }
 
@@ -356,7 +382,8 @@ 
     public $facetGroup;
     public $activeFacet;
 
-    public function __construct($phref, $ptype, $prel = NULL, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptype, $prel = NULL, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE)
+    {
         $this->href = $phref;
         $this->type = $ptype;
         $this->rel = $prel;
@@ -365,11 +392,13 @@ 
         $this->activeFacet = $pactiveFacet;
     }
 
-    public function hrefXhtml () {
+    public function hrefXhtml ()
+    {
         return $this->href;
     }
 
-    public function getScriptName() {
+    public function getScriptName()
+    {
         $parts = explode('/', $_SERVER["SCRIPT_NAME"]);
         return $parts[count($parts) - 1];
     }
@@ -377,10 +406,15 @@ 
 
 class LinkNavigation extends Link
 {
-    public function __construct($phref, $prel = NULL, $ptitle = NULL) {
+    public function __construct($phref, $prel = NULL, $ptitle = NULL)
+    {
         parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
-        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
+        if (!is_null (GetUrlParam (DB))) {
+            $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        }
+        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) {
+            $this->href = "?" . $this->href;
+        }
         if (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) {
             $this->href = "index.php" . $this->href;
         } else {
@@ -391,9 +425,12 @@ 
 
 class LinkFacet extends Link
 {
-    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE)
+    {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        if (!is_null (GetUrlParam (DB))) {
+            $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        }
         $this->href = parent::getScriptName() . $this->href;
     }
 }
@@ -423,7 +460,8 @@ 
         Publisher::ALL_PUBLISHERS_ID => 'images/publisher.png'
     );
 
-    public function getUpdatedTime () {
+    public function getUpdatedTime ()
+    {
         if (!is_null ($this->localUpdated)) {
             return date (DATE_ATOM, $this->localUpdated);
         }
@@ -433,7 +471,8 @@ 
         return date (DATE_ATOM, self::$updated);
     }
 
-    public function getNavLink () {
+    public function getNavLink ()
+    {
         foreach ($this->linkArray as $link) {
             if ($link->type != Link::OPDS_NAVIGATION_TYPE) { continue; }
 
@@ -442,7 +481,8 @@ 
         return "#";
     }
 
-    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pclass = "", $pcount = 0) {
+    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pclass = "", $pcount = 0)
+    {
         global $config;
         $this->title = $ptitle;
         $this->id = $pid;
@@ -452,10 +492,8 @@ 
         $this->className = $pclass;
         $this->numberOfElement = $pcount;
 
-        if ($config['cops_show_icons'] == 1)
-        {
-            foreach (self::$icons as $reg => $image)
-            {
+        if ($config['cops_show_icons'] == 1) {
+            foreach (self::$icons as $reg => $image) {
                 if (preg_match ("/" . $reg . "/", $pid)) {
                     array_push ($this->linkArray, new Link (getUrlWithVersion ($image), "image/png", Link::OPDS_THUMBNAIL_TYPE));
                     break;
@@ -463,7 +501,9 @@ 
             }
         }
 
-        if (!is_null (GetUrlParam (DB))) $this->id = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $this->id);
+        if (!is_null (GetUrlParam (DB))) {
+            $this->id = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $this->id);
+        }
     }
 }
 
@@ -471,24 +511,29 @@ 
 {
     public $book;
 
-    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pbook) {
+    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pbook)
+    {
         parent::__construct ($ptitle, $pid, $pcontent, $pcontentType, $plinkArray);
         $this->book = $pbook;
         $this->localUpdated = $pbook->timestamp;
     }
 
-    public function getCoverThumbnail () {
+    public function getCoverThumbnail ()
+    {
         foreach ($this->linkArray as $link) {
-            if ($link->rel == Link::OPDS_THUMBNAIL_TYPE)
-                return $link->hrefXhtml ();
+            if ($link->rel == Link::OPDS_THUMBNAIL_TYPE) {
+                            return $link->hrefXhtml ();
+            }
         }
         return null;
     }
 
-    public function getCover () {
+    public function getCover ()
+    {
         foreach ($this->linkArray as $link) {
-            if ($link->rel == Link::OPDS_IMAGE_TYPE)
-                return $link->hrefXhtml ();
+            if ($link->rel == Link::OPDS_IMAGE_TYPE) {
+                            return $link->hrefXhtml ();
+            }
         }
         return null;
     }
@@ -564,7 +609,8 @@ 
         }
     }
 
-    public function __construct($pid, $pquery, $pn) {
+    public function __construct($pid, $pquery, $pn)
+    {
         global $config;
 
         $this->idGet = $pid;
@@ -597,23 +643,33 @@ 
             }
             if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
                 $series = Serie::getCount();
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
+                if (!is_null ($series)) {
+                    array_push ($this->entryArray, $series);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
                 $publisher = Publisher::getCount();
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
+                if (!is_null ($publisher)) {
+                    array_push ($this->entryArray, $publisher);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
                 $tags = Tag::getCount();
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
+                if (!is_null ($tags)) {
+                    array_push ($this->entryArray, $tags);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
                 $rating = Rating::getCount();
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
+                if (!is_null ($rating)) {
+                    array_push ($this->entryArray, $rating);
+                }
             }
             if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
                 $languages = Language::getCount();
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
+                if (!is_null ($languages)) {
+                    array_push ($this->entryArray, $languages);
+                }
             }
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
                 $customId = CustomColumn::getCustomId ($lookup);
@@ -623,7 +679,9 @@ 
             }
             $this->entryArray = array_merge ($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled ()) {
+                $this->title =  Base::getDbName ();
+            }
         }
     }
 
@@ -659,8 +717,12 @@ 
 
     public function containsBook ()
     {
-        if (count ($this->entryArray) == 0) return false;
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
+        if (count ($this->entryArray) == 0) {
+            return false;
+        }
+        if (get_class ($this->entryArray [0]) == "EntryBook") {
+            return true;
+        }
         return false;
     }
 }
@@ -672,8 +734,7 @@ 
         $this->title = localize("authors.title");
         if (getCurrentOption ("author_split_first_letter") == 1) {
             $this->entryArray = Author::getAllAuthorsByFirstLetter();
-        }
-        else {
+        } else {
             $this->entryArray = Author::getAllAuthors();
         }
         $this->idPage = Author::ALL_AUTHORS_ID;
@@ -836,8 +897,7 @@ 
         $this->title = localize ("allbooks.title");
         if (getCurrentOption ("titles_split_first_letter") == 1) {
             $this->entryArray = Book::getAllBooks();
-        }
-        else {
+        } else {
             list ($this->entryArray, $this->totalNumber) = Book::getBooks ($this->n);
         }
         $this->idPage = Book::ALL_BOOKS_ID;
@@ -852,8 +912,9 @@ 
         $this->idPage = Book::getEntryIdByLetter ($this->idGet);
 
         $count = $this->totalNumber;
-        if ($count == -1)
-            $count = count ($this->entryArray);
+        if ($count == -1) {
+                    $count = count ($this->entryArray);
+        }
 
         $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("bookword", $count), $count), $this->idGet);
     }
@@ -878,11 +939,13 @@ 
     const SCOPE_BOOK = "book";
     const SCOPE_PUBLISHER = "publisher";
 
-    private function useTypeahead () {
+    private function useTypeahead ()
+    {
         return !is_null (getURLParam ("search"));
     }
 
-    private function searchByScope ($scope, $limit = FALSE) {
+    private function searchByScope ($scope, $limit = FALSE)
+    {
         $n = $this->n;
         $numberPerPage = NULL;
         $queryNormedAndUp = $this->query;
@@ -917,7 +980,8 @@ 
         return $array;
     }
 
-    public function doSearchByCategory () {
+    public function doSearchByCategory ()
+    {
         $database = GetUrlParam (DB);
         $out = array ();
         $pagequery = Base::PAGE_OPENSEARCH_QUERY;
@@ -1044,7 +1108,8 @@ 
 
 class PageCustomize extends Page
 {
-    private function isChecked ($key, $testedValue = 1) {
+    private function isChecked ($key, $testedValue = 1)
+    {
         $value = getCurrentOption ($key);
         if (is_array ($value)) {
             if (in_array ($testedValue, $value)) {
@@ -1058,14 +1123,16 @@ 
         return "";
     }
 
-    private function isSelected ($key, $value) {
+    private function isSelected ($key, $value)
+    {
         if (getCurrentOption ($key) == $value) {
             return "selected='selected'";
         }
         return "";
     }
 
-    private function getStyleList () {
+    private function getStyleList ()
+    {
         $result = array ();
         foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) {
             if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) {
@@ -1167,23 +1234,27 @@ 
 
     private static $db = NULL;
 
-    public static function isMultipleDatabaseEnabled () {
+    public static function isMultipleDatabaseEnabled ()
+    {
         global $config;
         return is_array ($config['calibre_directory']);
     }
 
-    public static function useAbsolutePath () {
+    public static function useAbsolutePath ()
+    {
         global $config;
         $path = self::getDbDirectory();
         return preg_match ('/^\//', $path) || // Linux /
                preg_match ('/^\w\:/', $path); // Windows X:
     }
 
-    public static function noDatabaseSelected () {
+    public static function noDatabaseSelected ()
+    {
         return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB));
     }
 
-    public static function getDbList () {
+    public static function getDbList ()
+    {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
             return $config['calibre_directory'];
@@ -1192,7 +1263,8 @@ 
         }
     }
 
-    public static function getDbNameList () {
+    public static function getDbNameList ()
+    {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
             return array_keys ($config['calibre_directory']);
@@ -1201,10 +1273,13 @@ 
         }
     }
 
-    public static function getDbName ($database = NULL) {
+    public static function getDbName ($database = NULL)
+    {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
-            if (is_null ($database)) $database = GetUrlParam (DB, 0);
+            if (is_null ($database)) {
+                $database = GetUrlParam (DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 return self::error ($database);
             }
@@ -1214,10 +1289,13 @@ 
         return "";
     }
 
-    public static function getDbDirectory ($database = NULL) {
+    public static function getDbDirectory ($database = NULL)
+    {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
-            if (is_null ($database)) $database = GetUrlParam (DB, 0);
+            if (is_null ($database)) {
+                $database = GetUrlParam (DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 return self::error ($database);
             }
@@ -1228,18 +1306,21 @@ 
     }
 
 
-    public static function getDbFileName ($database = NULL) {
+    public static function getDbFileName ($database = NULL)
+    {
         return self::getDbDirectory ($database) .'metadata.db';
     }
 
-    private static function error ($database) {
+    private static function error ($database)
+    {
         if (php_sapi_name() != "cli") {
             header("location: checkconfig.php?err=1");
         }
         throw new Exception("Database <{$database}> not found.");
     }
 
-    public static function getDb ($database = NULL) {
+    public static function getDb ($database = NULL)
+    {
         if (is_null (self::$db)) {
             try {
                 if (is_readable (self::getDbFileName ($database))) {
@@ -1257,7 +1338,8 @@ 
         return self::$db;
     }
 
-    public static function checkDatabaseAvailability () {
+    public static function checkDatabaseAvailability ()
+    {
         if (self::noDatabaseSelected ()) {
             for ($i = 0; $i < count (self::getDbList ()); $i++) {
                 self::getDb ($i);
@@ -1269,31 +1351,36 @@ 
         return true;
     }
 
-    public static function clearDb () {
+    public static function clearDb ()
+    {
         self::$db = NULL;
     }
 
-    public static function executeQuerySingle ($query, $database = NULL) {
+    public static function executeQuerySingle ($query, $database = NULL)
+    {
         return self::getDb ($database)->query($query)->fetchColumn();
     }
 
-    public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
+    public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL)
+    {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
         }
         $count = self::executeQuerySingle ('select count(*) from ' . $table);
-        if ($count == 0) return NULL;
+        if ($count == 0) {
+            return NULL;
+        }
         $entry = new Entry (localize($table . ".title"), $id,
             str_format (localize($numberOfString, $count), $count), "text",
             array ( new LinkNavigation ("?page=".$pageId)), "", $count);
         return $entry;
     }
 
-    public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
+    public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category)
+    {
         list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $instance = new $category ($post);
             if (property_exists($post, "sort")) {
                 $title = $post->sort;
@@ -1307,7 +1394,8 @@ 
         return $entryArray;
     }
 
-    public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $totalResult = -1;
 
         if (useNormAndUp ()) {
@@ -1319,8 +1407,7 @@ 
             $numberPerPage = getCurrentOption ("max_item_per_page");
         }
 
-        if ($numberPerPage != -1 && $n != -1)
-        {
+        if ($numberPerPage != -1 && $n != -1) {
             // First check total number of results
             $result = self::getDb ($database)->prepare (str_format ($query, "count(*)", $filter));
             $result->execute ($params);

OPDS_renderer.php

Braces +32 added lines, -24 removed lines

@@ -13,14 +13,16 @@ 
     private $xmlStream = NULL;
     private $updated = NULL;
 
-    private function getUpdatedTime () {
+    private function getUpdatedTime ()
+    {
         if (is_null ($this->updated)) {
             $this->updated = time();
         }
         return date (DATE_ATOM, $this->updated);
     }
 
-    private function getXmlStream () {
+    private function getXmlStream ()
+    {
         if (is_null ($this->xmlStream)) {
             $this->xmlStream = new XMLWriter();
             $this->xmlStream->openMemory();
@@ -29,7 +31,8 @@ 
         return $this->xmlStream;
     }
 
-    public function getOpenSearch () {
+    public function getOpenSearch ()
+    {
         global $config;
         $xml = new XMLWriter ();
         $xml->openMemory ();
@@ -58,7 +61,9 @@ 
                 $xml->startElement ("Url");
                     $xml->writeAttribute ("type", 'application/atom+xml');
                     $urlparam = "?query={searchTerms}";
-                    if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+                    if (!is_null (GetUrlParam (DB))) {
+                        $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+                    }
                     $urlparam = str_replace ("%7B", "{", $urlparam);
                     $urlparam = str_replace ("%7D", "}", $urlparam);
                     $xml->writeAttribute ("template", $config['cops_full_url'] . 'feed.php' . $urlparam);
@@ -72,7 +77,8 @@ 
         return $xml->outputMemory(true);
     }
 
-    private function startXmlDocument ($page) {
+    private function startXmlDocument ($page)
+    {
         global $config;
         self::getXmlStream ()->startDocument('1.0','UTF-8');
         self::getXmlStream ()->startElement ("feed");
@@ -84,21 +90,19 @@ 
             self::getXmlStream ()->startElement ("title");
                 self::getXmlStream ()->text ($page->title);
             self::getXmlStream ()->endElement ();
-            if ($page->subtitle != "")
-            {
+            if ($page->subtitle != "") {
                 self::getXmlStream ()->startElement ("subtitle");
                     self::getXmlStream ()->text ($page->subtitle);
                 self::getXmlStream ()->endElement ();
             }
             self::getXmlStream ()->startElement ("id");
-                if ($page->idPage)
-                {
+                if ($page->idPage) {
                     $idPage = $page->idPage;
-                    if (!is_null (GetUrlParam (DB))) $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage);
+                    if (!is_null (GetUrlParam (DB))) {
+                        $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage);
+                    }
                     self::getXmlStream ()->text ($idPage);
-                }
-                else
-                {
+                } else {
                     self::getXmlStream ()->text ($_SERVER['REQUEST_URI']);
                 }
             self::getXmlStream ()->endElement ();
@@ -124,14 +128,14 @@ 
             $link = new LinkNavigation ("?" . getQueryString (), "self");
             self::renderLink ($link);
             $urlparam = "?";
-            if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+            if (!is_null (GetUrlParam (DB))) {
+                $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+            }
             if ($config['cops_generate_invalid_opds_stream'] == 0 || preg_match("/(MantanoReader|FBReader)/", $_SERVER['HTTP_USER_AGENT'])) {
                 // Good and compliant way of handling search
                 $urlparam = addURLParameter ($urlparam, "page", Base::PAGE_OPENSEARCH);
                 $link = new Link ("feed.php" . $urlparam, "application/opensearchdescription+xml", "search", "Search here");
-            }
-            else
-            {
+            } else {
                 // Bad way, will be removed when OPDS client are fixed
                 $urlparam = addURLParameter ($urlparam, "query", "{searchTerms}");
                 $urlparam = str_replace ("%7B", "{", $urlparam);
@@ -148,13 +152,15 @@ 
             }
     }
 
-    private function endXmlDocument () {
+    private function endXmlDocument ()
+    {
         self::getXmlStream ()->endElement ();
         self::getXmlStream ()->endDocument ();
         return self::getXmlStream ()->outputMemory(true);
     }
 
-    private function renderLink ($link) {
+    private function renderLink ($link)
+    {
         self::getXmlStream ()->startElement ("link");
             self::getXmlStream ()->writeAttribute ("href", $link->href);
             self::getXmlStream ()->writeAttribute ("type", $link->type);
@@ -173,7 +179,8 @@ 
         self::getXmlStream ()->endElement ();
     }
 
-    private function getPublicationDate($book) {
+    private function getPublicationDate($book)
+    {
         $dateYmd = substr($book->pubdate, 0, 10);
         $pubdate = \DateTime::createFromFormat('Y-m-d', $dateYmd);
         if ($pubdate === false ||
@@ -184,7 +191,8 @@ 
         return $pubdate->format("Y-m-d");
     }
 
-    private function renderEntry ($entry) {
+    private function renderEntry ($entry)
+    {
         self::getXmlStream ()->startElement ("title");
             self::getXmlStream ()->text ($entry->title);
         self::getXmlStream ()->endElement ();
@@ -244,11 +252,11 @@ 
 
     }
 
-    public function render ($page) {
+    public function render ($page)
+    {
         global $config;
         self::startXmlDocument ($page);
-        if ($page->isPaginated ())
-        {
+        if ($page->isPaginated ()) {
             self::getXmlStream ()->startElement ("opensearch:totalResults");
                 self::getXmlStream ()->text ($page->totalNumber);
             self::getXmlStream ()->endElement ();