mbirth / cops

lib/PageLanguageDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageLanguageDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $language = Language::getLanguageById ($this->idGet);
-        $this->idPage = $language->getEntryId ();
+        $language = Language::getLanguageById($this->idGet);
+        $this->idPage = $language->getEntryId();
         $this->title = $language->lang_code;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage($this->idGet, $this->n);
     }
 }

lib/PageAllAuthorsLetter.php

Spacing +4 added lines, -4 removed lines

@@ -8,10 +8,10 @@
 
 class PageAllAuthorsLetter extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->idPage = Author::getEntryIdByLetter ($this->idGet);
-        $this->entryArray = Author::getAuthorsByStartingLetter ($this->idGet);
-        $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("authorword", count ($this->entryArray)), count ($this->entryArray)), $this->idGet);
+        $this->idPage = Author::getEntryIdByLetter($this->idGet);
+        $this->entryArray = Author::getAuthorsByStartingLetter($this->idGet);
+        $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("authorword", count($this->entryArray)), count($this->entryArray)), $this->idGet);
     }
 }

lib/EntryBook.php

Spacing +5 added lines, -5 removed lines

@@ -11,23 +11,23 @@
     public $book;
 
     public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pbook) {
-        parent::__construct ($ptitle, $pid, $pcontent, $pcontentType, $plinkArray);
+        parent::__construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray);
         $this->book = $pbook;
         $this->localUpdated = $pbook->timestamp;
     }
 
-    public function getCoverThumbnail () {
+    public function getCoverThumbnail() {
         foreach ($this->linkArray as $link) {
             if ($link->rel == Link::OPDS_THUMBNAIL_TYPE)
-                return $link->hrefXhtml ();
+                return $link->hrefXhtml();
         }
         return null;
     }
 
-    public function getCover () {
+    public function getCover() {
         foreach ($this->linkArray as $link) {
             if ($link->rel == Link::OPDS_IMAGE_TYPE)
-                return $link->hrefXhtml ();
+                return $link->hrefXhtml();
         }
         return null;
     }

lib/PageSerieDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageSerieDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $serie = Serie::getSerieById ($this->idGet);
+        $serie = Serie::getSerieById($this->idGet);
         $this->title = $serie->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksBySeries ($this->idGet, $this->n);
-        $this->idPage = $serie->getEntryId ();
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksBySeries($this->idGet, $this->n);
+        $this->idPage = $serie->getEntryId();
     }
 }

lib/PageTagDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageTagDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $tag = Tag::getTagById ($this->idGet);
-        $this->idPage = $tag->getEntryId ();
+        $tag = Tag::getTagById($this->idGet);
+        $this->idPage = $tag->getEntryId();
         $this->title = $tag->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByTag ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByTag($this->idGet, $this->n);
     }
 }

lib/LinkNavigation.php

