seblucas / cops

lib/JSON_renderer.php

Indentation +50 added lines, -50 removed lines

@@ -24,7 +24,7 @@ 
             if ($data = $book->getDataFormat ($format)) {
                 $i++;
                 array_push ($preferedData, array ("url" => $data->getHtmlLink (),
-                  "viewUrl" => $data->getViewHtmlLink (), "name" => $format));
+                    "viewUrl" => $data->getViewHtmlLink (), "name" => $format));
             }
         }
 
@@ -52,20 +52,20 @@ 
         $cc = $book->getCustomColumnValues($config['cops_calibre_custom_column_list'], true);
 
         return array ("id" => $book->id,
-                      "hasCover" => $book->hasCover,
-                      "preferedData" => $preferedData,
-                      "rating" => $book->getRating (),
-                      "publisherName" => $pn,
-                      "publisherurl" => $pu,
-                      "pubDate" => $book->getPubDate (),
-                      "languagesName" => $book->getLanguages (),
-                      "authorsName" => $book->getAuthorsName (),
-                      "tagsName" => $book->getTagsName (),
-                      "seriesName" => $sn,
-                      "seriesIndex" => $book->seriesIndex,
-                      "seriesCompleteName" => $scn,
-                      "seriesurl" => $su,
-                      "customcolumns_list" => $cc);
+                        "hasCover" => $book->hasCover,
+                        "preferedData" => $preferedData,
+                        "rating" => $book->getRating (),
+                        "publisherName" => $pn,
+                        "publisherurl" => $pu,
+                        "pubDate" => $book->getPubDate (),
+                        "languagesName" => $book->getLanguages (),
+                        "authorsName" => $book->getAuthorsName (),
+                        "tagsName" => $book->getTagsName (),
+                        "seriesName" => $sn,
+                        "seriesIndex" => $book->seriesIndex,
+                        "seriesCompleteName" => $scn,
+                        "seriesurl" => $su,
+                        "customcolumns_list" => $cc);
     }
 
     /**
@@ -148,46 +148,46 @@ 
         $out = $in;
 
         $out ["c"] = array ("version" => VERSION, "i18n" => array (
-                           "coverAlt" => localize("i18n.coversection"),
-                           "authorsTitle" => localize("authors.title"),
-                           "bookwordTitle" => localize("bookword.title"),
-                           "tagsTitle" => localize("tags.title"),
-                           "linksTitle" => localize("links.title"),
-                           "seriesTitle" => localize("series.title"),
-                           "customizeTitle" => localize ("customize.title"),
-                           "aboutTitle" => localize ("about.title"),
-                           "previousAlt" => localize ("paging.previous.alternate"),
-                           "nextAlt" => localize ("paging.next.alternate"),
-                           "searchAlt" => localize ("search.alternate"),
-                           "sortAlt" => localize ("sort.alternate"),
-                           "homeAlt" => localize ("home.alternate"),
-                           "cogAlt" => localize ("cog.alternate"),
-                           "permalinkAlt" => localize ("permalink.alternate"),
-                           "publisherName" => localize("publisher.name"),
-                           "pubdateTitle" => localize("pubdate.title"),
-                           "languagesTitle" => localize("language.title"),
-                           "contentTitle" => localize("content.summary"),
-                           "filterClearAll" => localize("filter.clearall"),
-                           "sortorderAsc" => localize("search.sortorder.asc"),
-                           "sortorderDesc" => localize("search.sortorder.desc"),
-                           "customizeEmail" => localize("customize.email")),
-                       "url" => array (
-                           "detailUrl" => "index.php?page=13&id={0}&db={1}",
-                           "coverUrl" => "fetch.php?id={0}&db={1}",
-                           "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
-                       "config" => array (
-                           "use_fancyapps" => $config ["cops_use_fancyapps"],
-                           "max_item_per_page" => $config['cops_max_item_per_page'],
-                           "kindleHack"        => "",
-                           "server_side_rendering" => useServerSideRendering (),
-                           "html_tag_filter" => $config['cops_html_tag_filter']));
+                            "coverAlt" => localize("i18n.coversection"),
+                            "authorsTitle" => localize("authors.title"),
+                            "bookwordTitle" => localize("bookword.title"),
+                            "tagsTitle" => localize("tags.title"),
+                            "linksTitle" => localize("links.title"),
+                            "seriesTitle" => localize("series.title"),
+                            "customizeTitle" => localize ("customize.title"),
+                            "aboutTitle" => localize ("about.title"),
+                            "previousAlt" => localize ("paging.previous.alternate"),
+                            "nextAlt" => localize ("paging.next.alternate"),
+                            "searchAlt" => localize ("search.alternate"),
+                            "sortAlt" => localize ("sort.alternate"),
+                            "homeAlt" => localize ("home.alternate"),
+                            "cogAlt" => localize ("cog.alternate"),
+                            "permalinkAlt" => localize ("permalink.alternate"),
+                            "publisherName" => localize("publisher.name"),
+                            "pubdateTitle" => localize("pubdate.title"),
+                            "languagesTitle" => localize("language.title"),
+                            "contentTitle" => localize("content.summary"),
+                            "filterClearAll" => localize("filter.clearall"),
+                            "sortorderAsc" => localize("search.sortorder.asc"),
+                            "sortorderDesc" => localize("search.sortorder.desc"),
+                            "customizeEmail" => localize("customize.email")),
+                        "url" => array (
+                            "detailUrl" => "index.php?page=13&id={0}&db={1}",
+                            "coverUrl" => "fetch.php?id={0}&db={1}",
+                            "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
+                        "config" => array (
+                            "use_fancyapps" => $config ["cops_use_fancyapps"],
+                            "max_item_per_page" => $config['cops_max_item_per_page'],
+                            "kindleHack"        => "",
+                            "server_side_rendering" => useServerSideRendering (),
+                            "html_tag_filter" => $config['cops_html_tag_filter']));
         if ($config['cops_thumbnail_handling'] == "1") {
             $out ["c"]["url"]["thumbnailUrl"] = $out ["c"]["url"]["coverUrl"];
         } else if (!empty ($config['cops_thumbnail_handling'])) {
             $out ["c"]["url"]["thumbnailUrl"] = $config['cops_thumbnail_handling'];
         }
         if (preg_match("/./", $_SERVER['HTTP_USER_AGENT'])) {
-          $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
+            $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
         }
         return $out;
     }
@@ -246,7 +246,7 @@ 
         }
         if (!is_null (getURLParam ("complete")) || $complete) {
             $out = self::addCompleteArray ($out);
-       }
+        }
 
         $out ["containsBook"] = 0;
         if ($currentPage->containsBook ()) {

Spacing +99 added lines, -99 removed lines

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

lib/Book.php

Spacing +59 added lines, -59 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');
 
 require('Identifier.php');
@@ -108,7 +108,7 @@ 
     public $tags = NULL;
     public $identifiers = NULL;
     public $languages = NULL;
-    public $format = array ();
+    public $format = array();
 
 
     public function __construct($line) {
@@ -130,24 +130,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;
     }
 
@@ -156,22 +156,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);
         }
@@ -210,7 +210,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
@@ -228,7 +228,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()));
     }
 
 
@@ -236,7 +236,7 @@ 
      * @return Identifiers[]
      */
     public function getIdentifiers() {
-        if (is_null ($this->identifiers)) {
+        if (is_null($this->identifiers)) {
             $this->identifiers = array();
 
             $result = parent::getDb()->prepare('select type, val, id
@@ -302,7 +302,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);
@@ -326,7 +326,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);
         }
@@ -335,8 +335,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))
@@ -350,7 +350,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);
@@ -371,11 +371,11 @@ 
 
         if ($relative)
         {
-            return $this->relativePath.'/'.$file;
+            return $this->relativePath . '/' . $file;
         }
         else
         {
-            return $this->path.'/'.$file;
+            return $this->path . '/' . $file;
         }
     }
 
@@ -395,7 +395,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);
@@ -405,7 +405,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();
             }
@@ -431,11 +431,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;
@@ -443,16 +443,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();
 
@@ -477,7 +477,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)));
         }
 
@@ -502,13 +502,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;
@@ -604,7 +604,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);
     }
 
@@ -621,7 +621,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;
     }
@@ -646,7 +646,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;
     }
 

lib/Identifier.php

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
     public function __construct($post)
     {
         $this->id = $post->id;
-        $this->type = strtolower($post->type);;
+        $this->type = strtolower($post->type); ;
         $this->val = $post->val;
         $this->formatType();
     }