mbirth / cops

author.php

Doc Comments +6 added lines

@@ -60,6 +60,9 @@ 
         return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%"));
     }
 
+    /**
+     * @param string $query
+     */
     public static function getAuthorsForSearch($query) {
         return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%"));
     }
@@ -68,6 +71,9 @@ 
         return self::getEntryArray (self::SQL_ALL_AUTHORS, array ());
     }
 
+    /**
+     * @param string $query
+     */
     public static function getEntryArray ($query, $params) {
         return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
     }

Spacing +29 added lines, -29 removed lines

@@ -24,69 +24,69 @@
         $this->sort = $post->sort;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_AUTHOR_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_AUTHOR_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_AUTHORS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_AUTHORS_ID . ":" . $this->id;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
-        return self::ALL_AUTHORS_ID.":letter:".$startingLetter;
+    public static function getEntryIdByLetter($startingLetter) {
+        return self::ALL_AUTHORS_ID . ":letter:" . $startingLetter;
     }
 
     public static function getCount() {
         // str_format (localize("authors.alphabetical", count(array))
-        return parent::getCountGeneric ("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS);
+        return parent::getCountGeneric("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS);
     }
 
     public static function getAllAuthorsByFirstLetter() {
-        list (, $result) = parent::executeQuery ("select {0}
+        list (, $result) = parent::executeQuery("select {0}
 from authors
 group by substr (upper (sort), 1, 1)
-order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array (), -1);
+order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array(), -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            array_push ($entryArray, new Entry ($post->title, Author::getEntryIdByLetter ($post->title),
-                str_format (localize("authorword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ("?page=".parent::PAGE_AUTHORS_FIRST_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
+            array_push($entryArray, new Entry($post->title, Author::getEntryIdByLetter($post->title),
+                str_format(localize("authorword", $post->count), $post->count), "text",
+                array(new LinkNavigation("?page=" . parent::PAGE_AUTHORS_FIRST_LETTER . "&id=" . rawurlencode($post->title))), "", $post->count));
         }
         return $entryArray;
     }
 
     public static function getAuthorsByStartingLetter($letter) {
-        return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%"));
+        return self::getEntryArray(self::SQL_AUTHORS_BY_FIRST_LETTER, array($letter . "%"));
     }
 
     public static function getAuthorsForSearch($query) {
-        return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%"));
+        return self::getEntryArray(self::SQL_AUTHORS_FOR_SEARCH, array($query . "%", $query . "%"));
     }
 
     public static function getAllAuthors() {
-        return self::getEntryArray (self::SQL_ALL_AUTHORS, array ());
+        return self::getEntryArray(self::SQL_ALL_AUTHORS, array());
     }
 
-    public static function getEntryArray ($query, $params) {
-        return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
+    public static function getEntryArray($query, $params) {
+        return Base::getEntryArrayWithBookNumber($query, self::AUTHOR_COLUMNS, $params, "Author");
     }
 
-    public static function getAuthorById ($authorId) {
-        $result = parent::getDb ()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
-        $result->execute (array ($authorId));
-        $post = $result->fetchObject ();
-        return new Author ($post);
+    public static function getAuthorById($authorId) {
+        $result = parent::getDb()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
+        $result->execute(array($authorId));
+        $post = $result->fetchObject();
+        return new Author($post);
     }
 
-    public static function getAuthorByBookId ($bookId) {
-        $result = parent::getDb ()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
+    public static function getAuthorByBookId($bookId) {
+        $result = parent::getDb()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
 where author = authors.id
 and book = ?');
-        $result->execute (array ($bookId));
-        $authorArray = array ();
-        while ($post = $result->fetchObject ()) {
-            array_push ($authorArray, new Author ($post));
+        $result->execute(array($bookId));
+        $authorArray = array();
+        while ($post = $result->fetchObject()) {
+            array_push($authorArray, new Author($post));
         }
         return $authorArray;
     }

Braces +27 added lines, -15 removed lines

@@ -6,7 +6,8 @@ 
  * @author     Sébastien Lucas <sebastien@slucas.fr>
  */
 
-class Author extends Base {
+class Author extends Base
+{
     const ALL_AUTHORS_ID = "cops:authors";
 
     const AUTHOR_COLUMNS = "authors.id as id, authors.name as name, authors.sort as sort, count(*) as count";
@@ -18,37 +19,42 @@ 
     public $name;
     public $sort;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = str_replace("|", ",", $post->name);
         $this->sort = $post->sort;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_AUTHOR_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_AUTHORS_ID.":".$this->id;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
+    public static function getEntryIdByLetter ($startingLetter)
+    {
         return self::ALL_AUTHORS_ID.":letter:".$startingLetter;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("authors.alphabetical", count(array))
         return parent::getCountGeneric ("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS);
     }
 
-    public static function getAllAuthorsByFirstLetter() {
+    public static function getAllAuthorsByFirstLetter()
+    {
         list (, $result) = parent::executeQuery ("select {0}
 from authors
 group by substr (upper (sort), 1, 1)
 order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array (), -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             array_push ($entryArray, new Entry ($post->title, Author::getEntryIdByLetter ($post->title),
                 str_format (localize("authorword", $post->count), $post->count), "text",
                 array ( new LinkNavigation ("?page=".parent::PAGE_AUTHORS_FIRST_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
@@ -56,30 +62,36 @@ 
         return $entryArray;
     }
 
-    public static function getAuthorsByStartingLetter($letter) {
+    public static function getAuthorsByStartingLetter($letter)
+    {
         return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%"));
     }
 
-    public static function getAuthorsForSearch($query) {
+    public static function getAuthorsForSearch($query)
+    {
         return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%"));
     }
 
-    public static function getAllAuthors() {
+    public static function getAllAuthors()
+    {
         return self::getEntryArray (self::SQL_ALL_AUTHORS, array ());
     }
 
-    public static function getEntryArray ($query, $params) {
+    public static function getEntryArray ($query, $params)
+    {
         return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
     }
 
-    public static function getAuthorById ($authorId) {
+    public static function getAuthorById ($authorId)
+    {
         $result = parent::getDb ()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
         $result->execute (array ($authorId));
         $post = $result->fetchObject ();
         return new Author ($post);
     }
 
-    public static function getAuthorByBookId ($bookId) {
+    public static function getAuthorByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
 where author = authors.id
 and book = ?');

base.php

Doc Comments +50 added lines

@@ -60,6 +60,9 @@ 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
+/**
+ * @param string $name
+ */
 function getURLParam ($name, $default = NULL) {
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
         return $_GET[$name];
@@ -95,6 +98,11 @@ 
     return $url . "?v=" . VERSION;
 }
 
+/**
+ * @param string $xml
+ *
+ * @return string
+ */
 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");
@@ -308,6 +316,9 @@ 
     return $phrase;
 }
 
+/**
+ * @param string $paramName
+ */
 function addURLParameter($urlParams, $paramName, $paramValue) {
     if (empty ($urlParams)) {
         $urlParams = "";
@@ -369,6 +380,9 @@ 
         return $this->href;
     }
 
+    /**
+     * @return string
+     */
     public function getScriptName() {
         $parts = explode('/', $_SERVER["SCRIPT_NAME"]);
         return $parts[count($parts) - 1];
@@ -377,6 +391,9 @@ 
 
 class LinkNavigation extends Link
 {
+    /**
+     * @param string $prel
+     */
     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));
@@ -391,6 +408,9 @@ 
 
 class LinkFacet extends Link
 {
+    /**
+     * @param string $phref
+     */
     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));
@@ -471,6 +491,12 @@ 
 {
     public $book;
 
+    /**
+     * @param string $pid
+     * @param string $pcontent
+     * @param string $pcontentType
+     * @param Book $pbook
+     */
     public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pbook) {
         parent::__construct ($ptitle, $pid, $pcontent, $pcontentType, $plinkArray);
         $this->book = $pbook;
@@ -1044,6 +1070,9 @@ 
 
 class PageCustomize extends Page
 {
+    /**
+     * @param string $key
+     */
     private function isChecked ($key, $testedValue = 1) {
         $value = getCurrentOption ($key);
         if (is_array ($value)) {
@@ -1058,6 +1087,9 @@ 
         return "";
     }
 
+    /**
+     * @param string $key
+     */
     private function isSelected ($key, $value) {
         if (getCurrentOption ($key) == $value) {
             return "selected='selected'";
@@ -1214,6 +1246,9 @@ 
         return "";
     }
 
+    /**
+     * @return string
+     */
     public static function getDbDirectory ($database = NULL) {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
@@ -1273,10 +1308,18 @@ 
         self::$db = NULL;
     }
 
+    /**
+     * @param string $query
+     */
     public static function executeQuerySingle ($query, $database = NULL) {
         return self::getDb ($database)->query($query)->fetchColumn();
     }
 
+    /**
+     * @param string $table
+     * @param string $id
+     * @param string $numberOfString
+     */
     public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
@@ -1289,6 +1332,10 @@ 
         return $entry;
     }
 
+    /**
+     * @param string $columns
+     * @param string $category
+     */
     public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
         list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
         $entryArray = array();
@@ -1307,6 +1354,9 @@ 
         return $entryArray;
     }
 
+    /**
+     * @param string $filter
+     */
     public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
         $totalResult = -1;
 

Indentation +11 added lines, -11 removed lines

@@ -30,9 +30,9 @@ 
     // Generate the function for the template
     $template = new doT ();
     $dot = $template->template ($page, array ("bookdetail" => $bookdetail,
-                                              "header" => $header,
-                                              "footer" => $footer,
-                                              "main" => $main));
+                                                "header" => $header,
+                                                "footer" => $footer,
+                                                "main" => $main));
     // If there is a syntax error in the function created
     // $dot will be equal to FALSE
     if (!$dot) {
@@ -111,7 +111,7 @@ 
         case LIBXML_ERR_WARNING:
             $return .= "Warning $error->code: ";
             break;
-         case LIBXML_ERR_ERROR:
+            case LIBXML_ERR_ERROR:
             $return .= "Error $error->code: ";
             break;
         case LIBXML_ERR_FATAL:
@@ -120,8 +120,8 @@ 
     }
 
     $return .= trim($error->message) .
-               "\n  Line: $error->line" .
-               "\n  Column: $error->column";
+                "\n  Line: $error->line" .
+                "\n  Column: $error->column";
 
     if ($error->file) {
         $return .= "\n  File: $error->file";
@@ -1081,11 +1081,11 @@ 
         $this->entryArray = array ();
 
         $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR,
-                                   PageQueryResult::SCOPE_TAG,
-                                   PageQueryResult::SCOPE_SERIES,
-                                   PageQueryResult::SCOPE_PUBLISHER,
-                                   PageQueryResult::SCOPE_RATING,
-                                   "language");
+                                    PageQueryResult::SCOPE_TAG,
+                                    PageQueryResult::SCOPE_SERIES,
+                                    PageQueryResult::SCOPE_PUBLISHER,
+                                    PageQueryResult::SCOPE_RATING,
+                                    "language");
 
         $content = "";
         array_push ($this->entryArray, new Entry ("Template", "",

Spacing +342 added lines, -342 removed lines

@@ -8,19 +8,19 @@ 
 
 require_once 'config.php';
 
-define ("VERSION", "1.0.0RC4");
-define ("DB", "db");
+define("VERSION", "1.0.0RC4");
+define("DB", "db");
 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 ();
+    $theme = getCurrentTemplate();
     $header = file_get_contents('templates/' . $theme . '/header.html');
     $footer = file_get_contents('templates/' . $theme . '/footer.html');
     $main = file_get_contents('templates/' . $theme . '/main.html');
@@ -28,8 +28,8 @@ 
     $page = file_get_contents('templates/' . $theme . '/page.html');
 
     // Generate the function for the template
-    $template = new doT ();
-    $dot = $template->template ($page, array ("bookdetail" => $bookdetail,
+    $template = new doT();
+    $dot = $template->template($page, array("bookdetail" => $bookdetail,
                                               "header" => $header,
                                               "footer" => $footer,
                                               "main" => $main));
@@ -40,38 +40,38 @@ 
     }
     // Execute the template
     if (!empty ($data)) {
-        return $dot ($data);
+        return $dot($data);
     }
 
     return NULL;
 }
 
-function getQueryString () {
-    if ( isset($_SERVER['QUERY_STRING']) ) {
+function getQueryString() {
+    if (isset($_SERVER['QUERY_STRING'])) {
         return $_SERVER['QUERY_STRING'];
     }
     return "";
 }
 
-function notFound () {
-    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+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])) {
-            return explode (",", $_COOKIE[$option]);
+        if (isset($config ["cops_" . $option]) && is_array($config ["cops_" . $option])) {
+            return explode(",", $_COOKIE[$option]);
         } else {
             return $_COOKIE[$option];
         }
@@ -83,15 +83,15 @@ 
     return "";
 }
 
-function getCurrentCss () {
-    return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
+function getCurrentCss() {
+    return "templates/" . getCurrentTemplate() . "/styles/style-" . getCurrentOption("style") . ".css";
 }
 
-function getCurrentTemplate () {
-    return getCurrentOption ("template");
+function getCurrentTemplate() {
+    return getCurrentOption("template");
 }
 
-function getUrlWithVersion ($url) {
+function getUrlWithVersion($url) {
     return $url . "?v=" . VERSION;
 }
 
@@ -130,7 +130,7 @@ 
     return "$return\n\n--------------------------------------------\n\n";
 }
 
-function are_libxml_errors_ok ()
+function are_libxml_errors_ok()
 {
     $errors = libxml_get_errors();
 
@@ -140,15 +140,15 @@ 
     return true;
 }
 
-function html2xhtml ($html) {
+function html2xhtml($html) {
     $doc = new DOMDocument();
     libxml_use_internal_errors(true);
 
     $doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
-                        $html  . '</body></html>'); // Load the HTML
+                        $html . '</body></html>'); // Load the HTML
     $output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
     $output = xml2xhtml($output);
-    if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
+    if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
         $output = $matches [1]; // Remove <html><body>
     }
     /*
@@ -160,7 +160,7 @@ 
     }
     */
 
-    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;
@@ -246,7 +246,7 @@ 
     //echo var_dump($langs);
     $lang_file = NULL;
     foreach ($langs as $language => $val) {
-        $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
+        $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
             $lang = $language;
             $lang_file = $temp_file;
@@ -254,7 +254,7 @@ 
         }
     }
     if (empty ($lang_file)) {
-        $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
+        $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
     }
     return array($lang, $lang_file);
 }
@@ -263,7 +263,7 @@ 
  * 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";
@@ -282,7 +282,7 @@ 
         $lang_file_en = NULL;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != "en") {
-            $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
+            $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
         }
 
         $lang_file_content = file_get_contents($lang_file);
@@ -290,8 +290,8 @@ 
         $translations = json_decode($lang_file_content, true);
 
         /* Clean the array of all unfinished translations */
-        foreach (array_keys ($translations) as $key) {
-            if (preg_match ("/^##TODO##/", $key)) {
+        foreach (array_keys($translations) as $key) {
+            if (preg_match("/^##TODO##/", $key)) {
                 unset ($translations [$key]);
             }
         }
@@ -299,10 +299,10 @@ 
         {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
-            $translations = array_merge ($translations_en, $translations);
+            $translations = array_merge($translations_en, $translations);
         }
     }
-    if (array_key_exists ($phrase, $translations)) {
+    if (array_key_exists($phrase, $translations)) {
         return $translations[$phrase];
     }
     return $phrase;
@@ -313,7 +313,7 @@ 
         $urlParams = "";
     }
     $start = "";
-    if (preg_match ("#^\?(.*)#", $urlParams, $matches)) {
+    if (preg_match("#^\?(.*)#", $urlParams, $matches)) {
         $start = "?";
         $urlParams = $matches[1];
     }
@@ -327,18 +327,18 @@ 
     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) {
-    return mb_strtoupper (normalizeUtf8String($s), 'UTF-8');
+function normAndUp($s) {
+    return mb_strtoupper(normalizeUtf8String($s), 'UTF-8');
 }
 
 class Link
@@ -365,7 +365,7 @@ 
         $this->activeFacet = $pactiveFacet;
     }
 
-    public function hrefXhtml () {
+    public function hrefXhtml() {
         return $this->href;
     }
 
@@ -378,10 +378,10 @@ 
 class LinkNavigation extends Link
 {
     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 (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) {
+        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 (preg_match("/(bookdetail|getJSON).php/", parent::getScriptName())) {
             $this->href = "index.php" . $this->href;
         } else {
             $this->href = parent::getScriptName() . $this->href;
@@ -392,8 +392,8 @@ 
 class LinkFacet extends Link
 {
     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));
+        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));
         $this->href = parent::getScriptName() . $this->href;
     }
 }
@@ -423,21 +423,21 @@ 
         Publisher::ALL_PUBLISHERS_ID => 'images/publisher.png'
     );
 
-    public function getUpdatedTime () {
-        if (!is_null ($this->localUpdated)) {
-            return date (DATE_ATOM, $this->localUpdated);
+    public function getUpdatedTime() {
+        if (!is_null($this->localUpdated)) {
+            return date(DATE_ATOM, $this->localUpdated);
         }
-        if (is_null (self::$updated)) {
+        if (is_null(self::$updated)) {
             self::$updated = time();
         }
-        return date (DATE_ATOM, self::$updated);
+        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; }
 
-            return $link->hrefXhtml ();
+            return $link->hrefXhtml();
         }
         return "#";
     }
@@ -456,14 +456,14 @@ 
         {
             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));
+                if (preg_match("/" . $reg . "/", $pid)) {
+                    array_push($this->linkArray, new Link(getUrlWithVersion($image), "image/png", Link::OPDS_THUMBNAIL_TYPE));
                     break;
                 }
             }
         }
 
-        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);
     }
 }
 
@@ -472,23 +472,23 @@ 
     public $book;
 
     public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pbook) {
-        parent::__construct ($ptitle, $pid, $pcontent, $pcontentType, $plinkArray);
+        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 ();
+                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 ();
+                return $link->hrefXhtml();
         }
         return null;
     }
@@ -510,55 +510,55 @@ 
     public $totalNumber = -1;
     public $entryArray = array();
 
-    public static function getPage ($pageId, $id, $query, $n)
+    public static function getPage($pageId, $id, $query, $n)
     {
         switch ($pageId) {
             case Base::PAGE_ALL_AUTHORS :
-                return new PageAllAuthors ($id, $query, $n);
+                return new PageAllAuthors($id, $query, $n);
             case Base::PAGE_AUTHORS_FIRST_LETTER :
-                return new PageAllAuthorsLetter ($id, $query, $n);
+                return new PageAllAuthorsLetter($id, $query, $n);
             case Base::PAGE_AUTHOR_DETAIL :
-                return new PageAuthorDetail ($id, $query, $n);
+                return new PageAuthorDetail($id, $query, $n);
             case Base::PAGE_ALL_TAGS :
-                return new PageAllTags ($id, $query, $n);
+                return new PageAllTags($id, $query, $n);
             case Base::PAGE_TAG_DETAIL :
-                return new PageTagDetail ($id, $query, $n);
+                return new PageTagDetail($id, $query, $n);
             case Base::PAGE_ALL_LANGUAGES :
-                return new PageAllLanguages ($id, $query, $n);
+                return new PageAllLanguages($id, $query, $n);
             case Base::PAGE_LANGUAGE_DETAIL :
-                return new PageLanguageDetail ($id, $query, $n);
+                return new PageLanguageDetail($id, $query, $n);
             case Base::PAGE_ALL_CUSTOMS :
-                return new PageAllCustoms ($id, $query, $n);
+                return new PageAllCustoms($id, $query, $n);
             case Base::PAGE_CUSTOM_DETAIL :
-                return new PageCustomDetail ($id, $query, $n);
+                return new PageCustomDetail($id, $query, $n);
             case Base::PAGE_ALL_RATINGS :
-                return new PageAllRating ($id, $query, $n);
+                return new PageAllRating($id, $query, $n);
             case Base::PAGE_RATING_DETAIL :
-                return new PageRatingDetail ($id, $query, $n);
+                return new PageRatingDetail($id, $query, $n);
             case Base::PAGE_ALL_SERIES :
-                return new PageAllSeries ($id, $query, $n);
+                return new PageAllSeries($id, $query, $n);
             case Base::PAGE_ALL_BOOKS :
-                return new PageAllBooks ($id, $query, $n);
+                return new PageAllBooks($id, $query, $n);
             case Base::PAGE_ALL_BOOKS_LETTER:
-                return new PageAllBooksLetter ($id, $query, $n);
+                return new PageAllBooksLetter($id, $query, $n);
             case Base::PAGE_ALL_RECENT_BOOKS :
-                return new PageRecentBooks ($id, $query, $n);
+                return new PageRecentBooks($id, $query, $n);
             case Base::PAGE_SERIE_DETAIL :
-                return new PageSerieDetail ($id, $query, $n);
+                return new PageSerieDetail($id, $query, $n);
             case Base::PAGE_OPENSEARCH_QUERY :
-                return new PageQueryResult ($id, $query, $n);
+                return new PageQueryResult($id, $query, $n);
             case Base::PAGE_BOOK_DETAIL :
-                return new PageBookDetail ($id, $query, $n);
+                return new PageBookDetail($id, $query, $n);
             case Base::PAGE_ALL_PUBLISHERS:
-                return new PageAllPublishers ($id, $query, $n);
+                return new PageAllPublishers($id, $query, $n);
             case Base::PAGE_PUBLISHER_DETAIL :
-                return new PagePublisherDetail ($id, $query, $n);
+                return new PagePublisherDetail($id, $query, $n);
             case Base::PAGE_ABOUT :
-                return new PageAbout ($id, $query, $n);
+                return new PageAbout($id, $query, $n);
             case Base::PAGE_CUSTOMIZE :
-                return new PageCustomize ($id, $query, $n);
+                return new PageCustomize($id, $query, $n);
             default:
-                $page = new Page ($id, $query, $n);
+                $page = new Page($id, $query, $n);
                 $page->idPage = "cops:catalog";
                 return $page;
         }
@@ -571,106 +571,106 @@ 
         $this->query = $pquery;
         $this->n = $pn;
         $this->favicon = $config['cops_icon'];
-        $this->authorName = empty($config['cops_author_name']) ? utf8_encode('Sébastien Lucas') : $config['cops_author_name'];
-        $this->authorUri = empty($config['cops_author_uri']) ? 'http://blog.slucas.fr' : $config['cops_author_uri'];
-        $this->authorEmail = empty($config['cops_author_email']) ? 'sebastien@slucas.fr' : $config['cops_author_email'];
+        $this->authorName = empty($config['cops_author_name'])?utf8_encode('Sébastien Lucas'):$config['cops_author_name'];
+        $this->authorUri = empty($config['cops_author_uri'])?'http://blog.slucas.fr':$config['cops_author_uri'];
+        $this->authorEmail = empty($config['cops_author_email'])?'sebastien@slucas.fr':$config['cops_author_email'];
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         global $config;
         $this->title = $config['cops_title_default'];
         $this->subtitle = $config['cops_subtitle_default'];
-        if (Base::noDatabaseSelected ()) {
+        if (Base::noDatabaseSelected()) {
             $i = 0;
-            foreach (Base::getDbNameList () as $key) {
-                $nBooks = Book::getBookCount ($i);
-                array_push ($this->entryArray, new Entry ($key, "cops:{$i}:catalog",
-                                        str_format (localize ("bookword", $nBooks), $nBooks), "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$i}")), "", $nBooks));
+            foreach (Base::getDbNameList() as $key) {
+                $nBooks = Book::getBookCount($i);
+                array_push($this->entryArray, new Entry($key, "cops:{$i}:catalog",
+                                        str_format(localize("bookword", $nBooks), $nBooks), "text",
+                                        array(new LinkNavigation("?" . DB . "={$i}")), "", $nBooks));
                 $i++;
-                Base::clearDb ();
+                Base::clearDb();
             }
         } else {
-            if (!in_array (PageQueryResult::SCOPE_AUTHOR, getCurrentOption ('ignored_categories'))) {
-                array_push ($this->entryArray, Author::getCount());
+            if (!in_array(PageQueryResult::SCOPE_AUTHOR, getCurrentOption('ignored_categories'))) {
+                array_push($this->entryArray, Author::getCount());
             }
-            if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
+            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'))) {
+            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'))) {
+            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'))) {
+            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'))) {
+            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);
-                if (!is_null ($customId)) {
-                    array_push ($this->entryArray, CustomColumn::getCount($customId));
+                $customId = CustomColumn::getCustomId($lookup);
+                if (!is_null($customId)) {
+                    array_push($this->entryArray, CustomColumn::getCount($customId));
                 }
             }
-            $this->entryArray = array_merge ($this->entryArray, Book::getCount());
+            $this->entryArray = array_merge($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled()) $this->title = Base::getDbName();
         }
     }
 
-    public function isPaginated ()
+    public function isPaginated()
     {
-        return (getCurrentOption ("max_item_per_page") != -1 &&
+        return (getCurrentOption("max_item_per_page") != -1 &&
                 $this->totalNumber != -1 &&
-                $this->totalNumber > getCurrentOption ("max_item_per_page"));
+                $this->totalNumber > getCurrentOption("max_item_per_page"));
     }
 
-    public function getNextLink ()
+    public function getNextLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
-        if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
+        if (($this->n) * getCurrentOption("max_item_per_page") < $this->totalNumber) {
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n + 1), "next", localize("paging.next.alternate"));
         }
         return NULL;
     }
 
-    public function getPrevLink ()
+    public function getPrevLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
         if ($this->n > 1) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n - 1), "previous", localize("paging.previous.alternate"));
         }
         return NULL;
     }
 
-    public function getMaxPage ()
+    public function getMaxPage()
     {
-        return ceil ($this->totalNumber / getCurrentOption ("max_item_per_page"));
+        return ceil($this->totalNumber / getCurrentOption("max_item_per_page"));
     }
 
-    public function containsBook ()
+    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;
     }
 }
 
 class PageAllAuthors extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("authors.title");
-        if (getCurrentOption ("author_split_first_letter") == 1) {
+        if (getCurrentOption("author_split_first_letter") == 1) {
             $this->entryArray = Author::getAllAuthorsByFirstLetter();
         }
         else {
@@ -682,28 +682,28 @@ 
 
 class PageAllAuthorsLetter extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->idPage = Author::getEntryIdByLetter ($this->idGet);
-        $this->entryArray = Author::getAuthorsByStartingLetter ($this->idGet);
-        $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("authorword", count ($this->entryArray)), count ($this->entryArray)), $this->idGet);
+        $this->idPage = Author::getEntryIdByLetter($this->idGet);
+        $this->entryArray = Author::getAuthorsByStartingLetter($this->idGet);
+        $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("authorword", count($this->entryArray)), count($this->entryArray)), $this->idGet);
     }
 }
 
 class PageAuthorDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $author = Author::getAuthorById ($this->idGet);
-        $this->idPage = $author->getEntryId ();
+        $author = Author::getAuthorById($this->idGet);
+        $this->idPage = $author->getEntryId();
         $this->title = $author->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByAuthor ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByAuthor($this->idGet, $this->n);
     }
 }
 
 class PageAllPublishers extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("publishers.title");
         $this->entryArray = Publisher::getAllPublishers();
