seblucas / cops

lib/Page.php

Spacing +66 added lines, -66 removed lines

@@ -24,55 +24,55 @@ 
     /* @var Entry[] */
     public $entryArray = array();
 
-    public static function getPage ($pageId, $id, $query, $n)
+    public static function getPage($pageId, $id, $query, $n)
     {
         switch ($pageId) {
             case Base::PAGE_ALL_AUTHORS :
-                return new PageAllAuthors ($id, $query, $n);
+                return new PageAllAuthors($id, $query, $n);
             case Base::PAGE_AUTHORS_FIRST_LETTER :
-                return new PageAllAuthorsLetter ($id, $query, $n);
+                return new PageAllAuthorsLetter($id, $query, $n);
             case Base::PAGE_AUTHOR_DETAIL :
-                return new PageAuthorDetail ($id, $query, $n);
+                return new PageAuthorDetail($id, $query, $n);
             case Base::PAGE_ALL_TAGS :
-                return new PageAllTags ($id, $query, $n);
+                return new PageAllTags($id, $query, $n);
             case Base::PAGE_TAG_DETAIL :
-                return new PageTagDetail ($id, $query, $n);
+                return new PageTagDetail($id, $query, $n);
             case Base::PAGE_ALL_LANGUAGES :
-                return new PageAllLanguages ($id, $query, $n);
+                return new PageAllLanguages($id, $query, $n);
             case Base::PAGE_LANGUAGE_DETAIL :
-                return new PageLanguageDetail ($id, $query, $n);
+                return new PageLanguageDetail($id, $query, $n);
             case Base::PAGE_ALL_CUSTOMS :
-                return new PageAllCustoms ($id, $query, $n);
+                return new PageAllCustoms($id, $query, $n);
             case Base::PAGE_CUSTOM_DETAIL :
-                return new PageCustomDetail ($id, $query, $n);
+                return new PageCustomDetail($id, $query, $n);
             case Base::PAGE_ALL_RATINGS :
-                return new PageAllRating ($id, $query, $n);
+                return new PageAllRating($id, $query, $n);
             case Base::PAGE_RATING_DETAIL :
-                return new PageRatingDetail ($id, $query, $n);
+                return new PageRatingDetail($id, $query, $n);
             case Base::PAGE_ALL_SERIES :
-                return new PageAllSeries ($id, $query, $n);
+                return new PageAllSeries($id, $query, $n);
             case Base::PAGE_ALL_BOOKS :
-                return new PageAllBooks ($id, $query, $n);
+                return new PageAllBooks($id, $query, $n);
             case Base::PAGE_ALL_BOOKS_LETTER:
-                return new PageAllBooksLetter ($id, $query, $n);
+                return new PageAllBooksLetter($id, $query, $n);
             case Base::PAGE_ALL_RECENT_BOOKS :
-                return new PageRecentBooks ($id, $query, $n);
+                return new PageRecentBooks($id, $query, $n);
             case Base::PAGE_SERIE_DETAIL :
-                return new PageSerieDetail ($id, $query, $n);
+                return new PageSerieDetail($id, $query, $n);
             case Base::PAGE_OPENSEARCH_QUERY :
-                return new PageQueryResult ($id, $query, $n);
+                return new PageQueryResult($id, $query, $n);
             case Base::PAGE_BOOK_DETAIL :
-                return new PageBookDetail ($id, $query, $n);
+                return new PageBookDetail($id, $query, $n);
             case Base::PAGE_ALL_PUBLISHERS:
-                return new PageAllPublishers ($id, $query, $n);
+                return new PageAllPublishers($id, $query, $n);
             case Base::PAGE_PUBLISHER_DETAIL :
-                return new PagePublisherDetail ($id, $query, $n);
+                return new PagePublisherDetail($id, $query, $n);
             case Base::PAGE_ABOUT :
-                return new PageAbout ($id, $query, $n);
+                return new PageAbout($id, $query, $n);
             case Base::PAGE_CUSTOMIZE :
-                return new PageCustomize ($id, $query, $n);
+                return new PageCustomize($id, $query, $n);
             default:
-                $page = new Page ($id, $query, $n);
+                $page = new Page($id, $query, $n);
                 $page->idPage = "cops:catalog";
                 return $page;
         }
@@ -85,96 +85,96 @@ 
         $this->query = $pquery;
         $this->n = $pn;
         $this->favicon = $config['cops_icon'];
-        $this->authorName = empty($config['cops_author_name']) ? utf8_encode('Sébastien Lucas') : $config['cops_author_name'];
-        $this->authorUri = empty($config['cops_author_uri']) ? 'http://blog.slucas.fr' : $config['cops_author_uri'];
-        $this->authorEmail = empty($config['cops_author_email']) ? 'sebastien@slucas.fr' : $config['cops_author_email'];
+        $this->authorName = empty($config['cops_author_name'])? utf8_encode('Sébastien Lucas'):$config['cops_author_name'];
+        $this->authorUri = empty($config['cops_author_uri'])?'http://blog.slucas.fr':$config['cops_author_uri'];
+        $this->authorEmail = empty($config['cops_author_email'])?'sebastien@slucas.fr':$config['cops_author_email'];
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         global $config;
         $this->title = $config['cops_title_default'];
         $this->subtitle = $config['cops_subtitle_default'];
-        if (Base::noDatabaseSelected ()) {
+        if (Base::noDatabaseSelected()) {
             $i = 0;
-            foreach (Base::getDbNameList () as $key) {
-                $nBooks = Book::getBookCount ($i);
-                array_push ($this->entryArray, new Entry ($key, "cops:{$i}:catalog",
-                                        str_format (localize ("bookword", $nBooks), $nBooks), "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$i}")), "", $nBooks));
+            foreach (Base::getDbNameList() as $key) {
+                $nBooks = Book::getBookCount($i);
+                array_push($this->entryArray, new Entry($key, "cops:{$i}:catalog",
+                                        str_format(localize("bookword", $nBooks), $nBooks), "text",
+                                        array(new LinkNavigation("?" . DB . "={$i}")), "", $nBooks));
                 $i++;
-                Base::clearDb ();
+                Base::clearDb();
             }
         } else {
-            if (!in_array (PageQueryResult::SCOPE_AUTHOR, getCurrentOption ('ignored_categories'))) {
-                array_push ($this->entryArray, Author::getCount());
+            if (!in_array(PageQueryResult::SCOPE_AUTHOR, getCurrentOption('ignored_categories'))) {
+                array_push($this->entryArray, Author::getCount());
             }
-            if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_SERIES, getCurrentOption('ignored_categories'))) {
                 $series = Serie::getCount();
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
+                if (!is_null($series)) array_push($this->entryArray, $series);
             }
-            if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_PUBLISHER, getCurrentOption('ignored_categories'))) {
                 $publisher = Publisher::getCount();
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
+                if (!is_null($publisher)) array_push($this->entryArray, $publisher);
             }
