mbirth / cops

author.php

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

epubreader.php

Spacing +7 added lines, -7 removed lines

@@ -11,15 +11,15 @@ 
 require_once ("config.php");
 require_once ("base.php");
 
-header ("Content-Type: text/html;charset=utf-8");
+header("Content-Type: text/html;charset=utf-8");
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null(GetUrlParam(DB))) $add .= DB . "=" . GetUrlParam(DB) . "&";
 $myBook = Book::getBookByDataId($idData);
 
-$book = new EPub ($myBook->getFilePath ("EPUB", $idData));
-$book->initSpineComponent ();
+$book = new EPub($myBook->getFilePath("EPUB", $idData));
+$book->initSpineComponent();
 
 ?>
 <head>
@@ -35,10 +35,10 @@ 
         Monocle.DEBUG = true;
         var bookData = {
           getComponents: function () {
-            <?php echo "return [" . implode (", ", array_map (function ($comp) { return "'" . $comp . "'"; }, $book->components ())) . "];"; ?>
+            <?php echo "return [" . implode(", ", array_map(function($comp) { return "'" . $comp . "'"; }, $book->components())) . "];"; ?>
           },
           getContents: function () {
-            <?php echo "return [" . implode (", ", array_map (function ($content) { return "{title: '" . addslashes($content["title"]) . "', src: '". $content["src"] . "'}"; }, $book->contents ())) . "];"; ?>
+            <?php echo "return [" . implode(", ", array_map(function($content) { return "{title: '" . addslashes($content["title"]) . "', src: '" . $content["src"] . "'}"; }, $book->contents())) . "];"; ?>
           },
           getComponent: function (componentId) {
             return { url: "epubfs.php?<?php echo $add ?>comp="  + componentId };

feed.php

Spacing +10 added lines, -10 removed lines

@@ -10,13 +10,13 @@ 
     require_once ("config.php");
     require_once ("base.php");
 
-    header ("Content-Type:application/xml");
-    $page = getURLParam ("page", Base::PAGE_INDEX);
-    $query = getURLParam ("query");
-    $n = getURLParam ("n", "1");
+    header("Content-Type:application/xml");
+    $page = getURLParam("page", Base::PAGE_INDEX);
+    $query = getURLParam("query");
+    $n = getURLParam("n", "1");
     if ($query)
         $page = Base::PAGE_OPENSEARCH_QUERY;
-    $qid = getURLParam ("id");
+    $qid = getURLParam("id");
 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
@@ -25,15 +25,15 @@ 
         }
     }
 
-    $OPDSRender = new OPDSRenderer ();
+    $OPDSRender = new OPDSRenderer();
 
     switch ($page) {
         case Base::PAGE_OPENSEARCH :
-            echo $OPDSRender->getOpenSearch ();
+            echo $OPDSRender->getOpenSearch();
             return;
         default:
-            $currentPage = Page::getPage ($page, $qid, $query, $n);
-            $currentPage->InitializeContent ();
-            echo $OPDSRender->render ($currentPage);
+            $currentPage = Page::getPage($page, $qid, $query, $n);
+            $currentPage->InitializeContent();
+            echo $OPDSRender->render($currentPage);
             return;
     }

JSON_renderer.php

Spacing +94 added lines, -94 removed lines

