mbirth / cops

lib/CustomColumn.php

Braces +27 added lines, -15 removed lines

@@ -14,48 +14,58 @@ 
     public $name;
     public $customId;
 
-    public function __construct($pid, $pname, $pcustomId) {
+    public function __construct($pid, $pname, $pcustomId)
+    {
         $this->id = $pid;
         $this->name = $pname;
         $this->customId = $pcustomId;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_CUSTOM_DETAIL."&custom={$this->customId}&id={$this->id}";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_CUSTOMS_ID.":".$this->customId.":".$this->id;
     }
 
-    public static function getTableName ($customId) {
+    public static function getTableName ($customId)
+    {
         return "custom_column_{$customId}";
     }
 
-    public static function getTableLinkName ($customId) {
+    public static function getTableLinkName ($customId)
+    {
         return "books_custom_column_{$customId}_link";
     }
 
-    public static function getTableLinkColumn ($customId) {
+    public static function getTableLinkColumn ($customId)
+    {
         return "value";
     }
 
-    public static function getAllCustomsId ($customId) {
+    public static function getAllCustomsId ($customId)
+    {
         return self::ALL_CUSTOMS_ID . ":" . $customId;
     }
 
-    public static function getUriAllCustoms ($customId) {
+    public static function getUriAllCustoms ($customId)
+    {
         return "?page=" . parent::PAGE_ALL_CUSTOMS . "&custom={$customId}";
     }
 
-    public static function getAllTitle ($customId) {
+    public static function getAllTitle ($customId)
+    {
         $result = parent::getDb ()->prepare('select name from custom_columns where id = ?');
         $result->execute (array ($customId));
         $post = $result->fetchObject ();
         return $post->name;
     }
 
-    public static function getCustomId ($lookup) {
+    public static function getCustomId ($lookup)
+    {
         $result = parent::getDb ()->prepare('select id from custom_columns where label = ?');
         $result->execute (array ($lookup));
         if ($post = $result->fetchObject ()) {
@@ -64,7 +74,8 @@ 
         return NULL;
     }
 
-    public static function getCount($customId) {
+    public static function getCount($customId)
+    {
         $nCustoms = parent::executeQuerySingle ('select count(*) from ' . self::getTableName ($customId));
         $entry = new Entry (self::getAllTitle ($customId), self::getAllCustomsId ($customId),
             str_format (localize("tags.alphabetical", $nCustoms), $nCustoms), "text",
@@ -72,7 +83,8 @@ 
         return $entry;
     }
 
-    public static function getCustomById ($customId, $id) {
+    public static function getCustomById ($customId, $id)
+    {
         $result = parent::getDb ()->prepare('select id, value as name from ' . self::getTableName ($customId) . ' where id = ?');
         $result->execute (array ($id));
         if ($post = $result->fetchObject ()) {
@@ -81,15 +93,15 @@ 
         return NULL;
     }
 
-    public static function getAllCustoms($customId) {
+    public static function getAllCustoms($customId)
+    {
         $result = parent::getDb ()->query(str_format ('select {0}.id as id, {0}.value as name, count(*) as count
 from {0}, {1}
 where {0}.id = {1}.{2}
 group by {0}.id, {0}.value
 order by {0}.value', self::getTableName ($customId), self::getTableLinkName ($customId), self::getTableLinkColumn ($customId)));
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $customColumn = new CustomColumn ($post->id, $post->name, $customId);
             array_push ($entryArray, new Entry ($customColumn->name, $customColumn->getEntryId (),
                 str_format (localize("bookword", $post->count), $post->count), "text",

lib/Page.php

Braces +26 added lines, -9 removed lines

@@ -76,7 +76,8 @@ 
         }
     }
 
-    public function __construct($pid, $pquery, $pn) {
+    public function __construct($pid, $pquery, $pn)
+    {
         global $config;
 
         $this->idGet = $pid;
@@ -109,23 +110,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);
@@ -135,7 +146,9 @@ 
             }
             $this->entryArray = array_merge ($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled ()) {
+                $this->title =  Base::getDbName ();
+            }
         }
     }
 
@@ -171,8 +184,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;
     }
 }

lib/Data.php

Braces +42 added lines, -29 removed lines

@@ -55,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;
@@ -64,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 ());
             }
 
@@ -86,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") {
@@ -116,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;
 
@@ -142,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'];
             }
         }
@@ -182,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) {
@@ -197,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);
         }
     }

lib/PageAllBooksLetter.php

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,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);
     }

lib/EntryBook.php

Braces +12 added lines, -7 removed lines

@@ -10,24 +10,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;
     }

lib/LinkNavigation.php

Braces +8 added lines, -3 removed lines

@@ -8,10 +8,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 {

lib/Book.php

Braces +103 added lines, -81 removed lines

@@ -80,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);
@@ -98,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
@@ -159,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 ();
 
@@ -176,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 ()));
     }
 
@@ -198,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)) {
@@ -240,7 +257,8 @@ 
         return reset ($reduced);
     }
 
-    public function getRating () {
+    public function getRating ()
+    {
         if (is_null ($this->rating) || $this->rating == 0) {
             return "";
         }
@@ -254,7 +272,8 @@ 
         return $retour;
     }
 
-    public function getPubDate () {
+    public function getPubDate ()
+    {
         if (empty ($this->pubdate)) {
             return "";
         }
@@ -265,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;
         });
@@ -290,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;
         }
     }
@@ -316,8 +330,7 @@ 
         global $config;
         $data = $this->getDataById ($idData);
 
-        try
-        {
+        try {
             $epub = new EPub ($data->getLocalPath ());
 
             $epub->Title ($this->title);
@@ -340,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;
         }
@@ -386,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));
             }
         }
@@ -414,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();
@@ -443,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;
@@ -501,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,
@@ -512,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 {
@@ -525,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));
@@ -545,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 ());
         }
@@ -561,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;

lib/Rating.php

Braces +15 added lines, -9 removed lines

@@ -15,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);
@@ -52,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 ());

lib/Base.php

Braces +43 added lines, -23 removed lines

@@ -37,23 +37,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'];
@@ -62,7 +66,8 @@ 
         }
     }
 
-    public static function getDbNameList () {
+    public static function getDbNameList ()
+    {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
             return array_keys ($config['calibre_directory']);
@@ -71,10 +76,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);
             }
@@ -84,10 +92,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);
             }
@@ -98,18 +109,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))) {
@@ -127,7 +141,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);
@@ -139,31 +154,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;
@@ -177,7 +197,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 ()) {
@@ -189,8 +210,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);