-            if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_TAG, getCurrentOption('ignored_categories'))) {
                 $tags = Tag::getCount();
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
+                if (!is_null($tags)) array_push($this->entryArray, $tags);
             }
-            if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_RATING, getCurrentOption('ignored_categories'))) {
                 $rating = Rating::getCount();
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
+                if (!is_null($rating)) array_push($this->entryArray, $rating);
             }
-            if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
+            if (!in_array("language", getCurrentOption('ignored_categories'))) {
                 $languages = Language::getCount();
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
+                if (!is_null($languages)) array_push($this->entryArray, $languages);
             }
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
                 $customColumn = CustomColumnType::createByLookup($lookup);
-                if (!is_null ($customColumn) && $customColumn->isSearchable()) {
-                    array_push ($this->entryArray, $customColumn->getCount());
+                if (!is_null($customColumn) && $customColumn->isSearchable()) {
+                    array_push($this->entryArray, $customColumn->getCount());
                 }
             }
-            $this->entryArray = array_merge ($this->entryArray, Book::getCount());
+            $this->entryArray = array_merge($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled()) $this->title = Base::getDbName();
         }
     }
 
-    public function isPaginated ()
+    public function isPaginated()
     {
-        return (getCurrentOption ("max_item_per_page") != -1 &&
+        return (getCurrentOption("max_item_per_page") != -1 &&
                 $this->totalNumber != -1 &&
-                $this->totalNumber > getCurrentOption ("max_item_per_page"));
+                $this->totalNumber > getCurrentOption("max_item_per_page"));
     }
 