@@ -713,18 +713,18 @@ 
 
 class PagePublisherDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $publisher = Publisher::getPublisherById ($this->idGet);
+        $publisher = Publisher::getPublisherById($this->idGet);
         $this->title = $publisher->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByPublisher ($this->idGet, $this->n);
-        $this->idPage = $publisher->getEntryId ();
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByPublisher($this->idGet, $this->n);
+        $this->idPage = $publisher->getEntryId();
     }
 }
 
 class PageAllTags extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("tags.title");
         $this->entryArray = Tag::getAllTags();
@@ -734,7 +734,7 @@ 
 
 class PageAllLanguages extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("languages.title");
         $this->entryArray = Language::getAllLanguages();
@@ -744,52 +744,52 @@ 
 
 class PageCustomDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $customId = getURLParam ("custom", NULL);
-        $custom = CustomColumn::getCustomById ($customId, $this->idGet);
-        $this->idPage = $custom->getEntryId ();
+        $customId = getURLParam("custom", NULL);
+        $custom = CustomColumn::getCustomById($customId, $this->idGet);
+        $this->idPage = $custom->getEntryId();
         $this->title = $custom->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom ($customId, $this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom($customId, $this->idGet, $this->n);
     }
 }
 
 class PageAllCustoms extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $customId = getURLParam ("custom", NULL);
-        $this->title = CustomColumn::getAllTitle ($customId);
+        $customId = getURLParam("custom", NULL);
+        $this->title = CustomColumn::getAllTitle($customId);
         $this->entryArray = CustomColumn::getAllCustoms($customId);
-        $this->idPage = CustomColumn::getAllCustomsId ($customId);
+        $this->idPage = CustomColumn::getAllCustomsId($customId);
     }
 }
 
 class PageTagDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $tag = Tag::getTagById ($this->idGet);
-        $this->idPage = $tag->getEntryId ();
+        $tag = Tag::getTagById($this->idGet);
+        $this->idPage = $tag->getEntryId();
         $this->title = $tag->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByTag ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByTag($this->idGet, $this->n);
     }
 }
 
 class PageLanguageDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $language = Language::getLanguageById ($this->idGet);
-        $this->idPage = $language->getEntryId ();
+        $language = Language::getLanguageById($this->idGet);
+        $this->idPage = $language->getEntryId();
         $this->title = $language->lang_code;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage($this->idGet, $this->n);
     }
 }
 
 class PageAllSeries extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("series.title");
         $this->entryArray = Serie::getAllSeries();
@@ -799,18 +799,18 @@ 
 
 class PageSerieDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $serie = Serie::getSerieById ($this->idGet);
+        $serie = Serie::getSerieById($this->idGet);
         $this->title = $serie->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksBySeries ($this->idGet, $this->n);
-        $this->idPage = $serie->getEntryId ();
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksBySeries($this->idGet, $this->n);
+        $this->idPage = $serie->getEntryId();
     }
 }
 
 class PageAllRating extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("ratings.title");
         $this->entryArray = Rating::getAllRatings();
@@ -820,25 +820,25 @@ 
 
 class PageRatingDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $rating = Rating::getRatingById ($this->idGet);
-        $this->idPage = $rating->getEntryId ();
-        $this->title =str_format (localize ("ratingword", $rating->name/2), $rating->name/2);
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByRating ($this->idGet, $this->n);
+        $rating = Rating::getRatingById($this->idGet);
+        $this->idPage = $rating->getEntryId();
+        $this->title = str_format(localize("ratingword", $rating->name / 2), $rating->name / 2);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByRating($this->idGet, $this->n);
     }
 }
 
 class PageAllBooks extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("allbooks.title");
-        if (getCurrentOption ("titles_split_first_letter") == 1) {
+        $this->title = localize("allbooks.title");
+        if (getCurrentOption("titles_split_first_letter") == 1) {
             $this->entryArray = Book::getAllBooks();
         }
         else {
-            list ($this->entryArray, $this->totalNumber) = Book::getBooks ($this->n);
+            list ($this->entryArray, $this->totalNumber) = Book::getBooks($this->n);
         }
         $this->idPage = Book::ALL_BOOKS_ID;
     }
@@ -846,25 +846,25 @@ 
 
 class PageAllBooksLetter extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter ($this->idGet, $this->n);
-        $this->idPage = Book::getEntryIdByLetter ($this->idGet);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter($this->idGet, $this->n);
+        $this->idPage = Book::getEntryIdByLetter($this->idGet);
 
         $count = $this->totalNumber;
         if ($count == -1)
-            $count = count ($this->entryArray);
+            $count = count($this->entryArray);
 
-        $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("bookword", $count), $count), $this->idGet);
+        $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("bookword", $count), $count), $this->idGet);
     }
 }
 
 class PageRecentBooks extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("recent.title");
-        $this->entryArray = Book::getAllRecentBooks ();
+        $this->title = localize("recent.title");
+        $this->entryArray = Book::getAllRecentBooks();
         $this->idPage = Book::ALL_RECENT_BOOKS_ID;
     }
 }
@@ -878,16 +878,16 @@ 
     const SCOPE_BOOK = "book";
     const SCOPE_PUBLISHER = "publisher";
 