@@ -10,135 +10,135 @@ 
 
 class JSONRenderer
 {
-    public static function getBookContentArray ($book) {
+    public static function getBookContentArray($book) {
         global $config;
         $i = 0;
-        $preferedData = array ();
+        $preferedData = array();
         foreach ($config['cops_prefered_format'] as $format)
         {
             if ($i == 2) { break; }
-            if ($data = $book->getDataFormat ($format)) {
+            if ($data = $book->getDataFormat($format)) {
                 $i++;
-                array_push ($preferedData, array ("url" => $data->getHtmlLink (), "name" => $format));
+                array_push($preferedData, array("url" => $data->getHtmlLink(), "name" => $format));
             }
         }
 
         $publisher = $book->getPublisher();
-        if (is_null ($publisher)) {
+        if (is_null($publisher)) {
             $pn = "";
             $pu = "";
         } else {
             $pn = $publisher->name;
-            $link = new LinkNavigation ($publisher->getUri ());
-            $pu = $link->hrefXhtml ();
+            $link = new LinkNavigation($publisher->getUri());
+            $pu = $link->hrefXhtml();
         }
 
-        $serie = $book->getSerie ();
-        if (is_null ($serie)) {
+        $serie = $book->getSerie();
+        if (is_null($serie)) {
             $sn = "";
             $scn = "";
             $su = "";
         } else {
             $sn = $serie->name;
-            $scn = str_format (localize ("content.series.data"), $book->seriesIndex, $serie->name);
-            $link = new LinkNavigation ($serie->getUri ());
-            $su = $link->hrefXhtml ();
+            $scn = str_format(localize("content.series.data"), $book->seriesIndex, $serie->name);
+            $link = new LinkNavigation($serie->getUri());
+            $su = $link->hrefXhtml();
         }
 
-        return array ("id" => $book->id,
+        return array("id" => $book->id,
                       "hasCover" => $book->hasCover,
                       "preferedData" => $preferedData,
-                      "rating" => $book->getRating (),
+                      "rating" => $book->getRating(),
                       "publisherName" => $pn,
                       "publisherurl" => $pu,
-                      "pubDate" => $book->getPubDate (),
-                      "languagesName" => $book->getLanguages (),
-                      "authorsName" => $book->getAuthorsName (),
-                      "tagsName" => $book->getTagsName (),
+                      "pubDate" => $book->getPubDate(),
+                      "languagesName" => $book->getLanguages(),
+                      "authorsName" => $book->getAuthorsName(),
+                      "tagsName" => $book->getTagsName(),
                       "seriesName" => $sn,
                       "seriesIndex" => $book->seriesIndex,
                       "seriesCompleteName" => $scn,
                       "seriesurl" => $su);
     }
 
-    public static function getFullBookContentArray ($book) {
+    public static function getFullBookContentArray($book) {
         global $config;
-        $out = self::getBookContentArray ($book);
-        $database = GetUrlParam (DB);
-
-        $out ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml ();
-        $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml ();
-        $out ["content"] = $book->getComment (false);
-        $out ["datas"] = array ();
-        $dataKindle = $book->GetMostInterestingDataToSendToKindle ();
+        $out = self::getBookContentArray($book);
+        $database = GetUrlParam(DB);
+
+        $out ["coverurl"] = Data::getLink($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml();
+        $out ["thumbnailurl"] = Data::getLink($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml();
+        $out ["content"] = $book->getComment(false);
+        $out ["datas"] = array();
+        $dataKindle = $book->GetMostInterestingDataToSendToKindle();
         foreach ($book->getDatas() as $data) {
-            $tab = array ("id" => $data->id, "format" => $data->format, "url" => $data->getHtmlLink (), "mail" => 0, "readerUrl" => "");
-            if (!empty ($config['cops_mail_configuration']) && !is_null ($dataKindle) && $data->id == $dataKindle->id) {
+            $tab = array("id" => $data->id, "format" => $data->format, "url" => $data->getHtmlLink(), "mail" => 0, "readerUrl" => "");
+            if (!empty ($config['cops_mail_configuration']) && !is_null($dataKindle) && $data->id == $dataKindle->id) {
                 $tab ["mail"] = 1;
             }
             if ($data->format == "EPUB") {
                 $tab ["readerUrl"] = "epubreader.php?data={$data->id}&db={$database}";
             }
-            array_push ($out ["datas"], $tab);
+            array_push($out ["datas"], $tab);
         }
-        $out ["authors"] = array ();
-        foreach ($book->getAuthors () as $author) {
-            $link = new LinkNavigation ($author->getUri ());
-            array_push ($out ["authors"], array ("name" => $author->name, "url" => $link->hrefXhtml ()));
+        $out ["authors"] = array();
+        foreach ($book->getAuthors() as $author) {
+            $link = new LinkNavigation($author->getUri());
+            array_push($out ["authors"], array("name" => $author->name, "url" => $link->hrefXhtml()));
         }
-        $out ["tags"] = array ();
-        foreach ($book->getTags () as $tag) {
-            $link = new LinkNavigation ($tag->getUri ());
-            array_push ($out ["tags"], array ("name" => $tag->name, "url" => $link->hrefXhtml ()));
+        $out ["tags"] = array();
+        foreach ($book->getTags() as $tag) {
+            $link = new LinkNavigation($tag->getUri());
+            array_push($out ["tags"], array("name" => $tag->name, "url" => $link->hrefXhtml()));
         }
         ;
         return $out;
     }
 
-    public static function getContentArray ($entry) {
+    public static function getContentArray($entry) {
         if ($entry instanceof EntryBook) {
-            $out = array ( "title" => $entry->title);
-            $out ["book"] = self::getBookContentArray ($entry->book);
+            $out = array("title" => $entry->title);
+            $out ["book"] = self::getBookContentArray($entry->book);
             return $out;
         }
-        return array ( "title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink (), "number" => $entry->numberOfElement );
+        return array("title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink(), "number" => $entry->numberOfElement);
     }
 
-    public static function getContentArrayTypeahead ($page) {
-        $out = array ();
+    public static function getContentArrayTypeahead($page) {
+        $out = array();
         foreach ($page->entryArray as $entry) {
             if ($entry instanceof EntryBook) {
-                array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->book->getDetailUrl ()));
+                array_push($out, array("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->book->getDetailUrl()));
             } else {
-                if (empty ($entry->className) xor Base::noDatabaseSelected ()) {
-                    array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->getNavLink ()));
+                if (empty ($entry->className) xor Base::noDatabaseSelected()) {
+                    array_push($out, array("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->getNavLink()));
                 } else {
-                    array_push ($out, array ("class" => $entry->className, "title" => $entry->content, "navlink" => $entry->getNavLink ()));
+                    array_push($out, array("class" => $entry->className, "title" => $entry->content, "navlink" => $entry->getNavLink()));
                 }
             }
         }
         return $out;
     }
 
-    public static function addCompleteArray ($in) {
+    public static function addCompleteArray($in) {
         global $config;
         $out = $in;
 
-        $out ["c"] = array ("version" => VERSION, "i18n" => array (
+        $out ["c"] = array("version" => VERSION, "i18n" => array(
                            "coverAlt" => localize("i18n.coversection"),
                            "authorsTitle" => localize("authors.title"),
                            "bookwordTitle" => localize("bookword.title"),
                            "tagsTitle" => localize("tags.title"),
                            "seriesTitle" => localize("series.title"),
-                           "customizeTitle" => localize ("customize.title"),
-                           "aboutTitle" => localize ("about.title"),
-                           "previousAlt" => localize ("paging.previous.alternate"),
-                           "nextAlt" => localize ("paging.next.alternate"),
-                           "searchAlt" => localize ("search.alternate"),
-                           "sortAlt" => localize ("sort.alternate"),
-                           "homeAlt" => localize ("home.alternate"),
-                           "cogAlt" => localize ("cog.alternate"),
-                           "permalinkAlt" => localize ("permalink.alternate"),
+                           "customizeTitle" => localize("customize.title"),
+                           "aboutTitle" => localize("about.title"),
+                           "previousAlt" => localize("paging.previous.alternate"),
+                           "nextAlt" => localize("paging.next.alternate"),
+                           "searchAlt" => localize("search.alternate"),
+                           "sortAlt" => localize("sort.alternate"),
+                           "homeAlt" => localize("home.alternate"),
+                           "cogAlt" => localize("cog.alternate"),
+                           "permalinkAlt" => localize("permalink.alternate"),
                            "publisherName" => localize("publisher.name"),
                            "pubdateTitle" => localize("pubdate.title"),
                            "languagesTitle" => localize("language.title"),
@@ -146,15 +146,15 @@ 
                            "sortorderAsc" => localize("search.sortorder.asc"),
                            "sortorderDesc" => localize("search.sortorder.desc"),
                            "customizeEmail" => localize("customize.email")),
-                       "url" => array (
+                       "url" => array(
                            "detailUrl" => "index.php?page=13&id={0}&db={1}",
                            "coverUrl" => "fetch.php?id={0}&db={1}",
                            "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
-                       "config" => array (
+                       "config" => array(
                            "use_fancyapps" => $config ["cops_use_fancyapps"],
                            "max_item_per_page" => $config['cops_max_item_per_page'],
                            "kindleHack"        => "",
-                           "server_side_rendering" => useServerSideRendering (),
+                           "server_side_rendering" => useServerSideRendering(),
                            "html_tag_filter" => $config['cops_html_tag_filter']));
         if ($config['cops_thumbnail_handling'] == "1") {
             $out ["c"]["url"]["thumbnailUrl"] = $out ["c"]["url"]["coverUrl"];
@@ -167,32 +167,32 @@ 
         return $out;
     }
 
-    public static function getJson ($complete = false) {
+    public static function getJson($complete = false) {
         global $config;
-        $page = getURLParam ("page", Base::PAGE_INDEX);
-        $query = getURLParam ("query");
-        $search = getURLParam ("search");
-        $qid = getURLParam ("id");
-        $n = getURLParam ("n", "1");
-        $database = GetUrlParam (DB);
+        $page = getURLParam("page", Base::PAGE_INDEX);
+        $query = getURLParam("query");
+        $search = getURLParam("search");
+        $qid = getURLParam("id");
+        $n = getURLParam("n", "1");
+        $database = GetUrlParam(DB);
 
-        $currentPage = Page::getPage ($page, $qid, $query, $n);
-        $currentPage->InitializeContent ();
+        $currentPage = Page::getPage($page, $qid, $query, $n);
+        $currentPage->InitializeContent();
 
         if ($search) {
-            return self::getContentArrayTypeahead ($currentPage);
+            return self::getContentArrayTypeahead($currentPage);
         }
 
-        $out = array ( "title" => $currentPage->title);
-        $entries = array ();
+        $out = array("title" => $currentPage->title);
+        $entries = array();
         foreach ($currentPage->entryArray as $entry) {
-            array_push ($entries, self::getContentArray ($entry));
+            array_push($entries, self::getContentArray($entry));
         }
-        if (!is_null ($currentPage->book)) {
-            $out ["book"] = self::getFullBookContentArray ($currentPage->book);
+        if (!is_null($currentPage->book)) {
+            $out ["book"] = self::getFullBookContentArray($currentPage->book);
         }
-        $out ["databaseId"] = GetUrlParam (DB, "");
-        $out ["databaseName"] = Base::getDbName ();
+        $out ["databaseId"] = GetUrlParam(DB, "");
+        $out ["databaseName"] = Base::getDbName();
         if ($out ["databaseId"] == "") {
             $out ["databaseName"] = "";
         }
@@ -201,42 +201,42 @@ 
             $out ["fullTitle"] = $out ["databaseName"] . " > " . $out ["fullTitle"];
         }
         $out ["page"] = $page;
-        $out ["multipleDatabase"] = Base::isMultipleDatabaseEnabled () ? 1 : 0;
+        $out ["multipleDatabase"] = Base::isMultipleDatabaseEnabled()?1:0;
         $out ["entries"] = $entries;
         $out ["isPaginated"] = 0;
-        if ($currentPage->isPaginated ()) {
-            $prevLink = $currentPage->getPrevLink ();
-            $nextLink = $currentPage->getNextLink ();
+        if ($currentPage->isPaginated()) {
+            $prevLink = $currentPage->getPrevLink();
+            $nextLink = $currentPage->getNextLink();
             $out ["isPaginated"] = 1;
             $out ["prevLink"] = "";
-            if (!is_null ($prevLink)) {
-                $out ["prevLink"] = $prevLink->hrefXhtml ();
+            if (!is_null($prevLink)) {
+                $out ["prevLink"] = $prevLink->hrefXhtml();
             }
             $out ["nextLink"] = "";
-            if (!is_null ($nextLink)) {
-                $out ["nextLink"] = $nextLink->hrefXhtml ();
+            if (!is_null($nextLink)) {
+                $out ["nextLink"] = $nextLink->hrefXhtml();
             }
-            $out ["maxPage"] = $currentPage->getMaxPage ();
+            $out ["maxPage"] = $currentPage->getMaxPage();
             $out ["currentPage"] = $currentPage->n;
         }
-        if (!is_null (getURLParam ("complete")) || $complete) {
-            $out = self::addCompleteArray ($out);
+        if (!is_null(getURLParam("complete")) || $complete) {
+            $out = self::addCompleteArray($out);
        }
 
         $out ["containsBook"] = 0;
-        if ($currentPage->containsBook ()) {
+        if ($currentPage->containsBook()) {
             $out ["containsBook"] = 1;
         }
 
-        $out["abouturl"] = "index.php" . addURLParameter ("?page=" . Base::PAGE_ABOUT, DB, $database);
+        $out["abouturl"] = "index.php" . addURLParameter("?page=" . Base::PAGE_ABOUT, DB, $database);
 
         if ($page == Base::PAGE_ABOUT) {
-            $temp = preg_replace ("/\<h1\>About COPS\<\/h1\>/", "<h1>About COPS " . VERSION . "</h1>", file_get_contents('about.html'));
+            $temp = preg_replace("/\<h1\>About COPS\<\/h1\>/", "<h1>About COPS " . VERSION . "</h1>", file_get_contents('about.html'));
             $out ["fullhtml"] = $temp;
         }
 
         $out ["homeurl"] = "index.php";
-        if ($page != Base::PAGE_INDEX && !is_null ($database)) $out ["homeurl"] = $out ["homeurl"] .  "?" . addURLParameter ("", DB, $database);
+        if ($page != Base::PAGE_INDEX && !is_null($database)) $out ["homeurl"] = $out ["homeurl"] . "?" . addURLParameter("", DB, $database);
 
         return $out;
     }

book.php

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

index.php

Spacing +18 added lines, -18 removed lines

@@ -16,16 +16,16 @@ 
         exit ();
     }
 
-    $page = getURLParam ("page", Base::PAGE_INDEX);
-    $query = getURLParam ("query");
-    $qid = getURLParam ("id");
-    $n = getURLParam ("n", "1");
-    $database = GetUrlParam (DB);
+    $page = getURLParam("page", Base::PAGE_INDEX);
+    $query = getURLParam("query");
+    $qid = getURLParam("id");
+    $n = getURLParam("n", "1");
+    $database = GetUrlParam(DB);
 
 
     // Access the database ASAP to be sure it's readable, redirect if that's not the case.
     // It has to be done before any header is sent.
-    Base::checkDatabaseAvailability ();
+    Base::checkDatabaseAvailability();
 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
@@ -34,32 +34,32 @@ 
         }
     }
 
-    header ("Content-Type:text/html;charset=utf-8");
+    header("Content-Type:text/html;charset=utf-8");
 
     $data = array("title"                 => $config['cops_title_default'],
                   "version"               => VERSION,
                   "opds_url"              => $config['cops_full_url'] . "feed.php",
                   "customHeader"          => "",
-                  "template"              => getCurrentTemplate (),
-                  "server_side_rendering" => useServerSideRendering (),
-                  "current_css"           => getCurrentCss (),
+                  "template"              => getCurrentTemplate(),
+                  "server_side_rendering" => useServerSideRendering(),
+                  "current_css"           => getCurrentCss(),
                   "favico"                => $config['cops_icon'],
-                  "getjson_url"           => "getJSON.php?" . addURLParameter (getQueryString (), "complete", 1));
+                  "getjson_url"           => "getJSON.php?" . addURLParameter(getQueryString(), "complete", 1));
     if (preg_match("/Kindle/", $_SERVER['HTTP_USER_AGENT'])) {
         $data ["customHeader"] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>';
     }
-    $headcontent = file_get_contents('templates/' . getCurrentTemplate () . '/file.html');
-    $template = new doT ();
-    $dot = $template->template ($headcontent, NULL);
-    echo ($dot ($data));
+    $headcontent = file_get_contents('templates/' . getCurrentTemplate() . '/file.html');
+    $template = new doT();
+    $dot = $template->template($headcontent, NULL);
+    echo ($dot($data));
 ?><body>
 <?php
-if (useServerSideRendering ()) {
+if (useServerSideRendering()) {
     // Get the data
     require_once ("JSON_renderer.php");
-    $data = JSONRenderer::getJson (true);
+    $data = JSONRenderer::getJson(true);
 
-    echo serverSideRender ($data);
+    echo serverSideRender($data);
 }
 ?>
 </body>

getJSON.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 
     require_once ("config.php");
 
-    header ("Content-Type:application/json;charset=utf-8");
+    header("Content-Type:application/json;charset=utf-8");
 
 
-    echo json_encode (JSONRenderer::getJson ());
+    echo json_encode(JSONRenderer::getJson());
 

tag.php

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

language.php

Spacing +19 added lines, -19 removed lines

@@ -17,17 +17,17 @@ 
         $this->lang_code = $plang_code;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_LANGUAGE_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_LANGUAGE_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_LANGUAGES_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_LANGUAGES_ID . ":" . $this->id;
     }
 
-    public static function getLanguageString ($code) {
-        $string = localize("languages.".$code);
-        if (preg_match ("/^languages/", $string)) {
+    public static function getLanguageString($code) {
+        $string = localize("languages." . $code);
+        if (preg_match("/^languages/", $string)) {
             return $code;
         }
         return $string;
@@ -35,14 +35,14 @@ 
 
     public static function getCount() {
         // str_format (localize("languages.alphabetical", count(array))
-        return parent::getCountGeneric ("languages", self::ALL_LANGUAGES_ID, parent::PAGE_ALL_LANGUAGES);
+        return parent::getCountGeneric("languages", self::ALL_LANGUAGES_ID, parent::PAGE_ALL_LANGUAGES);
     }
 
-    public static function getLanguageById ($languageId) {
-        $result = parent::getDb ()->prepare('select id, lang_code  from languages where id = ?');
-        $result->execute (array ($languageId));
-        if ($post = $result->fetchObject ()) {
-            return new Language ($post->id, Language::getLanguageString ($post->lang_code));
+    public static function getLanguageById($languageId) {
+        $result = parent::getDb()->prepare('select id, lang_code  from languages where id = ?');
+        $result->execute(array($languageId));
+        if ($post = $result->fetchObject()) {
+            return new Language($post->id, Language::getLanguageString($post->lang_code));
         }
         return NULL;
     }
@@ -50,18 +50,18 @@ 
 
 
     public static function getAllLanguages() {
-        $result = parent::getDb ()->query('select languages.id as id, languages.lang_code as lang_code, count(*) as count
+        $result = parent::getDb()->query('select languages.id as id, languages.lang_code as lang_code, count(*) as count
 from languages, books_languages_link
 where languages.id = books_languages_link.lang_code
 group by languages.id, books_languages_link.lang_code
 order by languages.lang_code');
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $language = new Language ($post->id, $post->lang_code);
-            array_push ($entryArray, new Entry (Language::getLanguageString ($language->lang_code), $language->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($language->getUri ())), "", $post->count));
+            $language = new Language($post->id, $post->lang_code);
+            array_push($entryArray, new Entry(Language::getLanguageString($language->lang_code), $language->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($language->getUri())), "", $post->count));
         }
         return $entryArray;
     }