-    public function getNextLink ()
+    public function getNextLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
-        if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
+        if (($this->n) * getCurrentOption("max_item_per_page") < $this->totalNumber) {
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n + 1), "next", localize("paging.next.alternate"));
         }
         return NULL;
     }
 
-    public function getPrevLink ()
+    public function getPrevLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
         if ($this->n > 1) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n - 1), "previous", localize("paging.previous.alternate"));
         }
         return NULL;
     }
 
-    public function getMaxPage ()
+    public function getMaxPage()
     {
-        return ceil ($this->totalNumber / getCurrentOption ("max_item_per_page"));
+        return ceil($this->totalNumber / getCurrentOption("max_item_per_page"));
     }
 
-    public function containsBook ()
+    public function containsBook()
     {
-        if (count ($this->entryArray) == 0) return false;
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
+        if (count($this->entryArray) == 0) return false;
+        if (get_class($this->entryArray [0]) == "EntryBook") return true;
         return false;
     }
 }

lib/Book.php

Spacing +58 added lines, -58 removed lines

@@ -7,55 +7,55 @@ 
  */
 
 // 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_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = 1 {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = 0 {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books.id not in (select book from {2}) {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     left join {2} on {2}.book = books.id
                                                     left join {3} on {3}.id = {2}.{4}
                                                     where {3}.value = ?  order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
 								                    left join {2} on {2}.book = books.id
 								                    left join {3} on {3}.id = {2}.{4}
                                                     where ((books.id not in (select {2}.book from {2})) or ({3}.value = 0)) {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and date({2}.value) = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.id = ? {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
@@ -105,7 +105,7 @@ 
     public $serie = NULL;
     public $tags = NULL;
     public $languages = NULL;
-    public $format = array ();
+    public $format = array();
 
 
     public function __construct($line) {
@@ -127,24 +127,24 @@ 
     }
 
     public function getEntryId() {
-        return self::ALL_BOOKS_UUID.':'.$this->uuid;
+        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 () {
+    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;
     }
 
@@ -153,22 +153,22 @@ 
     /**
      * @return Author[]
      */
-    public function getAuthors () {
+    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 () {
+    public function getPublisher() {
         if (is_null($this->publisher)) {
             $this->publisher = Publisher::getPublisherByBookId($this->id);
         }
@@ -207,7 +207,7 @@ 
      * @return Tag[]
      */
     public function getTags() {
-        if (is_null ($this->tags)) {
+        if (is_null($this->tags)) {
             $this->tags = array();
 
             $result = parent::getDb()->prepare('select tags.id as id, name
@@ -225,7 +225,7 @@ 
     }
 
     public function getTagsName() {
-        return implode(', ', array_map(function ($tag) { return $tag->name; }, $this->getTags()));
+        return implode(', ', array_map(function($tag) { return $tag->name; }, $this->getTags()));
     }
 
     /**
@@ -277,7 +277,7 @@ 
 
     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);
@@ -301,7 +301,7 @@ 
         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);
         }
@@ -310,8 +310,8 @@ 
 
     public function getComment($withSerie = true) {
         $addition = '';
-        $se = $this->getSerie ();
-        if (!is_null ($se) && $withSerie) {
+        $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))
@@ -325,7 +325,7 @@ 
     }
 
     public function getDataFormat($format) {
-        $reduced = array_filter($this->getDatas(), function ($data) use ($format) {
+        $reduced = array_filter($this->getDatas(), function($data) use ($format) {
             return $data->format == $format;
         });
         return reset($reduced);
@@ -346,11 +346,11 @@ 
 
         if ($relative)
         {
-            return $this->relativePath.'/'.$file;
+            return $this->relativePath . '/' . $file;
         }
         else
         {
-            return $this->path.'/'.$file;
+            return $this->path . '/' . $file;
         }
     }
 
@@ -370,7 +370,7 @@ 
             }
             $epub->Authors($authorArray);
             $epub->Language($this->getLanguages());
-            $epub->Description ($this->getComment(false));
+            $epub->Description($this->getComment(false));
             $epub->Subjects($this->getTagsName());
             $epub->Cover2($this->getFilePath('jpg'), 'image/jpeg');
             $epub->Calibre($this->uuid);
@@ -380,7 +380,7 @@ 
                 $epub->SerieIndex($this->seriesIndex);
             }
             $filename = $data->getUpdatedFilenameEpub();
-            if ($config['cops_provide_kepub'] == '1'  && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
+            if ($config['cops_provide_kepub'] == '1' && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
                 $epub->updateForKepub();
                 $filename = $data->getUpdatedFilenameKepub();
             }
@@ -406,11 +406,11 @@ 
             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;
@@ -418,16 +418,16 @@ 
 
         //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();
 
@@ -452,7 +452,7 @@ 
         }
 
         $serie = $this->getSerie();
-        if (!is_null ($serie)) {
+        if (!is_null($serie)) {
             array_push($linkArray, new LinkNavigation($serie->getUri(), 'related', str_format(localize('content.series.data'), $this->seriesIndex, $serie->name)));
         }
 
@@ -477,13 +477,13 @@ 
         $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(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS)), '', $nBooks);
         array_push($result, $entry);
         if ($config['cops_recentbooks_limit'] > 0) {
             $entry = new Entry(localize('recent.title'),
                               self::ALL_RECENT_BOOKS_ID,
                               str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text',
-                              array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
+                              array(new LinkNavigation('?page=' . parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
             array_push($result, $entry);
         }
         return $result;
@@ -579,7 +579,7 @@ 
     }
 
     public static function getBooks($n) {
-        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL , array (), $n);
+        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL, array(), $n);
         return array($entryArray, $totalNumber);
     }
 
@@ -596,7 +596,7 @@ 
         {
             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(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS_LETTER . '&id=' . rawurlencode($post->title))), '', $post->count));
         }
         return $entryArray;
     }
@@ -621,7 +621,7 @@ 
 
     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;
     }
 

base.php

Spacing +23 added lines, -23 removed lines

@@ -8,8 +8,8 @@ 
 
 require 'config.php';
 
-define ('VERSION', '1.1.3');
-define ('DB', 'db');
+define('VERSION', '1.1.3');
+define('DB', 'db');
 date_default_timezone_set($config['default_timezone']);
 
 
@@ -22,7 +22,7 @@ 
 function serverSideRender($data)
 {
     // Get the templates
-    $theme = getCurrentTemplate ();
+    $theme = getCurrentTemplate();
     $header = file_get_contents('templates/' . $theme . '/header.html');
     $footer = file_get_contents('templates/' . $theme . '/footer.html');
     $main = file_get_contents('templates/' . $theme . '/main.html');
@@ -30,8 +30,8 @@ 
     $page = file_get_contents('templates/' . $theme . '/page.html');
 
     // Generate the function for the template
-    $template = new doT ();
-    $dot = $template->template ($page, array ('bookdetail' => $bookdetail,
+    $template = new doT();
+    $dot = $template->template($page, array('bookdetail' => $bookdetail,
                                               'header' => $header,
                                               'footer' => $footer,
                                               'main' => $main));
@@ -42,7 +42,7 @@ 
     }
     // Execute the template
     if (!empty ($data)) {
-        return $dot ($data);
+        return $dot($data);
     }
 
     return NULL;
@@ -58,7 +58,7 @@ 
 
 function notFound()
 {
-    header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
+    header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
     header('Status: 404 Not Found');
 
     $_SERVER['REDIRECT_STATUS'] = 404;
@@ -76,8 +76,8 @@ 
 {
     global $config;
     if (isset($_COOKIE[$option])) {
-        if (isset($config ['cops_' . $option]) && is_array ($config ['cops_' . $option])) {
-            return explode (',', $_COOKIE[$option]);
+        if (isset($config ['cops_' . $option]) && is_array($config ['cops_' . $option])) {
+            return explode(',', $_COOKIE[$option]);
         } else {
             return $_COOKIE[$option];
         }
@@ -91,12 +91,12 @@ 
 
 function getCurrentCss()
 {
-    return 'templates/' . getCurrentTemplate () . '/styles/style-' . getCurrentOption('style') . '.css';
+    return 'templates/' . getCurrentTemplate() . '/styles/style-' . getCurrentOption('style') . '.css';
 }
 
 function getCurrentTemplate()
 {
-    return getCurrentOption ('template');
+    return getCurrentOption('template');
 }
 
 function getUrlWithVersion($url)
@@ -160,10 +160,10 @@ 
     libxml_use_internal_errors(true);
 
     $doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
-                        $html  . '</body></html>'); // Load the HTML
+                        $html . '</body></html>'); // Load the HTML
     $output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
     $output = xml2xhtml($output);
-    if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
+    if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
         $output = $matches [1]; // Remove <html><body>
     }
     /*
@@ -175,7 +175,7 @@ 
     }
     */
 
-    if (!are_libxml_errors_ok ()) $output = 'HTML code not valid.';
+    if (!are_libxml_errors_ok()) $output = 'HTML code not valid.';
 
     libxml_use_internal_errors(false);
     return $output;
@@ -264,7 +264,7 @@ 
     //echo var_dump($langs);
     $lang_file = NULL;
     foreach ($langs as $language => $val) {
-        $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
+        $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
             $lang = $language;
             $lang_file = $temp_file;
@@ -272,7 +272,7 @@ 
         }
     }
     if (empty ($lang_file)) {
-        $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
+        $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
     }
     return array($lang, $lang_file);
 }
@@ -281,7 +281,7 @@ 
  * This method is based on this page
  * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
  */
-function localize($phrase, $count=-1, $reset=false)
+function localize($phrase, $count = -1, $reset = false)
 {
     global $config;
     if ($count == 0)
@@ -301,7 +301,7 @@ 
         $lang_file_en = NULL;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != 'en') {
-            $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
+            $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
         }
 
         $lang_file_content = file_get_contents($lang_file);
@@ -309,18 +309,18 @@ 
         $translations = json_decode($lang_file_content, true);
 
         /* Clean the array of all unfinished translations */
-        foreach (array_keys ($translations) as $key) {
-            if (preg_match ('/^##TODO##/', $key)) {
+        foreach (array_keys($translations) as $key) {
+            if (preg_match('/^##TODO##/', $key)) {
                 unset ($translations [$key]);
             }
         }
         if (!is_null($lang_file_en)) {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
-            $translations = array_merge ($translations_en, $translations);
+            $translations = array_merge($translations_en, $translations);
         }
     }
-    if (array_key_exists ($phrase, $translations)) {
+    if (array_key_exists($phrase, $translations)) {
         return $translations[$phrase];
     }
     return $phrase;
@@ -332,7 +332,7 @@ 
         $urlParams = '';
     }
     $start = '';
-    if (preg_match ('#^\?(.*)#', $urlParams, $matches)) {
+    if (preg_match('#^\?(.*)#', $urlParams, $matches)) {
         $start = '?';
         $urlParams = $matches[1];
     }