-    private function useTypeahead () {
-        return !is_null (getURLParam ("search"));
+    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;
-        if (useNormAndUp ()) {
-            $queryNormedAndUp = normAndUp ($this->query);
+        if (useNormAndUp()) {
+            $queryNormedAndUp = normAndUp($this->query);
         }
         if ($limit) {
             $n = 1;
@@ -895,59 +895,59 @@ 
         }
         switch ($scope) {
             case self::SCOPE_BOOK :
-                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Book::getBooksByStartingLetter('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
                 break;
             case self::SCOPE_AUTHOR :
-                $array = Author::getAuthorsForSearch ('%' . $queryNormedAndUp);
+                $array = Author::getAuthorsForSearch('%' . $queryNormedAndUp);
                 break;
             case self::SCOPE_SERIES :
-                $array = Serie::getAllSeriesByQuery ($queryNormedAndUp);
+                $array = Serie::getAllSeriesByQuery($queryNormedAndUp);
                 break;
             case self::SCOPE_TAG :
-                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Tag::getAllTagsByQuery($queryNormedAndUp, $n, NULL, $numberPerPage);
                 break;
             case self::SCOPE_PUBLISHER :
-                $array = Publisher::getAllPublishersByQuery ($queryNormedAndUp);
+                $array = Publisher::getAllPublishersByQuery($queryNormedAndUp);
                 break;
             default:
-                $array = Book::getBooksByQuery (
-                    array ("all" => "%" . $queryNormedAndUp . "%"), $n);
+                $array = Book::getBooksByQuery(
+                    array("all" => "%" . $queryNormedAndUp . "%"), $n);
         }
 
         return $array;
     }
 
-    public function doSearchByCategory () {
-        $database = GetUrlParam (DB);
-        $out = array ();
+    public function doSearchByCategory() {
+        $database = GetUrlParam(DB);
+        $out = array();
         $pagequery = Base::PAGE_OPENSEARCH_QUERY;
-        $dbArray = array ("");
+        $dbArray = array("");
         $d = $database;
         $query = $this->query;
         // Special case when no databases were chosen, we search on all databases
-        if (Base::noDatabaseSelected ()) {
-            $dbArray = Base::getDbNameList ();
+        if (Base::noDatabaseSelected()) {
+            $dbArray = Base::getDbNameList();
             $d = 0;
         }
         foreach ($dbArray as $key) {
-            if (Base::noDatabaseSelected ()) {
-                array_push ($this->entryArray, new Entry ($key, DB . ":query:{$d}",
+            if (Base::noDatabaseSelected()) {
+                array_push($this->entryArray, new Entry($key, DB . ":query:{$d}",
                                         " ", "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$d}")), "tt-header"));
-                Base::getDb ($d);
+                                        array(new LinkNavigation("?" . DB . "={$d}")), "tt-header"));
+                Base::getDb($d);
             }
-            foreach (array (PageQueryResult::SCOPE_BOOK,
+            foreach (array(PageQueryResult::SCOPE_BOOK,
                             PageQueryResult::SCOPE_AUTHOR,
                             PageQueryResult::SCOPE_SERIES,
                             PageQueryResult::SCOPE_TAG,
                             PageQueryResult::SCOPE_PUBLISHER) as $key) {
-                if (in_array($key, getCurrentOption ('ignored_categories'))) {
+                if (in_array($key, getCurrentOption('ignored_categories'))) {
                     continue;
                 }
-                $array = $this->searchByScope ($key, TRUE);
+                $array = $this->searchByScope($key, TRUE);
 
                 $i = 0;
-                if (count ($array) == 2 && is_array ($array [0])) {
+                if (count($array) == 2 && is_array($array [0])) {
                     $total = $array [1];
                     $array = $array [0];
                 } else {
@@ -960,32 +960,32 @@ 
                     // str_format (localize("seriesword", count($array))
                     // str_format (localize("tagword", count($array))
                     // str_format (localize("publisherword", count($array))
-                    array_push ($this->entryArray, new Entry (str_format (localize ("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
-                                        str_format (localize("{$key}word", $total), $total), "text",
-                                        array ( new LinkNavigation ("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
-                                        Base::noDatabaseSelected () ? "" : "tt-header", $total));
+                    array_push($this->entryArray, new Entry(str_format(localize("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
+                                        str_format(localize("{$key}word", $total), $total), "text",
+                                        array(new LinkNavigation("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
+                                        Base::noDatabaseSelected()?"":"tt-header", $total));
                 }
-                if (!Base::noDatabaseSelected () && $this->useTypeahead ()) {
+                if (!Base::noDatabaseSelected() && $this->useTypeahead()) {
                     foreach ($array as $entry) {
-                        array_push ($this->entryArray, $entry);
+                        array_push($this->entryArray, $entry);
                         $i++;
                         if ($i > 4) { break; };
                     }
                 }
             }
             $d++;
-            if (Base::noDatabaseSelected ()) {
-                Base::clearDb ();
+            if (Base::noDatabaseSelected()) {
+                Base::clearDb();
             }
         }
         return $out;
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $scope = getURLParam ("scope");
+        $scope = getURLParam("scope");
         if (empty ($scope)) {
-            $this->title = str_format (localize ("search.result"), $this->query);
+            $this->title = str_format(localize("search.result"), $this->query);
         } else {
             // Comment to help the perl i18n script
             // str_format (localize ("search.result.author"), $this->query)
@@ -993,31 +993,31 @@ 
             // str_format (localize ("search.result.series"), $this->query)
             // str_format (localize ("search.result.book"), $this->query)
             // str_format (localize ("search.result.publisher"), $this->query)
-            $this->title = str_format (localize ("search.result.{$scope}"), $this->query);
+            $this->title = str_format(localize("search.result.{$scope}"), $this->query);
         }
 
         $crit = "%" . $this->query . "%";
 
         // Special case when we are doing a search and no database is selected
-        if (Base::noDatabaseSelected () && !$this->useTypeahead ()) {
+        if (Base::noDatabaseSelected() && !$this->useTypeahead()) {
             $i = 0;
-            foreach (Base::getDbNameList () as $key) {
-                Base::clearDb ();
-                list ($array, $totalNumber) = Book::getBooksByQuery (array ("all" => $crit), 1, $i, 1);
-                array_push ($this->entryArray, new Entry ($key, DB . ":query:{$i}",
-                                        str_format (localize ("bookword", $totalNumber), $totalNumber), "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
+            foreach (Base::getDbNameList() as $key) {
+                Base::clearDb();
+                list ($array, $totalNumber) = Book::getBooksByQuery(array("all" => $crit), 1, $i, 1);
+                array_push($this->entryArray, new Entry($key, DB . ":query:{$i}",
+                                        str_format(localize("bookword", $totalNumber), $totalNumber), "text",
+                                        array(new LinkNavigation("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
                 $i++;
             }
             return;
         }
         if (empty ($scope)) {
-            $this->doSearchByCategory ();
+            $this->doSearchByCategory();
             return;
         }
 
-        $array = $this->searchByScope ($scope);
-        if (count ($array) == 2 && is_array ($array [0])) {
+        $array = $this->searchByScope($scope);
+        if (count($array) == 2 && is_array($array [0])) {
             list ($this->entryArray, $this->totalNumber) = $array;
         } else {
             $this->entryArray = $array;
@@ -1027,27 +1027,27 @@ 
 
 class PageBookDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->book = Book::getBookById ($this->idGet);
+        $this->book = Book::getBookById($this->idGet);
         $this->title = $this->book->title;
     }
 }
 
 class PageAbout extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("about.title");
+        $this->title = localize("about.title");
     }
 }
 
 class PageCustomize extends Page
 {
-    private function isChecked ($key, $testedValue = 1) {
-        $value = getCurrentOption ($key);
-        if (is_array ($value)) {
-            if (in_array ($testedValue, $value)) {
+    private function isChecked($key, $testedValue = 1) {
+        $value = getCurrentOption($key);
+        if (is_array($value)) {
+            if (in_array($testedValue, $value)) {
                 return "checked='checked'";
             }
         } else {
@@ -1058,29 +1058,29 @@ 
         return "";
     }
 
-    private function isSelected ($key, $value) {
-        if (getCurrentOption ($key) == $value) {
+    private function isSelected($key, $value) {
+        if (getCurrentOption($key) == $value) {
             return "selected='selected'";
         }
         return "";
     }
 
-    private function getStyleList () {
-        $result = array ();
-        foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) {
-            if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) {
-                array_push ($result, $m [1]);
+    private function getStyleList() {
+        $result = array();
+        foreach (glob("templates/" . getCurrentTemplate() . "/styles/style-*.css") as $filename) {
+            if (preg_match('/styles\/style-(.*?)\.css/', $filename, $m)) {
+                array_push($result, $m [1]);
             }
         }
         return $result;
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("customize.title");
-        $this->entryArray = array ();
+        $this->title = localize("customize.title");
+        $this->entryArray = array();
 
-        $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR,
+        $ignoredBaseArray = array(PageQueryResult::SCOPE_AUTHOR,
                                    PageQueryResult::SCOPE_TAG,
                                    PageQueryResult::SCOPE_SERIES,
                                    PageQueryResult::SCOPE_PUBLISHER,
@@ -1088,50 +1088,50 @@ 
                                    "language");
 
         $content = "";
-        array_push ($this->entryArray, new Entry ("Template", "",
+        array_push($this->entryArray, new Entry("Template", "",
                                         "<span style='cursor: pointer;' onclick='$.cookie(\"template\", \"bootstrap\", { expires: 365 });window.location=$(\".headleft\").attr(\"href\");'>Click to switch to Bootstrap</span>", "text",
-                                        array ()));
+                                        array()));
         if (!preg_match("/(Kobo|Kindle\/3.0|EBRD1101)/", $_SERVER['HTTP_USER_AGENT'])) {
             $content .= '<select id="style" onchange="updateCookie (this);">';
-            foreach ($this-> getStyleList () as $filename) {
-                $content .= "<option value='{$filename}' " . $this->isSelected ("style", $filename) . ">{$filename}</option>";
+            foreach ($this-> getStyleList() as $filename) {
+                $content .= "<option value='{$filename}' " . $this->isSelected("style", $filename) . ">{$filename}</option>";
             }
             $content .= '</select>';
         } else {
-            foreach ($this-> getStyleList () as $filename) {
-                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked ("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>";
+            foreach ($this-> getStyleList() as $filename) {
+                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>";
             }
         }
-        array_push ($this->entryArray, new Entry (localize ("customize.style"), "",
+        array_push($this->entryArray, new Entry(localize("customize.style"), "",
                                         $content, "text",
-                                        array ()));
-        if (!useServerSideRendering ()) {
-            $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked ("use_fancyapps") . ' />';
-            array_push ($this->entryArray, new Entry (localize ("customize.fancybox"), "",
+                                        array()));
+        if (!useServerSideRendering()) {
+            $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked("use_fancyapps") . ' />';
+            array_push($this->entryArray, new Entry(localize("customize.fancybox"), "",
                                             $content, "text",
-                                            array ()));
+                                            array()));
         }
-        $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption ("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />';
-        array_push ($this->entryArray, new Entry (localize ("customize.paging"), "",
+        $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />';
+        array_push($this->entryArray, new Entry(localize("customize.paging"), "",
                                         $content, "text",
-                                        array ()));
-        $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption ("email") . '" />';
-        array_push ($this->entryArray, new Entry (localize ("customize.email"), "",
+                                        array()));
+        $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption("email") . '" />';
+        array_push($this->entryArray, new Entry(localize("customize.email"), "",
                                         $content, "text",
-                                        array ()));
-        $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked ("html_tag_filter") . ' />';
-        array_push ($this->entryArray, new Entry (localize ("customize.filter"), "",
+                                        array()));
+        $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked("html_tag_filter") . ' />';
+        array_push($this->entryArray, new Entry(localize("customize.filter"), "",
                                         $content, "text",
-                                        array ()));
+                                        array()));
         $content = "";
         foreach ($ignoredBaseArray as $key) {
-            $keyPlural = preg_replace ('/(ss)$/', 's', $key . "s");
-            $content .=  '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked ("ignored_categories", $key) . ' > ' . localize ("{$keyPlural}.title") . '</input> ';
+            $keyPlural = preg_replace('/(ss)$/', 's', $key . "s");
+            $content .= '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked("ignored_categories", $key) . ' > ' . localize("{$keyPlural}.title") . '</input> ';
         }
 
-        array_push ($this->entryArray, new Entry (localize ("customize.ignored"), "",
+        array_push($this->entryArray, new Entry(localize("customize.ignored"), "",
                                         $content, "text",
-                                        array ()));
+                                        array()));
     }
 }
 
@@ -1167,142 +1167,142 @@ 
 
     private static $db = NULL;
 
-    public static function isMultipleDatabaseEnabled () {
+    public static function isMultipleDatabaseEnabled() {
         global $config;
-        return is_array ($config['calibre_directory']);
+        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:
+        return preg_match('/^\//', $path) || // Linux /
+               preg_match('/^\w\:/', $path); // Windows X:
     }
 
-    public static function noDatabaseSelected () {
-        return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB));
+    public static function noDatabaseSelected() {
+        return self::isMultipleDatabaseEnabled() && is_null(GetUrlParam(DB));
     }
 
-    public static function getDbList () {
+    public static function getDbList() {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
+        if (self::isMultipleDatabaseEnabled()) {
             return $config['calibre_directory'];
         } else {
-            return array ("" => $config['calibre_directory']);
+            return array("" => $config['calibre_directory']);
         }
     }
 
-    public static function getDbNameList () {
+    public static function getDbNameList() {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
-            return array_keys ($config['calibre_directory']);
+        if (self::isMultipleDatabaseEnabled()) {
+            return array_keys($config['calibre_directory']);
         } else {
-            return array ("");
+            return array("");
         }
     }
 
-    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 (self::isMultipleDatabaseEnabled()) {
+            if (is_null($database)) $database = GetUrlParam(DB, 0);
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
-                return self::error ($database);
+                return self::error($database);
             }
-            $array = array_keys ($config['calibre_directory']);
+            $array = array_keys($config['calibre_directory']);
             return  $array[$database];
         }
         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 (self::isMultipleDatabaseEnabled()) {
+            if (is_null($database)) $database = GetUrlParam(DB, 0);
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
-                return self::error ($database);
+                return self::error($database);
             }
-            $array = array_values ($config['calibre_directory']);
+            $array = array_values($config['calibre_directory']);
             return  $array[$database];
         }
         return $config['calibre_directory'];
     }
 
 
-    public static function getDbFileName ($database = NULL) {
-        return self::getDbDirectory ($database) .'metadata.db';
+    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) {
-        if (is_null (self::$db)) {
+    public static function getDb($database = NULL) {
+        if (is_null(self::$db)) {
             try {
-                if (is_readable (self::getDbFileName ($database))) {
-                    self::$db = new PDO('sqlite:'. self::getDbFileName ($database));
-                    if (useNormAndUp ()) {
-                        self::$db->sqliteCreateFunction ('normAndUp', 'normAndUp', 1);
+                if (is_readable(self::getDbFileName($database))) {
+                    self::$db = new PDO('sqlite:' . self::getDbFileName($database));
+                    if (useNormAndUp()) {
+                        self::$db->sqliteCreateFunction('normAndUp', 'normAndUp', 1);
                     }
                 } else {
-                    self::error ($database);
+                    self::error($database);
                 }
             } catch (Exception $e) {
-                self::error ($database);
+                self::error($database);
             }
         }
         return self::$db;
     }
 
-    public static function checkDatabaseAvailability () {
-        if (self::noDatabaseSelected ()) {
-            for ($i = 0; $i < count (self::getDbList ()); $i++) {
-                self::getDb ($i);
-                self::clearDb ();
+    public static function checkDatabaseAvailability() {
+        if (self::noDatabaseSelected()) {
+            for ($i = 0; $i < count(self::getDbList()); $i++) {
+                self::getDb($i);
+                self::clearDb();
             }
         } else {
-            self::getDb ();
+            self::getDb();
         }
         return true;
     }
 
-    public static function clearDb () {
+    public static function clearDb() {
         self::$db = NULL;
     }
 
-    public static function executeQuerySingle ($query, $database = NULL) {
-        return self::getDb ($database)->query($query)->fetchColumn();
+    public static function executeQuerySingle($query, $database = NULL) {
+        return self::getDb($database)->query($query)->fetchColumn();
     }
 
     public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
         }
-        $count = self::executeQuerySingle ('select count(*) from ' . $table);
+        $count = self::executeQuerySingle('select count(*) from ' . $table);
         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);
+        $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) {
-        list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
+    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);
+            $instance = new $category($post);
             if (property_exists($post, "sort")) {
                 $title = $post->sort;
             } else {
                 $title = $post->name;
             }
-            array_push ($entryArray, new Entry ($title, $instance->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($instance->getUri ())), "", $post->count));
+            array_push($entryArray, new Entry($title, $instance->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($instance->getUri())), "", $post->count));
         }
         return $entryArray;
     }
@@ -1310,30 +1310,30 @@ 
     public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
         $totalResult = -1;
 
-        if (useNormAndUp ()) {
+        if (useNormAndUp()) {
             $query = preg_replace("/upper/", "normAndUp", $query);
             $columns = preg_replace("/upper/", "normAndUp", $columns);
         }
 
-        if (is_null ($numberPerPage)) {
-            $numberPerPage = getCurrentOption ("max_item_per_page");
+        if (is_null($numberPerPage)) {
+            $numberPerPage = getCurrentOption("max_item_per_page");
         }
 
         if ($numberPerPage != -1 && $n != -1)
         {
             // First check total number of results
-            $result = self::getDb ($database)->prepare (str_format ($query, "count(*)", $filter));
-            $result->execute ($params);
-            $totalResult = $result->fetchColumn ();
+            $result = self::getDb($database)->prepare(str_format($query, "count(*)", $filter));
+            $result->execute($params);
+            $totalResult = $result->fetchColumn();
 
             // Next modify the query and params
             $query .= " limit ?, ?";
-            array_push ($params, ($n - 1) * $numberPerPage, $numberPerPage);
+            array_push($params, ($n - 1) * $numberPerPage, $numberPerPage);
         }
 
-        $result = self::getDb ($database)->prepare(str_format ($query, $columns, $filter));
-        $result->execute ($params);
-        return array ($totalResult, $result);
+        $result = self::getDb($database)->prepare(str_format($query, $columns, $filter));
+        $result->execute($params);
+        return array($totalResult, $result);
     }
 
 }

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

Upper-Lower-Casing +32 added lines, -32 removed lines

@@ -36,14 +36,14 @@ 
     // If there is a syntax error in the function created
     // $dot will be equal to FALSE
     if (!$dot) {
-        return FALSE;
+        return false;
     }
     // Execute the template
     if (!empty ($data)) {
         return $dot ($data);
     }
 
-    return NULL;
+    return null;
 }
 
 function getQueryString () {
@@ -60,7 +60,7 @@ 
     $_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];
     }
@@ -109,10 +109,10 @@ 
 
     switch ($error->level) {
         case LIBXML_ERR_WARNING:
-            $return .= "Warning $error->code: ";
+            $return .= "warning $error->code: ";
             break;
          case LIBXML_ERR_ERROR:
-            $return .= "Error $error->code: ";
+            $return .= "error $error->code: ";
             break;
         case LIBXML_ERR_FATAL:
             $return .= "Fatal Error $error->code: ";
@@ -244,7 +244,7 @@ 
         $langs = getAcceptLanguages();
     }
     //echo var_dump($langs);
-    $lang_file = NULL;
+    $lang_file = null;
     foreach ($langs as $language => $val) {
         $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
@@ -273,13 +273,13 @@ 
         $phrase .= ".many";
 
     /* Static keyword is used to ensure the file is loaded only once */
-    static $translations = NULL;
+    static $translations = null;
     if ($reset) {
-        $translations = NULL;
+        $translations = null;
     }
     /* If no instance of $translations has occured load the language file */
     if (is_null($translations)) {
-        $lang_file_en = NULL;
+        $lang_file_en = null;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != "en") {
             $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
@@ -356,7 +356,7 @@ 
     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;
@@ -377,7 +377,7 @@ 
 
 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;
@@ -391,7 +391,7 @@ 
 
 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));
         $this->href = parent::getScriptName() . $this->href;
@@ -408,7 +408,7 @@ 
     public $linkArray;
     public $localUpdated;
     public $className;
-    private static $updated = NULL;
+    private static $updated = null;
 
     public static $icons = array(
         Author::ALL_AUTHORS_ID       => 'images/author.png',
@@ -640,7 +640,7 @@ 
         if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
             return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
         }
-        return NULL;
+        return null;
     }
 
     public function getPrevLink ()
@@ -649,7 +649,7 @@ 
         if ($this->n > 1) {
             return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
         }
-        return NULL;
+        return null;
     }
 
     public function getMaxPage ()
@@ -746,7 +746,7 @@ 
 {
     public function InitializeContent ()
     {
-        $customId = getURLParam ("custom", NULL);
+        $customId = getURLParam ("custom", null);
         $custom = CustomColumn::getCustomById ($customId, $this->idGet);
         $this->idPage = $custom->getEntryId ();
         $this->title = $custom->name;
@@ -758,7 +758,7 @@ 
 {
     public function InitializeContent ()
     {
-        $customId = getURLParam ("custom", NULL);
+        $customId = getURLParam ("custom", null);
         $this->title = CustomColumn::getAllTitle ($customId);
         $this->entryArray = CustomColumn::getAllCustoms($customId);
         $this->idPage = CustomColumn::getAllCustomsId ($customId);
@@ -882,9 +882,9 @@ 
         return !is_null (getURLParam ("search"));
     }
 
-    private function searchByScope ($scope, $limit = FALSE) {
+    private function searchByScope ($scope, $limit = false) {
         $n = $this->n;
-        $numberPerPage = NULL;
+        $numberPerPage = null;
         $queryNormedAndUp = $this->query;
         if (useNormAndUp ()) {
             $queryNormedAndUp = normAndUp ($this->query);
@@ -895,7 +895,7 @@ 
         }
         switch ($scope) {
             case self::SCOPE_BOOK :
-                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, null, $numberPerPage);
                 break;
             case self::SCOPE_AUTHOR :
                 $array = Author::getAuthorsForSearch ('%' . $queryNormedAndUp);
@@ -904,7 +904,7 @@ 
                 $array = Serie::getAllSeriesByQuery ($queryNormedAndUp);
                 break;
             case self::SCOPE_TAG :
-                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, null, $numberPerPage);
                 break;
             case self::SCOPE_PUBLISHER :
                 $array = Publisher::getAllPublishersByQuery ($queryNormedAndUp);
@@ -944,7 +944,7 @@ 
                 if (in_array($key, getCurrentOption ('ignored_categories'))) {
                     continue;
                 }
-                $array = $this->searchByScope ($key, TRUE);
+                $array = $this->searchByScope ($key, true);
 
                 $i = 0;
                 if (count ($array) == 2 && is_array ($array [0])) {
@@ -1165,7 +1165,7 @@ 
 
     const COMPATIBILITY_XML_ALDIKO = "aldiko";
 
-    private static $db = NULL;
+    private static $db = null;
 
     public static function isMultipleDatabaseEnabled () {
         global $config;
@@ -1201,7 +1201,7 @@ 
         }
     }
 
-    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);
@@ -1214,7 +1214,7 @@ 
         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);
@@ -1228,7 +1228,7 @@ 
     }
 
 
-    public static function getDbFileName ($database = NULL) {
+    public static function getDbFileName ($database = null) {
         return self::getDbDirectory ($database) .'metadata.db';
     }
 
@@ -1239,7 +1239,7 @@ 
         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))) {
@@ -1270,19 +1270,19 @@ 
     }
 
     public static function clearDb () {
-        self::$db = NULL;
+        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);
@@ -1307,7 +1307,7 @@ 
         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 ()) {

book.php

Doc Comments +13 added lines

@@ -287,6 +287,9 @@ 
         return reset ($reduced);
     }
 
+    /**
+     * @param string $extension
+     */
     public function getFilePath ($extension, $idData = NULL, $relative = false)
     {
         if ($extension == "jpg")
@@ -419,6 +422,9 @@ 
             $this->getLinkArray (), $this);
     }
 
+    /**
+     * @param integer $database
+     */
     public static function getBookCount($database = NULL) {
         return parent::executeQuerySingle ('select count(*) from books', $database);
     }
@@ -500,6 +506,10 @@ 
         return NULL;
     }
 
+    /**
+     * @param integer $database
+     * @param integer $numberPerPage
+     */
     public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
         $i = 0;
         $critArray = array ();
@@ -544,6 +554,9 @@ 
         return $entryArray;
     }
 
+    /**
+     * @param integer $numberPerPage
+     */
     public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
         return self::getEntryArray (self::SQL_BOOKS_BY_FIRST_LETTER, array ($letter . "%"), $n, $database, $numberPerPage);
     }

Indentation +6 added lines, -6 removed lines

@@ -428,15 +428,15 @@
         $nBooks = parent::executeQuerySingle ('select count(*) from books');
         $result = array();
         $entry = new Entry (localize ("allbooks.title"),
-                          self::ALL_BOOKS_ID,
-                          str_format (localize ("allbooks.alphabetical", $nBooks), $nBooks), "text",
-                          array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS)), "", $nBooks);
+                            self::ALL_BOOKS_ID,
+                            str_format (localize ("allbooks.alphabetical", $nBooks), $nBooks), "text",
+                            array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS)), "", $nBooks);
         array_push ($result, $entry);
         if ($config['cops_recentbooks_limit'] > 0) {
             $entry = new Entry (localize ("recent.title"),
-                              self::ALL_RECENT_BOOKS_ID,
-                              str_format (localize ("recent.list"), $config['cops_recentbooks_limit']), "text",
-                              array ( new LinkNavigation ("?page=".parent::PAGE_ALL_RECENT_BOOKS)), "", $config['cops_recentbooks_limit']);
+                                self::ALL_RECENT_BOOKS_ID,
+                                str_format (localize ("recent.list"), $config['cops_recentbooks_limit']), "text",
+                                array ( new LinkNavigation ("?page=".parent::PAGE_ALL_RECENT_BOOKS)), "", $config['cops_recentbooks_limit']);
             array_push ($result, $entry);
         }
         return $result;

Spacing +179 added lines, -179 removed lines

@@ -7,35 +7,35 @@ 
  */
 
 // Silly thing because PHP forbid string concatenation in class const
-define ('SQL_BOOKS_LEFT_JOIN', "left outer join comments on comments.book = books.id
+define('SQL_BOOKS_LEFT_JOIN', "left outer join comments on comments.book = books.id
                                 left outer join books_ratings_link on books_ratings_link.book = books.id
                                 left outer join ratings on books_ratings_link.rating = ratings.id ");
-define ('SQL_BOOKS_ALL', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . " order by books.sort ");
-define ('SQL_BOOKS_BY_PUBLISHER', "select {0} from books_publishers_link, books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_ALL', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . " order by books.sort ");
+define('SQL_BOOKS_BY_PUBLISHER', "select {0} from books_publishers_link, books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where books_publishers_link.book = books.id and publisher = ? {1} order by publisher");
-define ('SQL_BOOKS_BY_FIRST_LETTER', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_BY_FIRST_LETTER', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where upper (books.sort) like ? order by books.sort");
-define ('SQL_BOOKS_BY_AUTHOR', "select {0} from books_authors_link, books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_BY_AUTHOR', "select {0} from books_authors_link, books " . SQL_BOOKS_LEFT_JOIN . "
                                                     left outer join books_series_link on books_series_link.book = books.id
                                                     where books_authors_link.book = books.id and author = ? {1} order by series desc, series_index asc, pubdate asc");
-define ('SQL_BOOKS_BY_SERIE', "select {0} from books_series_link, books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_BY_SERIE', "select {0} from books_series_link, books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where books_series_link.book = books.id and series = ? {1} order by series_index");
-define ('SQL_BOOKS_BY_TAG', "select {0} from books_tags_link, books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_BY_TAG', "select {0} from books_tags_link, books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where books_tags_link.book = books.id and tag = ? {1} order by sort");
-define ('SQL_BOOKS_BY_LANGUAGE', "select {0} from books_languages_link, books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_BY_LANGUAGE', "select {0} from books_languages_link, books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where books_languages_link.book = books.id and lang_code = ? {1} order by sort");
-define ('SQL_BOOKS_BY_CUSTOM', "select {0} from {2}, books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_BY_CUSTOM', "select {0} from {2}, books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where {2}.book = books.id and {2}.{3} = ? {1} order by sort");
-define ('SQL_BOOKS_QUERY', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_QUERY', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where (
                                                     exists (select null from authors, books_authors_link where book = books.id and author = authors.id and authors.name like ?) or
                                                     exists (select null from tags, books_tags_link where book = books.id and tag = tags.id and tags.name like ?) or
                                                     exists (select null from series, books_series_link on book = books.id and books_series_link.series = series.id and series.name like ?) or
                                                     exists (select null from publishers, books_publishers_link where book = books.id and books_publishers_link.publisher = publishers.id and publishers.name like ?) or
                                                     title like ?) {1} order by books.sort");
-define ('SQL_BOOKS_RECENT', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_RECENT', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where 1=1 {1} order by timestamp desc limit ");
-define ('SQL_BOOKS_BY_RATING', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
+define('SQL_BOOKS_BY_RATING', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where books_ratings_link.book = books.id and ratings.id = ? {1} order by sort");
 
 class Book extends Base {
@@ -76,133 +76,133 @@ 
     public $serie = NULL;
     public $tags = NULL;
     public $languages = NULL;
-    public $format = array ();
+    public $format = array();
 
 
     public function __construct($line) {
         $this->id = $line->id;
         $this->title = $line->title;
-        $this->timestamp = strtotime ($line->timestamp);
+        $this->timestamp = strtotime($line->timestamp);
         $this->pubdate = $line->pubdate;
-        $this->path = Base::getDbDirectory () . $line->path;
+        $this->path = Base::getDbDirectory() . $line->path;
         $this->relativePath = $line->path;
         $this->seriesIndex = $line->series_index;
         $this->comment = $line->comment;
         $this->uuid = $line->uuid;
         $this->hasCover = $line->has_cover;
-        if (!file_exists ($this->getFilePath ("jpg"))) {
+        if (!file_exists($this->getFilePath("jpg"))) {
             // double check
             $this->hasCover = 0;
         }
         $this->rating = $line->rating;
     }
 
-    public function getEntryId () {
-        return self::ALL_BOOKS_UUID.":".$this->uuid;
+    public function getEntryId() {
+        return self::ALL_BOOKS_UUID . ":" . $this->uuid;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
-        return self::ALL_BOOKS_ID.":letter:".$startingLetter;
+    public static function getEntryIdByLetter($startingLetter) {
+        return self::ALL_BOOKS_ID . ":letter:" . $startingLetter;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_BOOK_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_BOOK_DETAIL . "&id=$this->id";
     }
 
-    public function getDetailUrl () {
-        $urlParam = $this->getUri ();
-        if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+    public function getDetailUrl() {
+        $urlParam = $this->getUri();
+        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam(DB));
         return 'index.php' . $urlParam;
     }
 
-    public function getTitle () {
+    public function getTitle() {
         return $this->title;
     }
 
     /* Other class (author, series, tag, ...) initialization and accessors */
 
-    public function getAuthors () {
-        if (is_null ($this->authors)) {
-            $this->authors = Author::getAuthorByBookId ($this->id);
+    public function getAuthors() {
+        if (is_null($this->authors)) {
+            $this->authors = Author::getAuthorByBookId($this->id);
         }
         return $this->authors;
     }
 
-    public function getAuthorsName () {
-        return implode (", ", array_map (function ($author) { return $author->name; }, $this->getAuthors ()));
+    public function getAuthorsName() {
+        return implode(", ", array_map(function($author) { return $author->name; }, $this->getAuthors()));
     }
 
-    public function getAuthorsSort () {
-        return implode (", ", array_map (function ($author) { return $author->sort; }, $this->getAuthors ()));
+    public function getAuthorsSort() {
+        return implode(", ", array_map(function($author) { return $author->sort; }, $this->getAuthors()));
     }
 
-    public function getPublisher () {
-        if (is_null ($this->publisher)) {
-            $this->publisher = Publisher::getPublisherByBookId ($this->id);
+    public function getPublisher() {
+        if (is_null($this->publisher)) {
+            $this->publisher = Publisher::getPublisherByBookId($this->id);
         }
         return $this->publisher;
     }
 
-    public function getSerie () {
-        if (is_null ($this->serie)) {
-            $this->serie = Serie::getSerieByBookId ($this->id);
+    public function getSerie() {
+        if (is_null($this->serie)) {
+            $this->serie = Serie::getSerieByBookId($this->id);
         }
         return $this->serie;
     }
 
-    public function getLanguages () {
-        $lang = array ();
-        $result = parent::getDb ()->prepare('select languages.lang_code
+    public function getLanguages() {
+        $lang = array();
+        $result = parent::getDb()->prepare('select languages.lang_code
                 from books_languages_link, languages
                 where books_languages_link.lang_code = languages.id
                 and book = ?
                 order by item_order');
-        $result->execute (array ($this->id));
-        while ($post = $result->fetchObject ())
+        $result->execute(array($this->id));
+        while ($post = $result->fetchObject())
         {
-            array_push ($lang, Language::getLanguageString($post->lang_code));
+            array_push($lang, Language::getLanguageString($post->lang_code));
         }
-        return implode (", ", $lang);
+        return implode(", ", $lang);
     }
 
-    public function getTags () {
-        if (is_null ($this->tags)) {
-            $this->tags = array ();
+    public function getTags() {
+        if (is_null($this->tags)) {
+            $this->tags = array();
 
-            $result = parent::getDb ()->prepare('select tags.id as id, name
+            $result = parent::getDb()->prepare('select tags.id as id, name
                 from books_tags_link, tags
                 where tag = tags.id
                 and book = ?
                 order by name');
-            $result->execute (array ($this->id));
-            while ($post = $result->fetchObject ())
+            $result->execute(array($this->id));
+            while ($post = $result->fetchObject())
             {
-                array_push ($this->tags, new Tag ($post));
+                array_push($this->tags, new Tag($post));
             }
         }
         return $this->tags;
     }
 
-    public function getTagsName () {
-        return implode (", ", array_map (function ($tag) { return $tag->name; }, $this->getTags ()));
+    public function getTagsName() {
+        return implode(", ", array_map(function($tag) { return $tag->name; }, $this->getTags()));
     }
 
-    public function getDatas ()
+    public function getDatas()
     {
-        if (is_null ($this->datas)) {
-            $this->datas = Data::getDataByBook ($this);
+        if (is_null($this->datas)) {
+            $this->datas = Data::getDataByBook($this);
         }
         return $this->datas;
     }
 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
-    public static function getFilterString () {
-        $filter = getURLParam ("tag", NULL);
+    public static function getFilterString() {
+        $filter = getURLParam("tag", NULL);
         if (empty ($filter)) return "";
 
         $exists = true;
-        if (preg_match ("/^!(.*)$/", $filter, $matches)) {
+        if (preg_match("/^!(.*)$/", $filter, $matches)) {
             $exists = false;
             $filter = $matches[1];
         }
@@ -216,13 +216,13 @@ 
         return "and " . $result;
     }
 
-    public function GetMostInterestingDataToSendToKindle ()
+    public function GetMostInterestingDataToSendToKindle()
     {
-        $bestFormatForKindle = array ("EPUB", "PDF", "AZW3", "MOBI");
+        $bestFormatForKindle = array("EPUB", "PDF", "AZW3", "MOBI");
         $bestRank = -1;
         $bestData = NULL;
-        foreach ($this->getDatas () as $data) {
-            $key = array_search ($data->format, $bestFormatForKindle);
+        foreach ($this->getDatas() as $data) {
+            $key = array_search($data->format, $bestFormatForKindle);
             if ($key !== false && $key > $bestRank) {
                 $bestRank = $key;
                 $bestData = $data;
@@ -231,16 +231,16 @@ 
         return $bestData;
     }
 
-    public function getDataById ($idData)
+    public function getDataById($idData)
     {
-        $reduced = array_filter ($this->getDatas (), function ($data) use ($idData) {
+        $reduced = array_filter($this->getDatas(), function($data) use ($idData) {
             return $data->id == $idData;
         });
-        return reset ($reduced);
+        return reset($reduced);
     }
 
-    public function getRating () {
-        if (is_null ($this->rating) || $this->rating == 0) {
+    public function getRating() {
+        if (is_null($this->rating) || $this->rating == 0) {
             return "";
         }
         $retour = "";
@@ -253,41 +253,41 @@ 
         return $retour;
     }
 
-    public function getPubDate () {
+    public function getPubDate() {
         if (empty ($this->pubdate)) {
             return "";
         }
-        $dateY = (int) substr($this->pubdate, 0, 4);
+        $dateY = (int)substr($this->pubdate, 0, 4);
         if ($dateY > 102) {
             return str_pad($dateY, 4, "0", STR_PAD_LEFT);
         }
         return "";
     }
 
-    public function getComment ($withSerie = true) {
+    public function getComment($withSerie = true) {
         $addition = "";
-        $se = $this->getSerie ();
-        if (!is_null ($se) && $withSerie) {
-            $addition = $addition . "<strong>" . localize("content.series") . "</strong>" . str_format (localize ("content.series.data"), $this->seriesIndex, htmlspecialchars ($se->name)) . "<br />\n";
+        $se = $this->getSerie();
+        if (!is_null($se) && $withSerie) {
+            $addition = $addition . "<strong>" . localize("content.series") . "</strong>" . str_format(localize("content.series.data"), $this->seriesIndex, htmlspecialchars($se->name)) . "<br />\n";
         }
-        if (preg_match ("/<\/(div|p|a|span)>/", $this->comment))
+        if (preg_match("/<\/(div|p|a|span)>/", $this->comment))
         {
-            return $addition . html2xhtml ($this->comment);
+            return $addition . html2xhtml($this->comment);
         }
         else
         {
-            return $addition . htmlspecialchars ($this->comment);
+            return $addition . htmlspecialchars($this->comment);
         }
     }
 
-    public function getDataFormat ($format) {
-        $reduced = array_filter ($this->getDatas (), function ($data) use ($format) {
+    public function getDataFormat($format) {
+        $reduced = array_filter($this->getDatas(), function($data) use ($format) {
             return $data->format == $format;
         });
-        return reset ($reduced);
+        return reset($reduced);
     }
 
-    public function getFilePath ($extension, $idData = NULL, $relative = false)
+    public function getFilePath($extension, $idData = NULL, $relative = false)
     {
         if ($extension == "jpg")
         {
@@ -295,50 +295,50 @@ 
         }
         else
         {
-            $data = $this->getDataById ($idData);
+            $data = $this->getDataById($idData);
             if (!$data) return NULL;
-            $file = $data->name . "." . strtolower ($data->format);
+            $file = $data->name . "." . strtolower($data->format);
         }
 
         if ($relative)
         {
-            return $this->relativePath."/".$file;
+            return $this->relativePath . "/" . $file;
         }
         else
         {
-            return $this->path."/".$file;
+            return $this->path . "/" . $file;
         }
     }
 
-    public function getUpdatedEpub ($idData)
+    public function getUpdatedEpub($idData)
     {
         global $config;
-        $data = $this->getDataById ($idData);
+        $data = $this->getDataById($idData);
 
         try
         {
-            $epub = new EPub ($data->getLocalPath ());
+            $epub = new EPub($data->getLocalPath());
 
-            $epub->Title ($this->title);
-            $authorArray = array ();
+            $epub->Title($this->title);
+            $authorArray = array();
             foreach ($this->getAuthors() as $author) {
                 $authorArray [$author->sort] = $author->name;
             }
-            $epub->Authors ($authorArray);
-            $epub->Language ($this->getLanguages ());
-            $epub->Description ($this->getComment (false));
-            $epub->Subjects ($this->getTagsName ());
-            $epub->Cover2 ($this->getFilePath ("jpg"), "image/jpeg");
-            $epub->Calibre ($this->uuid);
-            $se = $this->getSerie ();
-            if (!is_null ($se)) {
-                $epub->Serie ($se->name);
-                $epub->SerieIndex ($this->seriesIndex);
+            $epub->Authors($authorArray);
+            $epub->Language($this->getLanguages());
+            $epub->Description($this->getComment(false));
+            $epub->Subjects($this->getTagsName());
+            $epub->Cover2($this->getFilePath("jpg"), "image/jpeg");
+            $epub->Calibre($this->uuid);
+            $se = $this->getSerie();
+            if (!is_null($se)) {
+                $epub->Serie($se->name);
+                $epub->SerieIndex($this->seriesIndex);
             }
-            if ($config['cops_provide_kepub'] == "1"  && preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) {
-                $epub->updateForKepub ();
+            if ($config['cops_provide_kepub'] == "1" && preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) {
+                $epub->updateForKepub();
             }
-            $epub->download ($data->getUpdatedFilenameEpub ());
+            $epub->download($data->getUpdatedFilenameEpub());
         }
         catch (Exception $e)
         {
@@ -346,25 +346,25 @@ 
         }
     }
 
-    public function getThumbnail ($width, $height, $outputfile = NULL) {
-        if (is_null ($width) && is_null ($height)) {
+    public function getThumbnail($width, $height, $outputfile = NULL) {
+        if (is_null($width) && is_null($height)) {
             return false;
         }
 
-        $file = $this->getFilePath ("jpg");
+        $file = $this->getFilePath("jpg");
         // get image size
         if ($size = GetImageSize($file)) {
             $w = $size[0];
             $h = $size[1];
             //set new size
-            if (!is_null ($width)) {
+            if (!is_null($width)) {
                 $nw = $width;
                 if ($nw >= $w) { return false; }
-                $nh = ($nw*$h)/$w;
+                $nh = ($nw * $h) / $w;
             } else {
                 $nh = $height;
                 if ($nh >= $h) { return false; }
-                $nw = ($nh*$w)/$h;
+                $nw = ($nh * $w) / $h;
             }
         } else {
             return false;
@@ -372,129 +372,129 @@ 
 
         //draw the image
         $src_img = imagecreatefromjpeg($file);
-        $dst_img = imagecreatetruecolor($nw,$nh);
-        imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h);//resizing the image
-        imagejpeg($dst_img,$outputfile,80);
+        $dst_img = imagecreatetruecolor($nw, $nh);
+        imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h); //resizing the image
+        imagejpeg($dst_img, $outputfile, 80);
         imagedestroy($src_img);
         imagedestroy($dst_img);
 
         return true;
     }
 
-    public function getLinkArray ()
+    public function getLinkArray()
     {
         $linkArray = array();
 
         if ($this->hasCover)
         {
-            array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL));
+            array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL));
 
-            array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
+            array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
         }
 
-        foreach ($this->getDatas () as $data)
+        foreach ($this->getDatas() as $data)
         {
-            if ($data->isKnownType ())
+            if ($data->isKnownType())
             {
-                array_push ($linkArray, $data->getDataLink (Link::OPDS_ACQUISITION_TYPE, $data->format));
+                array_push($linkArray, $data->getDataLink(Link::OPDS_ACQUISITION_TYPE, $data->format));
             }
         }
 
-        foreach ($this->getAuthors () as $author) {
-            array_push ($linkArray, new LinkNavigation ($author->getUri (), "related", str_format (localize ("bookentry.author"), localize ("splitByLetter.book.other"), $author->name)));
+        foreach ($this->getAuthors() as $author) {
+            array_push($linkArray, new LinkNavigation($author->getUri(), "related", str_format(localize("bookentry.author"), localize("splitByLetter.book.other"), $author->name)));
         }
 
-        $serie = $this->getSerie ();
-        if (!is_null ($serie)) {
-            array_push ($linkArray, new LinkNavigation ($serie->getUri (), "related", str_format (localize ("content.series.data"), $this->seriesIndex, $serie->name)));
+        $serie = $this->getSerie();
+        if (!is_null($serie)) {
+            array_push($linkArray, new LinkNavigation($serie->getUri(), "related", str_format(localize("content.series.data"), $this->seriesIndex, $serie->name)));
         }
 
         return $linkArray;
     }
 
 
-    public function getEntry () {
-        return new EntryBook ($this->getTitle (), $this->getEntryId (),
-            $this->getComment (), "text/html",
-            $this->getLinkArray (), $this);
+    public function getEntry() {
+        return new EntryBook($this->getTitle(), $this->getEntryId(),
+            $this->getComment(), "text/html",
+            $this->getLinkArray(), $this);
     }
 
     public static function getBookCount($database = NULL) {
-        return parent::executeQuerySingle ('select count(*) from books', $database);
+        return parent::executeQuerySingle('select count(*) from books', $database);
     }
 
     public static function getCount() {
         global $config;
-        $nBooks = parent::executeQuerySingle ('select count(*) from books');
+        $nBooks = parent::executeQuerySingle('select count(*) from books');
         $result = array();
-        $entry = new Entry (localize ("allbooks.title"),
+        $entry = new Entry(localize("allbooks.title"),
                           self::ALL_BOOKS_ID,
-                          str_format (localize ("allbooks.alphabetical", $nBooks), $nBooks), "text",
-                          array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS)), "", $nBooks);
-        array_push ($result, $entry);
+                          str_format(localize("allbooks.alphabetical", $nBooks), $nBooks), "text",
+                          array(new LinkNavigation("?page=" . parent::PAGE_ALL_BOOKS)), "", $nBooks);
+        array_push($result, $entry);
         if ($config['cops_recentbooks_limit'] > 0) {
-            $entry = new Entry (localize ("recent.title"),
+            $entry = new Entry(localize("recent.title"),
                               self::ALL_RECENT_BOOKS_ID,
-                              str_format (localize ("recent.list"), $config['cops_recentbooks_limit']), "text",
-                              array ( new LinkNavigation ("?page=".parent::PAGE_ALL_RECENT_BOOKS)), "", $config['cops_recentbooks_limit']);
-            array_push ($result, $entry);
+                              str_format(localize("recent.list"), $config['cops_recentbooks_limit']), "text",
+                              array(new LinkNavigation("?page=" . parent::PAGE_ALL_RECENT_BOOKS)), "", $config['cops_recentbooks_limit']);
+            array_push($result, $entry);
         }
         return $result;
     }
 
     public static function getBooksByAuthor($authorId, $n) {
-        return self::getEntryArray (self::SQL_BOOKS_BY_AUTHOR, array ($authorId), $n);
+        return self::getEntryArray(self::SQL_BOOKS_BY_AUTHOR, array($authorId), $n);
     }
 
     public static function getBooksByRating($ratingId, $n) {
-        return self::getEntryArray (self::SQL_BOOKS_BY_RATING, array ($ratingId), $n);
+        return self::getEntryArray(self::SQL_BOOKS_BY_RATING, array($ratingId), $n);
     }
 
     public static function getBooksByPublisher($publisherId, $n) {
-        return self::getEntryArray (self::SQL_BOOKS_BY_PUBLISHER, array ($publisherId), $n);
+        return self::getEntryArray(self::SQL_BOOKS_BY_PUBLISHER, array($publisherId), $n);
     }
 
     public static function getBooksBySeries($serieId, $n) {
-        return self::getEntryArray (self::SQL_BOOKS_BY_SERIE, array ($serieId), $n);
+        return self::getEntryArray(self::SQL_BOOKS_BY_SERIE, array($serieId), $n);
     }
 
     public static function getBooksByTag($tagId, $n) {
-        return self::getEntryArray (self::SQL_BOOKS_BY_TAG, array ($tagId), $n);
+        return self::getEntryArray(self::SQL_BOOKS_BY_TAG, array($tagId), $n);
     }
 
     public static function getBooksByLanguage($languageId, $n) {
-        return self::getEntryArray (self::SQL_BOOKS_BY_LANGUAGE, array ($languageId), $n);
+        return self::getEntryArray(self::SQL_BOOKS_BY_LANGUAGE, array($languageId), $n);
     }
 
     public static function getBooksByCustom($customId, $id, $n) {
-        $query = str_format (self::SQL_BOOKS_BY_CUSTOM, "{0}", "{1}", CustomColumn::getTableLinkName ($customId), CustomColumn::getTableLinkColumn ($customId));
-        return self::getEntryArray ($query, array ($id), $n);
+        $query = str_format(self::SQL_BOOKS_BY_CUSTOM, "{0}", "{1}", CustomColumn::getTableLinkName($customId), CustomColumn::getTableLinkColumn($customId));
+        return self::getEntryArray($query, array($id), $n);
     }
 
     public static function getBookById($bookId) {
-        $result = parent::getDb ()->prepare('select ' . self::BOOK_COLUMNS . '
+        $result = parent::getDb()->prepare('select ' . self::BOOK_COLUMNS . '
 from books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where books.id = ?');
-        $result->execute (array ($bookId));
-        while ($post = $result->fetchObject ())
+        $result->execute(array($bookId));
+        while ($post = $result->fetchObject())
         {
-            $book = new Book ($post);
+            $book = new Book($post);
             return $book;
         }
         return NULL;
     }
 
     public static function getBookByDataId($dataId) {
-        $result = parent::getDb ()->prepare('select ' . self::BOOK_COLUMNS . ', data.name, data.format
+        $result = parent::getDb()->prepare('select ' . self::BOOK_COLUMNS . ', data.name, data.format
 from data, books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where data.book = books.id and data.id = ?');
-        $result->execute (array ($dataId));
-        while ($post = $result->fetchObject ())
+        $result->execute(array($dataId));
+        while ($post = $result->fetchObject())
         {
-            $book = new Book ($post);
-            $data = new Data ($post, $book);
+            $book = new Book($post);
+            $data = new Data($post, $book);
             $data->id = $dataId;
-            $book->datas = array ($data);
+            $book->datas = array($data);
             return $book;
         }
         return NULL;
@@ -502,18 +502,18 @@ 
 
     public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
         $i = 0;
-        $critArray = array ();
-        foreach (array (PageQueryResult::SCOPE_AUTHOR,
+        $critArray = array();
+        foreach (array(PageQueryResult::SCOPE_AUTHOR,
                         PageQueryResult::SCOPE_TAG,
                         PageQueryResult::SCOPE_SERIES,
                         PageQueryResult::SCOPE_PUBLISHER,
                         PageQueryResult::SCOPE_BOOK) as $key) {
-            if (in_array($key, getCurrentOption ('ignored_categories')) ||
-                (!array_key_exists ($key, $query) && !array_key_exists ("all", $query))) {
+            if (in_array($key, getCurrentOption('ignored_categories')) ||
+                (!array_key_exists($key, $query) && !array_key_exists("all", $query))) {
                 $critArray [$i] = self::BAD_SEARCH;
             }
             else {
-                if (array_key_exists ($key, $query)) {
+                if (array_key_exists($key, $query)) {
                     $critArray [$i] = $query [$key];
                 } else {
                     $critArray [$i] = $query ["all"];
@@ -521,48 +521,48 @@ 
             }
             $i++;
         }
-        return self::getEntryArray (self::SQL_BOOKS_QUERY, $critArray, $n, $database, $numberPerPage);
+        return self::getEntryArray(self::SQL_BOOKS_QUERY, $critArray, $n, $database, $numberPerPage);
     }
 
     public static function getBooks($n) {
-        list ($entryArray, $totalNumber) = self::getEntryArray (self::SQL_BOOKS_ALL , array (), $n);
-        return array ($entryArray, $totalNumber);
+        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL, array(), $n);
+        return array($entryArray, $totalNumber);
     }
 
     public static function getAllBooks() {
-        list (, $result) = parent::executeQuery ("select {0}
+        list (, $result) = parent::executeQuery("select {0}
 from books
 group by substr (upper (sort), 1, 1)
-order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", self::getFilterString (), array (), -1);
+order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", self::getFilterString(), array(), -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            array_push ($entryArray, new Entry ($post->title, Book::getEntryIdByLetter ($post->title),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
+            array_push($entryArray, new Entry($post->title, Book::getEntryIdByLetter($post->title),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation("?page=" . parent::PAGE_ALL_BOOKS_LETTER . "&id=" . rawurlencode($post->title))), "", $post->count));
         }
         return $entryArray;
     }
 
     public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
-        return self::getEntryArray (self::SQL_BOOKS_BY_FIRST_LETTER, array ($letter . "%"), $n, $database, $numberPerPage);
+        return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . "%"), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray ($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
-        list ($totalNumber, $result) = parent::executeQuery ($query, self::BOOK_COLUMNS, self::getFilterString (), $params, $n, $database, $numberPerPage);
+    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+        list ($totalNumber, $result) = parent::executeQuery($query, self::BOOK_COLUMNS, self::getFilterString(), $params, $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $book = new Book ($post);
-            array_push ($entryArray, $book->getEntry ());
+            $book = new Book($post);
+            array_push($entryArray, $book->getEntry());
         }
-        return array ($entryArray, $totalNumber);
+        return array($entryArray, $totalNumber);
     }
 
 
     public static function getAllRecentBooks() {
         global $config;
-        list ($entryArray, ) = self::getEntryArray (self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array (), -1);
+        list ($entryArray,) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
         return $entryArray;
     }
 

Braces +105 added lines, -82 removed lines

@@ -38,7 +38,8 @@ 
 define ('SQL_BOOKS_BY_RATING', "select {0} from books " . SQL_BOOKS_LEFT_JOIN . "
                                                     where books_ratings_link.book = books.id and ratings.id = ? {1} order by sort");
 
-class Book extends Base {
+class Book extends Base
+{
     const ALL_BOOKS_UUID = "urn:uuid";
     const ALL_BOOKS_ID = "cops:books";
     const ALL_RECENT_BOOKS_ID = "cops:recentbooks";
@@ -79,7 +80,8 @@ 
     public $format = array ();
 
 
-    public function __construct($line) {
+    public function __construct($line)
+    {
         $this->id = $line->id;
         $this->title = $line->title;
         $this->timestamp = strtotime ($line->timestamp);
@@ -97,60 +99,73 @@ 
         $this->rating = $line->rating;
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_BOOKS_UUID.":".$this->uuid;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
+    public static function getEntryIdByLetter ($startingLetter)
+    {
         return self::ALL_BOOKS_ID.":letter:".$startingLetter;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_BOOK_DETAIL."&id=$this->id";
     }
 
-    public function getDetailUrl () {
+    public function getDetailUrl ()
+    {
         $urlParam = $this->getUri ();
-        if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+        if (!is_null (GetUrlParam (DB))) {
+            $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+        }
         return 'index.php' . $urlParam;
     }
 
-    public function getTitle () {
+    public function getTitle ()
+    {
         return $this->title;
     }
 
     /* Other class (author, series, tag, ...) initialization and accessors */
 
-    public function getAuthors () {
+    public function getAuthors ()
+    {
         if (is_null ($this->authors)) {
             $this->authors = Author::getAuthorByBookId ($this->id);
         }
         return $this->authors;
     }
 
-    public function getAuthorsName () {
+    public function getAuthorsName ()
+    {
         return implode (", ", array_map (function ($author) { return $author->name; }, $this->getAuthors ()));
     }
 
-    public function getAuthorsSort () {
+    public function getAuthorsSort ()
+    {
         return implode (", ", array_map (function ($author) { return $author->sort; }, $this->getAuthors ()));
     }
 
-    public function getPublisher () {
+    public function getPublisher ()
+    {
         if (is_null ($this->publisher)) {
             $this->publisher = Publisher::getPublisherByBookId ($this->id);
         }
         return $this->publisher;
     }
 
-    public function getSerie () {
+    public function getSerie ()
+    {
         if (is_null ($this->serie)) {
             $this->serie = Serie::getSerieByBookId ($this->id);
         }
         return $this->serie;
     }
 
-    public function getLanguages () {
+    public function getLanguages ()
+    {
         $lang = array ();
         $result = parent::getDb ()->prepare('select languages.lang_code
                 from books_languages_link, languages
@@ -158,14 +173,14 @@ 
                 and book = ?
                 order by item_order');
         $result->execute (array ($this->id));
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             array_push ($lang, Language::getLanguageString($post->lang_code));
         }
         return implode (", ", $lang);
     }
 
-    public function getTags () {
+    public function getTags ()
+    {
         if (is_null ($this->tags)) {
             $this->tags = array ();
 
@@ -175,15 +190,15 @@ 
                 and book = ?
                 order by name');
             $result->execute (array ($this->id));
-            while ($post = $result->fetchObject ())
-            {
+            while ($post = $result->fetchObject ()) {
                 array_push ($this->tags, new Tag ($post));
             }
         }
         return $this->tags;
     }
 
-    public function getTagsName () {
+    public function getTagsName ()
+    {
         return implode (", ", array_map (function ($tag) { return $tag->name; }, $this->getTags ()));
     }
 
@@ -197,9 +212,12 @@ 
 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
-    public static function getFilterString () {
+    public static function getFilterString ()
+    {
         $filter = getURLParam ("tag", NULL);
-        if (empty ($filter)) return "";
+        if (empty ($filter)) {
+            return "";
+        }
 
         $exists = true;
         if (preg_match ("/^!(.*)$/", $filter, $matches)) {
@@ -239,7 +257,8 @@ 
         return reset ($reduced);
     }
 
-    public function getRating () {
+    public function getRating ()
+    {
         if (is_null ($this->rating) || $this->rating == 0) {
             return "";
         }
@@ -253,7 +272,8 @@ 
         return $retour;
     }
 
-    public function getPubDate () {
+    public function getPubDate ()
+    {
         if (empty ($this->pubdate)) {
             return "";
         }
@@ -264,23 +284,22 @@ 
         return "";
     }
 
-    public function getComment ($withSerie = true) {
+    public function getComment ($withSerie = true)
+    {
         $addition = "";
         $se = $this->getSerie ();
         if (!is_null ($se) && $withSerie) {
             $addition = $addition . "<strong>" . localize("content.series") . "</strong>" . str_format (localize ("content.series.data"), $this->seriesIndex, htmlspecialchars ($se->name)) . "<br />\n";
         }
-        if (preg_match ("/<\/(div|p|a|span)>/", $this->comment))
-        {
+        if (preg_match ("/<\/(div|p|a|span)>/", $this->comment)) {
             return $addition . html2xhtml ($this->comment);
-        }
-        else
-        {
+        } else {
             return $addition . htmlspecialchars ($this->comment);
         }
     }
 
-    public function getDataFormat ($format) {
+    public function getDataFormat ($format)
+    {
         $reduced = array_filter ($this->getDatas (), function ($data) use ($format) {
             return $data->format == $format;
         });
@@ -289,23 +308,19 @@ 
 
     public function getFilePath ($extension, $idData = NULL, $relative = false)
     {
-        if ($extension == "jpg")
-        {
+        if ($extension == "jpg") {
             $file = "cover.jpg";
-        }
-        else
-        {
+        } else {
             $data = $this->getDataById ($idData);
-            if (!$data) return NULL;
+            if (!$data) {
+                return NULL;
+            }
             $file = $data->name . "." . strtolower ($data->format);
         }
 
-        if ($relative)
-        {
+        if ($relative) {
             return $this->relativePath."/".$file;
-        }
-        else
-        {
+        } else {
             return $this->path."/".$file;
         }
     }
@@ -315,8 +330,7 @@ 
         global $config;
         $data = $this->getDataById ($idData);
 
-        try
-        {
+        try {
             $epub = new EPub ($data->getLocalPath ());
 
             $epub->Title ($this->title);
@@ -339,14 +353,13 @@ 
                 $epub->updateForKepub ();
             }
             $epub->download ($data->getUpdatedFilenameEpub ());
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             echo "Exception : " . $e->getMessage();
         }
     }
 
-    public function getThumbnail ($width, $height, $outputfile = NULL) {
+    public function getThumbnail ($width, $height, $outputfile = NULL)
+    {
         if (is_null ($width) && is_null ($height)) {
             return false;
         }
@@ -385,17 +398,14 @@ 
     {
         $linkArray = array();
 
-        if ($this->hasCover)
-        {
+        if ($this->hasCover) {
             array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL));
 
             array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
         }
 
-        foreach ($this->getDatas () as $data)
-        {
-            if ($data->isKnownType ())
-            {
+        foreach ($this->getDatas () as $data) {
+            if ($data->isKnownType ()) {
                 array_push ($linkArray, $data->getDataLink (Link::OPDS_ACQUISITION_TYPE, $data->format));
             }
         }
@@ -413,17 +423,20 @@ 
     }
 
 
-    public function getEntry () {
+    public function getEntry ()
+    {
         return new EntryBook ($this->getTitle (), $this->getEntryId (),
             $this->getComment (), "text/html",
             $this->getLinkArray (), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = NULL)
+    {
         return parent::executeQuerySingle ('select count(*) from books', $database);
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         global $config;
         $nBooks = parent::executeQuerySingle ('select count(*) from books');
         $result = array();
@@ -442,55 +455,62 @@ 
         return $result;
     }
 
-    public static function getBooksByAuthor($authorId, $n) {
+    public static function getBooksByAuthor($authorId, $n)
+    {
         return self::getEntryArray (self::SQL_BOOKS_BY_AUTHOR, array ($authorId), $n);
     }
 
-    public static function getBooksByRating($ratingId, $n) {
+    public static function getBooksByRating($ratingId, $n)
+    {
         return self::getEntryArray (self::SQL_BOOKS_BY_RATING, array ($ratingId), $n);
     }
 
-    public static function getBooksByPublisher($publisherId, $n) {
+    public static function getBooksByPublisher($publisherId, $n)
+    {
         return self::getEntryArray (self::SQL_BOOKS_BY_PUBLISHER, array ($publisherId), $n);
     }
 
-    public static function getBooksBySeries($serieId, $n) {
+    public static function getBooksBySeries($serieId, $n)
+    {
         return self::getEntryArray (self::SQL_BOOKS_BY_SERIE, array ($serieId), $n);
     }
 
-    public static function getBooksByTag($tagId, $n) {
+    public static function getBooksByTag($tagId, $n)
+    {
         return self::getEntryArray (self::SQL_BOOKS_BY_TAG, array ($tagId), $n);
     }
 
-    public static function getBooksByLanguage($languageId, $n) {
+    public static function getBooksByLanguage($languageId, $n)
+    {
         return self::getEntryArray (self::SQL_BOOKS_BY_LANGUAGE, array ($languageId), $n);
     }
 
-    public static function getBooksByCustom($customId, $id, $n) {
+    public static function getBooksByCustom($customId, $id, $n)
+    {
         $query = str_format (self::SQL_BOOKS_BY_CUSTOM, "{0}", "{1}", CustomColumn::getTableLinkName ($customId), CustomColumn::getTableLinkColumn ($customId));
         return self::getEntryArray ($query, array ($id), $n);
     }
 
-    public static function getBookById($bookId) {
+    public static function getBookById($bookId)
+    {
         $result = parent::getDb ()->prepare('select ' . self::BOOK_COLUMNS . '
 from books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where books.id = ?');
         $result->execute (array ($bookId));
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $book = new Book ($post);
             return $book;
         }
         return NULL;
     }
 
-    public static function getBookByDataId($dataId) {
+    public static function getBookByDataId($dataId)
+    {
         $result = parent::getDb ()->prepare('select ' . self::BOOK_COLUMNS . ', data.name, data.format
 from data, books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where data.book = books.id and data.id = ?');
         $result->execute (array ($dataId));
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $book = new Book ($post);
             $data = new Data ($post, $book);
             $data->id = $dataId;
@@ -500,7 +520,8 @@ 
         return NULL;
     }
 
-    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $i = 0;
         $critArray = array ();
         foreach (array (PageQueryResult::SCOPE_AUTHOR,
@@ -511,8 +532,7 @@ 
             if (in_array($key, getCurrentOption ('ignored_categories')) ||
                 (!array_key_exists ($key, $query) && !array_key_exists ("all", $query))) {
                 $critArray [$i] = self::BAD_SEARCH;
-            }
-            else {
+            } else {
                 if (array_key_exists ($key, $query)) {
                     $critArray [$i] = $query [$key];
                 } else {
@@ -524,19 +544,20 @@ 
         return self::getEntryArray (self::SQL_BOOKS_QUERY, $critArray, $n, $database, $numberPerPage);
     }
 
-    public static function getBooks($n) {
+    public static function getBooks($n)
+    {
         list ($entryArray, $totalNumber) = self::getEntryArray (self::SQL_BOOKS_ALL , array (), $n);
         return array ($entryArray, $totalNumber);
     }
 
-    public static function getAllBooks() {
+    public static function getAllBooks()
+    {
         list (, $result) = parent::executeQuery ("select {0}
 from books
 group by substr (upper (sort), 1, 1)
 order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", self::getFilterString (), array (), -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             array_push ($entryArray, new Entry ($post->title, Book::getEntryIdByLetter ($post->title),
                 str_format (localize("bookword", $post->count), $post->count), "text",
                 array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
@@ -544,15 +565,16 @@ 
         return $entryArray;
     }
 
-    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL)
+    {
         return self::getEntryArray (self::SQL_BOOKS_BY_FIRST_LETTER, array ($letter . "%"), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray ($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getEntryArray ($query, $params, $n, $database = NULL, $numberPerPage = NULL)
+    {
         list ($totalNumber, $result) = parent::executeQuery ($query, self::BOOK_COLUMNS, self::getFilterString (), $params, $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $book = new Book ($post);
             array_push ($entryArray, $book->getEntry ());
         }
@@ -560,7 +582,8 @@ 
     }
 
 
-    public static function getAllRecentBooks() {
+    public static function getAllRecentBooks()
+    {
         global $config;
         list ($entryArray, ) = self::getEntryArray (self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array (), -1);
         return $entryArray;

Upper-Lower-Casing +19 added lines, -19 removed lines

@@ -70,12 +70,12 @@ 
     public $seriesIndex;
     public $comment;
     public $rating;
-    public $datas = NULL;
-    public $authors = NULL;
-    public $publisher = NULL;
-    public $serie = NULL;
-    public $tags = NULL;
-    public $languages = NULL;
+    public $datas = null;
+    public $authors = null;
+    public $publisher = null;
+    public $serie = null;
+    public $tags = null;
+    public $languages = null;
     public $format = array ();
 
 
@@ -198,7 +198,7 @@ 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
     public static function getFilterString () {
-        $filter = getURLParam ("tag", NULL);
+        $filter = getURLParam ("tag", null);
         if (empty ($filter)) return "";
 
         $exists = true;
@@ -220,7 +220,7 @@ 
     {
         $bestFormatForKindle = array ("EPUB", "PDF", "AZW3", "MOBI");
         $bestRank = -1;
-        $bestData = NULL;
+        $bestData = null;
         foreach ($this->getDatas () as $data) {
             $key = array_search ($data->format, $bestFormatForKindle);
             if ($key !== false && $key > $bestRank) {
@@ -287,7 +287,7 @@ 
         return reset ($reduced);
     }
 
-    public function getFilePath ($extension, $idData = NULL, $relative = false)
+    public function getFilePath ($extension, $idData = null, $relative = false)
     {
         if ($extension == "jpg")
         {
@@ -296,7 +296,7 @@ 
         else
         {
             $data = $this->getDataById ($idData);
-            if (!$data) return NULL;
+            if (!$data) return null;
             $file = $data->name . "." . strtolower ($data->format);
         }
 
@@ -346,7 +346,7 @@ 
         }
     }
 
-    public function getThumbnail ($width, $height, $outputfile = NULL) {
+    public function getThumbnail ($width, $height, $outputfile = null) {
         if (is_null ($width) && is_null ($height)) {
             return false;
         }
@@ -387,9 +387,9 @@ 
 
         if ($this->hasCover)
         {
-            array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL));
+            array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", null));
 
-            array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
+            array_push ($linkArray, Data::getLink ($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", null));
         }
 
         foreach ($this->getDatas () as $data)
@@ -419,7 +419,7 @@ 
             $this->getLinkArray (), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = null) {
         return parent::executeQuerySingle ('select count(*) from books', $database);
     }
 
@@ -481,7 +481,7 @@ 
             $book = new Book ($post);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
     public static function getBookByDataId($dataId) {
@@ -497,10 +497,10 @@ 
             $book->datas = array ($data);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
-    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByQuery($query, $n, $database = null, $numberPerPage = null) {
         $i = 0;
         $critArray = array ();
         foreach (array (PageQueryResult::SCOPE_AUTHOR,
@@ -544,11 +544,11 @@ 
         return $entryArray;
     }
 
-    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByStartingLetter($letter, $n, $database = null, $numberPerPage = null) {
         return self::getEntryArray (self::SQL_BOOKS_BY_FIRST_LETTER, array ($letter . "%"), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray ($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getEntryArray ($query, $params, $n, $database = null, $numberPerPage = null) {
         list ($totalNumber, $result) = parent::executeQuery ($query, self::BOOK_COLUMNS, self::getFilterString (), $params, $n, $database, $numberPerPage);
         $entryArray = array();
         while ($post = $result->fetchObject ())

data.php

Doc Comments +10 added lines

@@ -141,6 +141,9 @@ 
         return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
+    /**
+     * @param Book $book
+     */
     public static function getDataByBook ($book) {
         $out = array ();
         $result = parent::getDb ()->prepare('select id, format, name
@@ -154,6 +157,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $urlParam
+     */
     public static function handleThumbnailLink ($urlParam, $height) {
         global $config;
 
@@ -173,6 +179,10 @@ 
         return $urlParam;
     }
 
+    /**
+     * @param string $type
+     * @param string $filename
+     */
     public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL)
     {
         global $config;

Spacing +42 added lines, -42 removed lines

@@ -58,25 +58,25 @@ 
         $this->id = $post->id;
         $this->name = $post->name;
         $this->format = $post->format;
-        $this->realFormat = str_replace ("ORIGINAL_", "", $post->format);
-        $this->extension = strtolower ($this->realFormat);
+        $this->realFormat = str_replace("ORIGINAL_", "", $post->format);
+        $this->extension = strtolower($this->realFormat);
         $this->book = $book;
     }
 
-    public function isKnownType () {
-        return array_key_exists ($this->extension, self::$mimetypes);
+    public function isKnownType() {
+        return array_key_exists($this->extension, self::$mimetypes);
     }
 
-    public function getMimeType () {
+    public function getMimeType() {
         $result = "application/octet-stream";
-        if ($this->isKnownType ()) {
+        if ($this->isKnownType()) {
             return self::$mimetypes [$this->extension];
         } elseif (function_exists('finfo_open') === true) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
             if (is_resource($finfo) === true)
             {
-                $result = finfo_file($finfo, $this->getLocalPath ());
+                $result = finfo_file($finfo, $this->getLocalPath());
             }
 
             finfo_close($finfo);
@@ -85,80 +85,80 @@ 
         return $result;
     }
 
-    public function isEpubValidOnKobo () {
+    public function isEpubValidOnKobo() {
         return $this->format == "EPUB" || $this->format == "KEPUB";
     }
 
-    public function getFilename () {
-        return $this->name . "." . strtolower ($this->format);
+    public function getFilename() {
+        return $this->name . "." . strtolower($this->format);
     }
 
-    public function getUpdatedFilename () {
-        return $this->book->getAuthorsSort () . " - " . $this->book->title;
+    public function getUpdatedFilename() {
+        return $this->book->getAuthorsSort() . " - " . $this->book->title;
     }
 
-    public function getUpdatedFilenameEpub () {
-        return $this->getUpdatedFilename () . ".epub";
+    public function getUpdatedFilenameEpub() {
+        return $this->getUpdatedFilename() . ".epub";
     }
 
-    public function getUpdatedFilenameKepub () {
-        return $this->getUpdatedFilename () . ".kepub.epub";
+    public function getUpdatedFilenameKepub() {
+        return $this->getUpdatedFilename() . ".kepub.epub";
     }
 
-    public function getDataLink ($rel, $title = NULL) {
+    public function getDataLink($rel, $title = NULL) {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
             return $this->getHtmlLinkWithRewriting($title);
         }
 
-        return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title);
+        return self::getLink($this->book, $this->extension, $this->getMimeType(), $rel, $this->getFilename(), $this->id, $title);
     }
 
-    public function getHtmlLink () {
+    public function getHtmlLink() {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE)->href;
     }
 
-    public function getLocalPath () {
-        return $this->book->path . "/" . $this->getFilename ();
+    public function getLocalPath() {
+        return $this->book->path . "/" . $this->getFilename();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL) {
+    public function getHtmlLinkWithRewriting($title = NULL) {
         global $config;
 
         $database = "";
-        if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
+        if (!is_null(GetUrlParam(DB))) $database = GetUrlParam(DB) . "/";
 
         $href = "download/" . $this->id . "/" . $database;
 
         if ($config['cops_provide_kepub'] == "1" &&
-            $this->isEpubValidOnKobo () &&
+            $this->isEpubValidOnKobo() &&
             preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) {
-            $href .= rawurlencode ($this->getUpdatedFilenameKepub ());
+            $href .= rawurlencode($this->getUpdatedFilenameKepub());
         } else {
-            $href .= rawurlencode ($this->getFilename ());
+            $href .= rawurlencode($this->getFilename());
         }
-        return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
+        return new Link($href, $this->getMimeType(), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
-    public static function getDataByBook ($book) {
-        $out = array ();
-        $result = parent::getDb ()->prepare('select id, format, name
+    public static function getDataByBook($book) {
+        $out = array();
+        $result = parent::getDb()->prepare('select id, format, name
                                              from data where book = ?');
-        $result->execute (array ($book->id));
+        $result->execute(array($book->id));
 
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            array_push ($out, new Data ($post, $book));
+            array_push($out, new Data($post, $book));
         }
         return $out;
     }
 
-    public static function handleThumbnailLink ($urlParam, $height) {
+    public static function handleThumbnailLink($urlParam, $height) {
         global $config;
 
-        if (is_null ($height)) {
-            if (preg_match ('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
+        if (is_null($height)) {
+            if (preg_match('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
                 $height = $config['cops_opds_thumbnail_height'];
             }
             else
@@ -173,13 +173,13 @@ 
         return $urlParam;
     }
 
-    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL)
+    public static function getLink($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL)
     {
         global $config;
 
         $urlParam = addURLParameter("", "data", $idData);
 
-        if (Base::useAbsolutePath () ||
+        if (Base::useAbsolutePath() ||
             $rel == Link::OPDS_THUMBNAIL_TYPE ||
             ($type == "epub" && $config['cops_update_epub-metadata']))
         {
@@ -188,18 +188,18 @@ 
                 $urlParam = self::handleThumbnailLink($urlParam, $height);
             }
             $urlParam = addURLParameter($urlParam, "id", $book->id);
-            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_thumbnail_handling'] != "1" &&
                 !empty ($config['cops_thumbnail_handling']) &&
                 $rel == Link::OPDS_THUMBNAIL_TYPE) {
-                return new Link ($config['cops_thumbnail_handling'], $mime, $rel, $title);
+                return new Link($config['cops_thumbnail_handling'], $mime, $rel, $title);
             } else {
-                return new Link ("fetch.php?" . $urlParam, $mime, $rel, $title);
+                return new Link("fetch.php?" . $urlParam, $mime, $rel, $title);
             }
         }
         else
         {
-            return new Link (str_replace('%2F','/',rawurlencode ($book->path."/".$filename)), $mime, $rel, $title);
+            return new Link(str_replace('%2F', '/', rawurlencode($book->path . "/" . $filename)), $mime, $rel, $title);
         }
     }
 }

Braces +44 added lines, -30 removed lines

@@ -6,7 +6,8 @@ 
  * @author     Sébastien Lucas <sebastien@slucas.fr>
  */
 
-class Data extends Base {
+class Data extends Base
+{
     public $id;
     public $name;
     public $format;
@@ -54,7 +55,8 @@ 
         'zip'   => 'application/zip'
     );
 
-    public function __construct($post, $book = null) {
+    public function __construct($post, $book = null)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
         $this->format = $post->format;
@@ -63,19 +65,20 @@ 
         $this->book = $book;
     }
 
-    public function isKnownType () {
+    public function isKnownType ()
+    {
         return array_key_exists ($this->extension, self::$mimetypes);
     }
 
-    public function getMimeType () {
+    public function getMimeType ()
+    {
         $result = "application/octet-stream";
         if ($this->isKnownType ()) {
             return self::$mimetypes [$this->extension];
         } elseif (function_exists('finfo_open') === true) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
-            if (is_resource($finfo) === true)
-            {
+            if (is_resource($finfo) === true) {
                 $result = finfo_file($finfo, $this->getLocalPath ());
             }
 
@@ -85,27 +88,33 @@ 
         return $result;
     }
 
-    public function isEpubValidOnKobo () {
+    public function isEpubValidOnKobo ()
+    {
         return $this->format == "EPUB" || $this->format == "KEPUB";
     }
 
-    public function getFilename () {
+    public function getFilename ()
+    {
         return $this->name . "." . strtolower ($this->format);
     }
 
-    public function getUpdatedFilename () {
+    public function getUpdatedFilename ()
+    {
         return $this->book->getAuthorsSort () . " - " . $this->book->title;
     }
 
-    public function getUpdatedFilenameEpub () {
+    public function getUpdatedFilenameEpub ()
+    {
         return $this->getUpdatedFilename () . ".epub";
     }
 
-    public function getUpdatedFilenameKepub () {
+    public function getUpdatedFilenameKepub ()
+    {
         return $this->getUpdatedFilename () . ".kepub.epub";
     }
 
-    public function getDataLink ($rel, $title = NULL) {
+    public function getDataLink ($rel, $title = NULL)
+    {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
@@ -115,19 +124,24 @@ 
         return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title);
     }
 
-    public function getHtmlLink () {
+    public function getHtmlLink ()
+    {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE)->href;
     }
 
-    public function getLocalPath () {
+    public function getLocalPath ()
+    {
         return $this->book->path . "/" . $this->getFilename ();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL) {
+    public function getHtmlLinkWithRewriting ($title = NULL)
+    {
         global $config;
 
         $database = "";
-        if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
+        if (!is_null (GetUrlParam (DB))) {
+            $database = GetUrlParam (DB) . "/";
+        }
 
         $href = "download/" . $this->id . "/" . $database;
 
@@ -141,28 +155,27 @@ 
         return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
-    public static function getDataByBook ($book) {
+    public static function getDataByBook ($book)
+    {
         $out = array ();
         $result = parent::getDb ()->prepare('select id, format, name
                                              from data where book = ?');
         $result->execute (array ($book->id));
 
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             array_push ($out, new Data ($post, $book));
         }
         return $out;
     }
 
-    public static function handleThumbnailLink ($urlParam, $height) {
+    public static function handleThumbnailLink ($urlParam, $height)
+    {
         global $config;
 
         if (is_null ($height)) {
             if (preg_match ('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
                 $height = $config['cops_opds_thumbnail_height'];
-            }
-            else
-            {
+            } else {
                 $height = $config['cops_html_thumbnail_height'];
             }
         }
@@ -181,14 +194,17 @@ 
 
         if (Base::useAbsolutePath () ||
             $rel == Link::OPDS_THUMBNAIL_TYPE ||
-            ($type == "epub" && $config['cops_update_epub-metadata']))
-        {
-            if ($type != "jpg") $urlParam = addURLParameter($urlParam, "type", $type);
+            ($type == "epub" && $config['cops_update_epub-metadata'])) {
+            if ($type != "jpg") {
+                $urlParam = addURLParameter($urlParam, "type", $type);
+            }
             if ($rel == Link::OPDS_THUMBNAIL_TYPE) {
                 $urlParam = self::handleThumbnailLink($urlParam, $height);
             }
             $urlParam = addURLParameter($urlParam, "id", $book->id);
-            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_thumbnail_handling'] != "1" &&
                 !empty ($config['cops_thumbnail_handling']) &&
                 $rel == Link::OPDS_THUMBNAIL_TYPE) {
@@ -196,9 +212,7 @@ 
             } else {
                 return new Link ("fetch.php?" . $urlParam, $mime, $rel, $title);
             }
-        }
-        else
-        {
+        } else {
             return new Link (str_replace('%2F','/',rawurlencode ($book->path."/".$filename)), $mime, $rel, $title);
         }
     }

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -105,7 +105,7 @@ 
         return $this->getUpdatedFilename () . ".kepub.epub";
     }
 
-    public function getDataLink ($rel, $title = NULL) {
+    public function getDataLink ($rel, $title = null) {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
@@ -123,7 +123,7 @@ 
         return $this->book->path . "/" . $this->getFilename ();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL) {
+    public function getHtmlLinkWithRewriting ($title = null) {
         global $config;
 
         $database = "";
@@ -173,7 +173,7 @@ 
         return $urlParam;
     }
 
-    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL)
+    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = null, $height = null)
     {
         global $config;
 

rating.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
         return self::getEntryArray (self::SQL_ALL_RATINGS, array ());
     }
 
+    /**
+     * @param string $query
+     */
     public static function getEntryArray ($query, $params) {
         list (, $result) = parent::executeQuery ($query, self::RATING_COLUMNS, "", $params, -1);
         $entryArray = array();

Spacing +20 added lines, -20 removed lines

@@ -10,7 +10,7 @@ 
     const ALL_RATING_ID = "cops:rating";
 
     const RATING_COLUMNS = "ratings.id as id, ratings.rating as rating, count(*) as count";
-    const SQL_ALL_RATINGS ="select {0} from ratings, books_ratings_link where books_ratings_link.rating = ratings.id group by ratings.id order by ratings.rating";
+    const SQL_ALL_RATINGS = "select {0} from ratings, books_ratings_link where books_ratings_link.rating = ratings.id group by ratings.id order by ratings.rating";
     public $id;
     public $name;
 
@@ -19,41 +19,41 @@ 
         $this->name = $pname;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_RATING_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_RATING_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_RATING_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_RATING_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("ratings", count(array))
-        return parent::getCountGeneric ("ratings", self::ALL_RATING_ID, parent::PAGE_ALL_RATINGS, "ratings");
+        return parent::getCountGeneric("ratings", self::ALL_RATING_ID, parent::PAGE_ALL_RATINGS, "ratings");
     }
 
     public static function getAllRatings() {
-        return self::getEntryArray (self::SQL_ALL_RATINGS, array ());
+        return self::getEntryArray(self::SQL_ALL_RATINGS, array());
     }
 
-    public static function getEntryArray ($query, $params) {
-        list (, $result) = parent::executeQuery ($query, self::RATING_COLUMNS, "", $params, -1);
+    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);
-            array_push ($entryArray, new Entry ($rating, $ratingObj->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($ratingObj->getUri ())), "", $post->count));
+            $ratingObj = new Rating($post->id, $post->rating);
+            $rating = $post->rating / 2;
+            $rating = str_format(localize("ratingword", $rating), $rating);
+            array_push($entryArray, new Entry($rating, $ratingObj->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($ratingObj->getUri())), "", $post->count));
         }
         return $entryArray;
     }
 
-    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 ());
+    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());
     }
 }

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

tag.php

Doc Comments +3 added lines

@@ -45,6 +45,9 @@
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
     }
 
+    /**
+     * @param integer $numberPerPage
+     */
     public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';

Spacing +19 added lines, -19 removed lines

@@ -19,44 +19,44 @@
         $this->name = $post->name;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_TAG_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_TAG_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_TAGS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_TAGS_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("tags.alphabetical", count(array))
-        return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
+        return parent::getCountGeneric("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
-        $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
-        $result->execute (array ($tagId));
-        if ($post = $result->fetchObject ()) {
-            return new Tag ($post);
+    public static function getTagById($tagId) {
+        $result = parent::getDb()->prepare('select id, name  from tags where id = ?');
+        $result->execute(array($tagId));
+        if ($post = $result->fetchObject()) {
+            return new Tag($post);
         }
         return NULL;
     }
 
     public static function getAllTags() {
-        return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
+        return Base::getEntryArrayWithBookNumber(self::SQL_ALL_TAGS, self::TAG_COLUMNS, array(), "Tag");
     }
 
     public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
-        $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
+        $columns = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
-        list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);
+        list ($totalNumber, $result) = parent::executeQuery($sql, $columns, "", array('%' . $query . '%'), $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $tag = new Tag ($post);
-            array_push ($entryArray, new Entry ($tag->name, $tag->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($tag->getUri ()))));
+            $tag = new Tag($post);
+            array_push($entryArray, new Entry($tag->name, $tag->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($tag->getUri()))));
         }
-        return array ($entryArray, $totalNumber);
+        return array($entryArray, $totalNumber);
     }
 }

Braces +17 added lines, -10 removed lines

@@ -6,7 +6,8 @@ 
  * @author     Sébastien Lucas <sebastien@slucas.fr>
  */
 
-class Tag extends Base {
+class Tag extends Base
+{
     const ALL_TAGS_ID = "cops:tags";
     const TAG_COLUMNS = "tags.id as id, tags.name as name, count(*) as count";
     const SQL_ALL_TAGS = "select {0} from tags, books_tags_link where tags.id = tag group by tags.id, tags.name order by tags.name";
@@ -14,25 +15,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_TAG_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_TAGS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("tags.alphabetical", count(array))
         return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
+    public static function getTagById ($tagId)
+    {
         $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
         $result->execute (array ($tagId));
         if ($post = $result->fetchObject ()) {
@@ -41,17 +47,18 @@ 
         return NULL;
     }
 
-    public static function getAllTags() {
+    public static function getAllTags()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
         list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $tag = new Tag ($post);
             array_push ($entryArray, new Entry ($tag->name, $tag->getEntryId (),
                 str_format (localize("bookword", $post->count), $post->count), "text",

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -38,14 +38,14 @@
         if ($post = $result->fetchObject ()) {
             return new Tag ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllTags() {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getAllTagsByQuery($query, $n, $database = null, $numberPerPage = null) {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
         list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);

transliteration.php

Doc Comments +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 /**
  * Replaces a Unicode character using the transliteration database.
  *
- * @param $ord
+ * @param integer $ord
  *   An ordinal Unicode character code.
  * @param $unknown
  *   Replacement string for characters that do not have a suitable ASCII

Indentation +80 added lines, -80 removed lines

@@ -26,56 +26,56 @@ 
  *   Transliterated text.
  */
 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.
-  if (!preg_match('/[\x80-\xff]/', $string)) {
+    // 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.
+    if (!preg_match('/[\x80-\xff]/', $string)) {
     return $string;
-  }
+    }
 
-  static $tail_bytes;
+    static $tail_bytes;
 
-  if (!isset($tail_bytes)) {
+    if (!isset($tail_bytes)) {
     // Each UTF-8 head byte is followed by a certain number of tail bytes.
     $tail_bytes = array();
     for ($n = 0; $n < 256; $n++) {
-      if ($n < 0xc0) {
+        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;
+        }
+        $tail_bytes[chr($n)] = $remaining;
+    }
     }
-  }
 
-  // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
-  // be handled much more quickly. Don't chop up Unicode areas for punctuation,
-  // though, that wastes energy.
-  preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
+    // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
+    // be handled much more quickly. Don't chop up Unicode areas for punctuation,
+    // though, that wastes energy.
+    preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
 
-  $result = '';
-  foreach ($matches[0] as $str) {
+    $result = '';
+    foreach ($matches[0] as $str) {
     if ($str[0] < "\x80") {
-      // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
-      // skip over it.
-      $result .= $str;
-      continue;
+        // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
+        // skip over it.
+        $result .= $str;
+        continue;
     }
 
     // We'll have to examine the chunk byte by byte to ensure that it consists
@@ -91,73 +91,73 @@ 
     $len = $chunk + 1;
 
     for ($i = -1; --$len; ) {
-      $c = $str[++$i];
-      if ($remaining = $tail_bytes[$c]) {
+        $c = $str[++$i];
+        if ($remaining = $tail_bytes[$c]) {
         // UTF-8 head byte!
         $sequence = $head = $c;
         do {
-          // Look for the defined number of tail bytes...
-          if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
+            // Look for the defined number of tail bytes...
+            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;
+                // Premature end of string! Drop a replacement character into
+                // output to represent the invalid UTF-8 sequence.
+                $result .= $unknown;
+                break 2;
             }
             else {
-              // Illegal tail byte; abandon the sequence.
-              $result .= $unknown;
-              // Back up and reprocess this byte; it may itself be a legal
-              // ASCII or UTF-8 sequence head.
-              --$i;
-              ++$len;
-              continue 2;
+                // Illegal tail byte; abandon the sequence.
+                $result .= $unknown;
+                // Back up and reprocess this byte; it may itself be a legal
+                // ASCII or UTF-8 sequence head.
+                --$i;
+                ++$len;
+                continue 2;
+            }
             }
-          }
         } while (--$remaining);
 
         $n = ord($head);
         if ($n <= 0xdf) {
-          $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
+            $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
         }
         elseif ($n <= 0xef) {
-          $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
+            $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
         }
         elseif ($n <= 0xf7) {
-          $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
+            $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
         }
         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);
+            $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) {
-          $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);
+            $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;
+            $result .= $unknown;
+        }
         }
-      }
-      else {
+        else {
         // Miscellaneous freaks.
         $result .= $unknown;
         $head = '';
-      }
+        }
     }
-  }
-  return $result;
+    }
+    return $result;
 }
 
 /**
@@ -176,36 +176,36 @@ 
  *   ASCII replacement character.
  */
 function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
-  static $map = array();
+    static $map = array();
 
-  //GL: set language later
-  /*
+    //GL: set language later
+    /*
   if (!isset($langcode)) {
     global $language;
     $langcode = $language->language;
   }
   */
 
-  $bank = $ord >> 8;
+    $bank = $ord >> 8;
 
-  if (!isset($map[$bank][$langcode])) {
+    if (!isset($map[$bank][$langcode])) {
     $file = './resources/transliteration-data/' . sprintf('x%02x', $bank) . '.php';  
     if (file_exists($file)) {
-      include $file;
-      if ($langcode != 'en' && isset($variant[$langcode])) {
+        include $file;
+        if ($langcode != 'en' && isset($variant[$langcode])) {
         // Merge in language specific mappings.
         $map[$bank][$langcode] = $variant[$langcode] + $base;
-      }
-      else {
+        }
+        else {
         $map[$bank][$langcode] = $base;
-      }
+        }
     }
     else {
-      $map[$bank][$langcode] = array();
+        $map[$bank][$langcode] = array();
+    }
     }
-  }
 
-  $ord = $ord & 255;
+    $ord = $ord & 255;
 
-  return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
+    return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
 }

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
     // Counting down is faster. I'm *so* sorry.
     $len = $chunk + 1;
 
-    for ($i = -1; --$len; ) {
+    for ($i = -1; --$len;) {
       $c = $str[++$i];
       if ($remaining = $tail_bytes[$c]) {
         // UTF-8 head byte!
@@ -207,5 +207,5 @@ 
 
   $ord = $ord & 255;
 
-  return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
+  return isset($map[$bank][$langcode][$ord])?$map[$bank][$langcode][$ord]:$unknown;
 }

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

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
  * @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.
@@ -175,7 +175,7 @@ 
  * @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

serie.php

Spacing +17 added lines, -17 removed lines

@@ -20,44 +20,44 @@
         $this->name = $post->name;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_SERIE_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_SERIE_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_SERIES_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_SERIES_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("series.alphabetical", count(array))
-        return parent::getCountGeneric ("series", self::ALL_SERIES_ID, parent::PAGE_ALL_SERIES);
+        return parent::getCountGeneric("series", self::ALL_SERIES_ID, parent::PAGE_ALL_SERIES);
     }
 
-    public static function getSerieByBookId ($bookId) {
-        $result = parent::getDb ()->prepare('select  series.id as id, name
+    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 = ?');
-        $result->execute (array ($bookId));
-        if ($post = $result->fetchObject ()) {
-            return new Serie ($post);
+        $result->execute(array($bookId));
+        if ($post = $result->fetchObject()) {
+            return new Serie($post);
         }
         return NULL;
     }
 
-    public static function getSerieById ($serieId) {
-        $result = parent::getDb ()->prepare('select id, name  from series where id = ?');
-        $result->execute (array ($serieId));
-        if ($post = $result->fetchObject ()) {
-            return new Serie ($post);
+    public static function getSerieById($serieId) {
+        $result = parent::getDb()->prepare('select id, name  from series where id = ?');
+        $result->execute(array($serieId));
+        if ($post = $result->fetchObject()) {
+            return new Serie($post);
         }
         return NULL;
     }
 
     public static function getAllSeries() {
-        return Base::getEntryArrayWithBookNumber (self::SQL_ALL_SERIES, self::SERIES_COLUMNS, array (), "Serie");
+        return Base::getEntryArrayWithBookNumber(self::SQL_ALL_SERIES, self::SERIES_COLUMNS, array(), "Serie");
     }
 
     public static function getAllSeriesByQuery($query) {
-        return Base::getEntryArrayWithBookNumber (self::SQL_SERIES_FOR_SEARCH, self::SERIES_COLUMNS, array ('%' . $query . '%'), "Serie");
+        return Base::getEntryArrayWithBookNumber(self::SQL_SERIES_FOR_SEARCH, self::SERIES_COLUMNS, array('%' . $query . '%'), "Serie");
     }
 }

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

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -41,7 +41,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new Serie ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getSerieById ($serieId) {
@@ -50,7 +50,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new Serie ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllSeries() {

fetch.php

Spacing +30 added lines, -30 removed lines

@@ -13,19 +13,19 @@ 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
         if (!isset($_SESSION['connected'])) {
-            notFound ();
+            notFound();
             return;
         }
     }
 
-    $expires = 60*60*24*14;
+    $expires = 60 * 60 * 24 * 14;
     header("Pragma: public");
-    header("Cache-Control: maxage=".$expires);
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    $bookId = getURLParam ("id", NULL);
-    $type = getURLParam ("type", "jpg");
-    $idData = getURLParam ("data", NULL);
-    if (is_null ($bookId))
+    header("Cache-Control: maxage=" . $expires);
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
+    $bookId = getURLParam("id", NULL);
+    $type = getURLParam("type", "jpg");
+    $idData = getURLParam("data", NULL);
+    if (is_null($bookId))
     {
         $book = Book::getBookByDataId($idData);
     }
@@ -35,18 +35,18 @@ 
     }
 
     if (!$book) {
-        notFound ();
+        notFound();
         return;
     }
 
     if ($book && ($type == "jpg" || empty ($config['calibre_internal_directory']))) {
         if ($type == "jpg") {
-            $file = $book->getFilePath ($type);
+            $file = $book->getFilePath($type);
         } else {
-            $file = $book->getFilePath ($type, $idData);
+            $file = $book->getFilePath($type, $idData);
         }
-        if (!$file || !file_exists ($file)) {
-            notFound ();
+        if (!$file || !file_exists($file)) {
+            notFound();
             return;
         }
     }
@@ -57,17 +57,17 @@ 
             header("Content-Type: image/jpeg");
             //by default, we don't cache
             $thumbnailCacheFullpath = null;
-            if ( isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '' ) {
+            if (isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '') {
                 $thumbnailCacheFullpath = $config['cops_thumbnail_cache_directory'];
                 //if multiple databases, add a subfolder with the database ID
-                $thumbnailCacheFullpath .= !is_null (GetUrlParam (DB)) ? 'db-' . GetUrlParam (DB) . DIRECTORY_SEPARATOR : '';
+                $thumbnailCacheFullpath .= !is_null(GetUrlParam(DB))?'db-' . GetUrlParam(DB) . DIRECTORY_SEPARATOR:'';
                 //when there are lots of thumbnails, it's better to save files in subfolders, so if the book's uuid is
                 //"01234567-89ab-cdef-0123-456789abcdef", we will save the thumbnail in .../0/12/34567-89ab-cdef-0123-456789abcdef-...
                 $thumbnailCacheFullpath .= substr($book->uuid, 0, 1) . DIRECTORY_SEPARATOR . substr($book->uuid, 1, 2) . DIRECTORY_SEPARATOR;
                 //check if cache folder exists or create it
-                if ( file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true) ) {
+                if (file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true)) {
                     //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';
+                    $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam("width") . 'x' . getURLParam("height") . '.jpg';
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
                 }
                 else {
@@ -76,45 +76,45 @@ 
                 }
             }
 
-            if ( $thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath) ) {
+            if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
                 //return the already cached thumbnail
-                readfile( $thumbnailCacheFullpath );
+                readfile($thumbnailCacheFullpath);
                 return;
             }
 
-            if ($book->getThumbnail (getURLParam ("width"), getURLParam ("height"), $thumbnailCacheFullpath)) {
+            if ($book->getThumbnail(getURLParam("width"), getURLParam("height"), $thumbnailCacheFullpath)) {
                 //if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
-                if ( $thumbnailCacheFullpath === null ) {
+                if ($thumbnailCacheFullpath === null) {
                     // The cover had to be resized
                     return;
                 }
                 else {
                     //return the just cached thumbnail
-                    readfile( $thumbnailCacheFullpath );
+                    readfile($thumbnailCacheFullpath);
                     return;
                 }
             }
             break;
         default:
-            $data = $book->getDataById ($idData);
-            header("Content-Type: " . $data->getMimeType ());
+            $data = $book->getDataById($idData);
+            header("Content-Type: " . $data->getMimeType());
             break;
     }
-    $file = $book->getFilePath ($type, $idData, true);
+    $file = $book->getFilePath($type, $idData, true);
     if ($type == "epub" && $config['cops_update_epub-metadata'])
     {
-        $book->getUpdatedEpub ($idData);
+        $book->getUpdatedEpub($idData);
         return;
     }
     if ($type == "jpg") {
-        header('Content-Disposition: filename="' . basename ($file) . '"');
+        header('Content-Disposition: filename="' . basename($file) . '"');
     } else {
-        header('Content-Disposition: attachment; filename="' . basename ($file) . '"');
+        header('Content-Disposition: attachment; filename="' . basename($file) . '"');
     }
 
     $dir = $config['calibre_internal_directory'];
     if (empty ($config['calibre_internal_directory'])) {
-        $dir = Base::getDbDirectory ();
+        $dir = Base::getDbDirectory();
     }
 
     if (empty ($config['cops_x_accel_redirect'])) {
@@ -124,5 +124,5 @@ 
         fpassthru($fp);
     }
     else {
-        header ($config['cops_x_accel_redirect'] . ": " . $dir . $file);
+        header($config['cops_x_accel_redirect'] . ": " . $dir . $file);
     }

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

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
     header("Pragma: public");
     header("Cache-Control: maxage=".$expires);
     header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    $bookId = getURLParam ("id", NULL);
+    $bookId = getURLParam ("id", null);
     $type = getURLParam ("type", "jpg");
-    $idData = getURLParam ("data", NULL);
+    $idData = getURLParam ("data", null);
     if (is_null ($bookId))
     {
         $book = Book::getBookByDataId($idData);