Spacing +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@
 class LinkNavigation extends Link
 {
     public function __construct($phref, $prel = NULL, $ptitle = NULL) {
-        parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
-        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
-        if (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) {
+        parent::__construct($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
+        if (!is_null(GetUrlParam(DB))) $this->href = addURLParameter($this->href, DB, GetUrlParam(DB));
+        if (!preg_match("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
+        if (preg_match("/(bookdetail|getJSON).php/", parent::getScriptName())) {
             $this->href = "index.php" . $this->href;
         } else {
             $this->href = parent::getScriptName() . $this->href;

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

lib/Rating.php

Spacing +20 added lines, -20 removed lines

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

lib/Base.php

Spacing +65 added lines, -65 removed lines

@@ -37,142 +37,142 @@ 
 
     private static $db = NULL;
 
-    public static function isMultipleDatabaseEnabled () {
+    public static function isMultipleDatabaseEnabled() {
         global $config;
-        return is_array ($config['calibre_directory']);
+        return is_array($config['calibre_directory']);
     }
 
-    public static function useAbsolutePath () {
+    public static function useAbsolutePath() {
         global $config;
         $path = self::getDbDirectory();
-        return preg_match ('/^\//', $path) || // Linux /
-               preg_match ('/^\w\:/', $path); // Windows X:
+        return preg_match('/^\//', $path) || // Linux /
+               preg_match('/^\w\:/', $path); // Windows X:
     }
 
-    public static function noDatabaseSelected () {
-        return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB));
+    public static function noDatabaseSelected() {
+        return self::isMultipleDatabaseEnabled() && is_null(GetUrlParam(DB));
     }
 
-    public static function getDbList () {
+    public static function getDbList() {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
+        if (self::isMultipleDatabaseEnabled()) {
             return $config['calibre_directory'];
         } else {
-            return array ("" => $config['calibre_directory']);
+            return array("" => $config['calibre_directory']);
         }
     }
 
-    public static function getDbNameList () {
+    public static function getDbNameList() {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
-            return array_keys ($config['calibre_directory']);
+        if (self::isMultipleDatabaseEnabled()) {
+            return array_keys($config['calibre_directory']);
         } else {
-            return array ("");
+            return array("");
         }
     }
 
-    public static function getDbName ($database = NULL) {
+    public static function getDbName($database = NULL) {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
-            if (is_null ($database)) $database = GetUrlParam (DB, 0);
+        if (self::isMultipleDatabaseEnabled()) {
+            if (is_null($database)) $database = GetUrlParam(DB, 0);
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
-                return self::error ($database);
+                return self::error($database);
             }
-            $array = array_keys ($config['calibre_directory']);
+            $array = array_keys($config['calibre_directory']);
             return  $array[$database];
         }
         return "";
     }
 
-    public static function getDbDirectory ($database = NULL) {
+    public static function getDbDirectory($database = NULL) {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
-            if (is_null ($database)) $database = GetUrlParam (DB, 0);
+        if (self::isMultipleDatabaseEnabled()) {
+            if (is_null($database)) $database = GetUrlParam(DB, 0);
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
-                return self::error ($database);
+                return self::error($database);
             }
-            $array = array_values ($config['calibre_directory']);
+            $array = array_values($config['calibre_directory']);
             return  $array[$database];
         }
         return $config['calibre_directory'];
     }
 
 
-    public static function getDbFileName ($database = NULL) {
-        return self::getDbDirectory ($database) .'metadata.db';
+    public static function getDbFileName($database = NULL) {
+        return self::getDbDirectory($database) . 'metadata.db';
     }
 
-    private static function error ($database) {
+    private static function error($database) {
         if (php_sapi_name() != "cli") {
             header("location: checkconfig.php?err=1");
         }
         throw new Exception("Database <{$database}> not found.");
     }
 
-    public static function getDb ($database = NULL) {
-        if (is_null (self::$db)) {
+    public static function getDb($database = NULL) {
+        if (is_null(self::$db)) {
             try {
-                if (is_readable (self::getDbFileName ($database))) {
-                    self::$db = new PDO('sqlite:'. self::getDbFileName ($database));
-                    if (useNormAndUp ()) {
-                        self::$db->sqliteCreateFunction ('normAndUp', 'normAndUp', 1);
+                if (is_readable(self::getDbFileName($database))) {
+                    self::$db = new PDO('sqlite:' . self::getDbFileName($database));
+                    if (useNormAndUp()) {
+                        self::$db->sqliteCreateFunction('normAndUp', 'normAndUp', 1);
                     }
                 } else {
-                    self::error ($database);
+                    self::error($database);
                 }
             } catch (Exception $e) {
-                self::error ($database);
+                self::error($database);
             }
         }
         return self::$db;
     }
 
-    public static function checkDatabaseAvailability () {
-        if (self::noDatabaseSelected ()) {
-            for ($i = 0; $i < count (self::getDbList ()); $i++) {
-                self::getDb ($i);
-                self::clearDb ();
+    public static function checkDatabaseAvailability() {
+        if (self::noDatabaseSelected()) {
+            for ($i = 0; $i < count(self::getDbList()); $i++) {
+                self::getDb($i);
+                self::clearDb();
             }
         } else {
-            self::getDb ();
+            self::getDb();
         }
         return true;
     }
 
-    public static function clearDb () {
+    public static function clearDb() {
         self::$db = NULL;
     }
 
-    public static function executeQuerySingle ($query, $database = NULL) {
-        return self::getDb ($database)->query($query)->fetchColumn();
+    public static function executeQuerySingle($query, $database = NULL) {
+        return self::getDb($database)->query($query)->fetchColumn();
     }
 
     public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
         }
-        $count = self::executeQuerySingle ('select count(*) from ' . $table);
+        $count = self::executeQuerySingle('select count(*) from ' . $table);
         if ($count == 0) return NULL;
-        $entry = new Entry (localize($table . ".title"), $id,
-            str_format (localize($numberOfString, $count), $count), "text",
-            array ( new LinkNavigation ("?page=".$pageId)), "", $count);
+        $entry = new Entry(localize($table . ".title"), $id,
+            str_format(localize($numberOfString, $count), $count), "text",
+            array(new LinkNavigation("?page=" . $pageId)), "", $count);
         return $entry;
     }
 
-    public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
-        list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
+    public static function getEntryArrayWithBookNumber($query, $columns, $params, $category) {
+        list (, $result) = self::executeQuery($query, $columns, "", $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $instance = new $category ($post);
+            $instance = new $category($post);
             if (property_exists($post, "sort")) {
                 $title = $post->sort;
             } else {
                 $title = $post->name;
             }
-            array_push ($entryArray, new Entry ($title, $instance->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($instance->getUri ())), "", $post->count));
+            array_push($entryArray, new Entry($title, $instance->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($instance->getUri())), "", $post->count));
         }
         return $entryArray;
     }
@@ -180,30 +180,30 @@ 
     public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
         $totalResult = -1;
 
-        if (useNormAndUp ()) {
+        if (useNormAndUp()) {
             $query = preg_replace("/upper/", "normAndUp", $query);
             $columns = preg_replace("/upper/", "normAndUp", $columns);
         }
 
-        if (is_null ($numberPerPage)) {
-            $numberPerPage = getCurrentOption ("max_item_per_page");
+        if (is_null($numberPerPage)) {
+            $numberPerPage = getCurrentOption("max_item_per_page");
         }
 
         if ($numberPerPage != -1 && $n != -1)
         {
             // First check total number of results
-            $result = self::getDb ($database)->prepare (str_format ($query, "count(*)", $filter));
-            $result->execute ($params);
-            $totalResult = $result->fetchColumn ();
+            $result = self::getDb($database)->prepare(str_format($query, "count(*)", $filter));
+            $result->execute($params);
+            $totalResult = $result->fetchColumn();
 
             // Next modify the query and params
             $query .= " limit ?, ?";
-            array_push ($params, ($n - 1) * $numberPerPage, $numberPerPage);
+            array_push($params, ($n - 1) * $numberPerPage, $numberPerPage);
         }
 
-        $result = self::getDb ($database)->prepare(str_format ($query, $columns, $filter));
-        $result->execute ($params);
-        return array ($totalResult, $result);
+        $result = self::getDb($database)->prepare(str_format($query, $columns, $filter));
+        $result->execute($params);
+        return array($totalResult, $result);
     }
 
 }