seblucas / cops

lib/PageRecentBooks.php

Spacing +3 added lines, -3 removed lines

@@ -8,10 +8,10 @@
 
 class PageRecentBooks extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("recent.title");
-        $this->entryArray = Book::getAllRecentBooks ();
+        $this->title = localize("recent.title");
+        $this->entryArray = Book::getAllRecentBooks();
         $this->idPage = Book::ALL_RECENT_BOOKS_ID;
     }
 }

lib/Language.php

Spacing +19 added lines, -19 removed lines

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

Braces +15 added lines, -9 removed lines

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

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         if ($post = $result->fetchObject ()) {
             return new Language ($post->id, Language::getLanguageString ($post->lang_code));
         }
-        return NULL;
+        return null;
     }
 
 

lib/CustomColumnTypeComment.php

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@ 
 
     protected function getAllCustomValuesFromDatabase()
     {
-        return NULL;
+        return null;
     }
 
     public function getDescription()
     {
         $desc = $this->getDatabaseDescription();
-        if ($desc === NULL || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle());
+        if ($desc === null || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle());
         return $desc;
     }
 
@@ -60,7 +60,7 @@ 
         if ($post = $result->fetchObject()) {
             return new CustomColumn($post->id, $post->value, $this);
         }
-        return new CustomColumn(NULL, localize("customcolumn.float.unknown"), $this);
+        return new CustomColumn(null, localize("customcolumn.float.unknown"), $this);
     }
 
     public function isSearchable()

Braces +3 added lines, -1 removed lines

@@ -55,7 +55,9 @@
     public function getDescription()
     {
         $desc = $this->getDatabaseDescription();
-        if ($desc === NULL || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle());
+        if ($desc === NULL || empty($desc)) {
+            $desc = str_format(localize("customcolumn.description"), $this->getTitle());
+        }
         return $desc;
     }
 

lib/JSON_renderer.php

Braces +16 added lines, -9 removed lines

@@ -14,12 +14,12 @@ 
      * @param Book $book
      * @return array
      */
-    public static function getBookContentArray ($book) {
+    public static function getBookContentArray ($book)
+    {
         global $config;
         $i = 0;
         $preferedData = array ();
-        foreach ($config['cops_prefered_format'] as $format)
-        {
+        foreach ($config['cops_prefered_format'] as $format) {
             if ($i == 2) { break; }
             if ($data = $book->getDataFormat ($format)) {
                 $i++;
@@ -71,7 +71,8 @@ 
      * @param Book $book
      * @return array
      */
-    public static function getFullBookContentArray ($book) {
+    public static function getFullBookContentArray ($book)
+    {
         global $config;
         $out = self::getBookContentArray ($book);
         $database = GetUrlParam (DB);
@@ -106,7 +107,8 @@ 
         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);
@@ -115,7 +117,8 @@ 
         return array ( "title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink (), "number" => $entry->numberOfElement );
     }
 
-    public static function getContentArrayTypeahead ($page) {
+    public static function getContentArrayTypeahead ($page)
+    {
         $out = array ();
         foreach ($page->entryArray as $entry) {
             if ($entry instanceof EntryBook) {
@@ -131,7 +134,8 @@ 
         return $out;
     }
 
-    public static function addCompleteArray ($in) {
+    public static function addCompleteArray ($in)
+    {
         global $config;
         $out = $in;
 
@@ -178,7 +182,8 @@ 
         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");
@@ -247,7 +252,9 @@ 
         }
 
         $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;
     }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -76,8 +76,8 @@
         $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 ["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 ();

Indentation +47 added lines, -47 removed lines

@@ -51,20 +51,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);
     }
 
     /**
@@ -136,44 +136,44 @@ 
         $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"),
-                           "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"),
-                           "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"),
+                            "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"),
+                            "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;
     }
@@ -232,7 +232,7 @@ 
         }
         if (!is_null (getURLParam ("complete")) || $complete) {
             $out = self::addCompleteArray ($out);
-       }
+        }
 
         $out ["containsBook"] = 0;
         if ($currentPage->containsBook ()) {

Spacing +94 added lines, -94 removed lines

@@ -14,52 +14,52 @@ 
      * @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 (), "name" => $format));
+                array_push($preferedData, array("url" => $data->getHtmlLink(), "name" => $format));
             }
         }
 
         $publisher = $book->getPublisher();
-        if (is_null ($publisher)) {
+        if (is_null($publisher)) {
             $pn = "";
             $pu = "";
         } else {
             $pn = $publisher->name;
-            $link = new LinkNavigation ($publisher->getUri ());
-            $pu = $link->hrefXhtml ();
+            $link = new LinkNavigation($publisher->getUri());
+            $pu = $link->hrefXhtml();
         }
 
-        $serie = $book->getSerie ();
-        if (is_null ($serie)) {
+        $serie = $book->getSerie();
+        if (is_null($serie)) {
             $sn = "";
             $scn = "";
             $su = "";
         } else {
             $sn = $serie->name;
-            $scn = str_format (localize ("content.series.data"), $book->seriesIndex, $serie->name);
-            $link = new LinkNavigation ($serie->getUri ());
-            $su = $link->hrefXhtml ();
+            $scn = str_format(localize("content.series.data"), $book->seriesIndex, $serie->name);
+            $link = new LinkNavigation($serie->getUri());
+            $su = $link->hrefXhtml();
         }
         $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,
@@ -71,85 +71,85 @@ 
      * @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 ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml ();
-        $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml ();
-        $out ["content"] = $book->getComment (false);
-        $out ["datas"] = array ();
-        $dataKindle = $book->GetMostInterestingDataToSendToKindle ();
+        $out = self::getBookContentArray($book);
+        $database = GetUrlParam(DB);
+
+        $out ["coverurl"] = Data::getLink($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml();
+        $out ["thumbnailurl"] = Data::getLink($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml();
+        $out ["content"] = $book->getComment(false);
+        $out ["datas"] = array();
+        $dataKindle = $book->GetMostInterestingDataToSendToKindle();
         foreach ($book->getDatas() as $data) {
-            $tab = array ("id" => $data->id, "format" => $data->format, "url" => $data->getHtmlLink (), "mail" => 0, "readerUrl" => "");
-            if (!empty ($config['cops_mail_configuration']) && !is_null ($dataKindle) && $data->id == $dataKindle->id) {
+            $tab = array("id" => $data->id, "format" => $data->format, "url" => $data->getHtmlLink(), "mail" => 0, "readerUrl" => "");
+            if (!empty ($config['cops_mail_configuration']) && !is_null($dataKindle) && $data->id == $dataKindle->id) {
                 $tab ["mail"] = 1;
             }
             if ($data->format == "EPUB") {
                 $tab ["readerUrl"] = "epubreader.php?data={$data->id}&db={$database}";
             }
-            array_push ($out ["datas"], $tab);
+            array_push($out ["datas"], $tab);
         }
-        $out ["authors"] = array ();
-        foreach ($book->getAuthors () as $author) {
-            $link = new LinkNavigation ($author->getUri ());
-            array_push ($out ["authors"], array ("name" => $author->name, "url" => $link->hrefXhtml ()));
+        $out ["authors"] = array();
+        foreach ($book->getAuthors() as $author) {
+            $link = new LinkNavigation($author->getUri());
+            array_push($out ["authors"], array("name" => $author->name, "url" => $link->hrefXhtml()));
         }
-        $out ["tags"] = array ();
-        foreach ($book->getTags () as $tag) {
-            $link = new LinkNavigation ($tag->getUri ());
-            array_push ($out ["tags"], array ("name" => $tag->name, "url" => $link->hrefXhtml ()));
+        $out ["tags"] = array();
+        foreach ($book->getTags() as $tag) {
+            $link = new LinkNavigation($tag->getUri());
+            array_push($out ["tags"], array("name" => $tag->name, "url" => $link->hrefXhtml()));
         }
         $out ["customcolumns_preview"] = $book->getCustomColumnValues($config['cops_calibre_custom_column_preview'], true);
 
         return $out;
     }
 
-    public static function getContentArray ($entry) {
+    public static function getContentArray($entry) {
         if ($entry instanceof EntryBook) {
-            $out = array ( "title" => $entry->title);
-            $out ["book"] = self::getBookContentArray ($entry->book);
+            $out = array("title" => $entry->title);
+            $out ["book"] = self::getBookContentArray($entry->book);
             return $out;
         }
-        return array ( "title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink (), "number" => $entry->numberOfElement );
+        return array("title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink(), "number" => $entry->numberOfElement);
     }
 
-    public static function getContentArrayTypeahead ($page) {
-        $out = array ();
+    public static function getContentArrayTypeahead($page) {
+        $out = array();
         foreach ($page->entryArray as $entry) {
             if ($entry instanceof EntryBook) {
-                array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->book->getDetailUrl ()));
+                array_push($out, array("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->book->getDetailUrl()));
             } else {
-                if (empty ($entry->className) xor Base::noDatabaseSelected ()) {
-                    array_push ($out, array ("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->getNavLink ()));
+                if (empty ($entry->className) xor Base::noDatabaseSelected()) {
+                    array_push($out, array("class" => $entry->className, "title" => $entry->title, "navlink" => $entry->getNavLink()));
                 } else {
-                    array_push ($out, array ("class" => $entry->className, "title" => $entry->content, "navlink" => $entry->getNavLink ()));
+                    array_push($out, array("class" => $entry->className, "title" => $entry->content, "navlink" => $entry->getNavLink()));
                 }
             }
         }
         return $out;
     }
 
-    public static function addCompleteArray ($in) {
+    public static function addCompleteArray($in) {
         global $config;
         $out = $in;
 
-        $out ["c"] = array ("version" => VERSION, "i18n" => array (
+        $out ["c"] = array("version" => VERSION, "i18n" => array(
                            "coverAlt" => localize("i18n.coversection"),
                            "authorsTitle" => localize("authors.title"),
                            "bookwordTitle" => localize("bookword.title"),
                            "tagsTitle" => localize("tags.title"),
                            "seriesTitle" => localize("series.title"),
-                           "customizeTitle" => localize ("customize.title"),
-                           "aboutTitle" => localize ("about.title"),
-                           "previousAlt" => localize ("paging.previous.alternate"),
-                           "nextAlt" => localize ("paging.next.alternate"),
-                           "searchAlt" => localize ("search.alternate"),
-                           "sortAlt" => localize ("sort.alternate"),
-                           "homeAlt" => localize ("home.alternate"),
-                           "cogAlt" => localize ("cog.alternate"),
-                           "permalinkAlt" => localize ("permalink.alternate"),
+                           "customizeTitle" => localize("customize.title"),
+                           "aboutTitle" => localize("about.title"),
+                           "previousAlt" => localize("paging.previous.alternate"),
+                           "nextAlt" => localize("paging.next.alternate"),
+                           "searchAlt" => localize("search.alternate"),
+                           "sortAlt" => localize("sort.alternate"),
+                           "homeAlt" => localize("home.alternate"),
+                           "cogAlt" => localize("cog.alternate"),
+                           "permalinkAlt" => localize("permalink.alternate"),
                            "publisherName" => localize("publisher.name"),
                            "pubdateTitle" => localize("pubdate.title"),
                            "languagesTitle" => localize("language.title"),
@@ -157,15 +157,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"];
@@ -178,32 +178,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"] = "";
         }
@@ -212,42 +212,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/PageAllBooks.php

Spacing +4 added lines, -4 removed lines

@@ -8,14 +8,14 @@
 
 class PageAllBooks extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("allbooks.title");
-        if (getCurrentOption ("titles_split_first_letter") == 1) {
+        $this->title = localize("allbooks.title");
+        if (getCurrentOption("titles_split_first_letter") == 1) {
             $this->entryArray = Book::getAllBooks();
         }
         else {
-            list ($this->entryArray, $this->totalNumber) = Book::getBooks ($this->n);
+            list ($this->entryArray, $this->totalNumber) = Book::getBooks($this->n);
         }
         $this->idPage = Book::ALL_BOOKS_ID;
     }

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
         $this->title = localize ("allbooks.title");
         if (getCurrentOption ("titles_split_first_letter") == 1) {
             $this->entryArray = Book::getAllBooks();
-        }
-        else {
+        } else {
             list ($this->entryArray, $this->totalNumber) = Book::getBooks ($this->n);
         }
         $this->idPage = Book::ALL_BOOKS_ID;

lib/Publisher.php

Spacing +17 added lines, -17 removed lines

@@ -22,45 +22,45 @@
         $this->name = $post->name;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_PUBLISHER_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_PUBLISHER_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_PUBLISHERS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_PUBLISHERS_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("publishers.alphabetical", count(array))
-        return parent::getCountGeneric ("publishers", self::ALL_PUBLISHERS_ID, parent::PAGE_ALL_PUBLISHERS);
+        return parent::getCountGeneric("publishers", self::ALL_PUBLISHERS_ID, parent::PAGE_ALL_PUBLISHERS);
     }
 
-    public static function getPublisherByBookId ($bookId) {
-        $result = parent::getDb ()->prepare('select publishers.id as id, name
+    public static function getPublisherByBookId($bookId) {
+        $result = parent::getDb()->prepare('select publishers.id as id, name
 from books_publishers_link, publishers
 where publishers.id = publisher and book = ?');
-        $result->execute (array ($bookId));
-        if ($post = $result->fetchObject ()) {
-            return new Publisher ($post);
+        $result->execute(array($bookId));
+        if ($post = $result->fetchObject()) {
+            return new Publisher($post);
         }
         return NULL;
     }
 
-    public static function getPublisherById ($publisherId) {
-        $result = parent::getDb ()->prepare('select id, name
+    public static function getPublisherById($publisherId) {
+        $result = parent::getDb()->prepare('select id, name
 from publishers where id = ?');
-        $result->execute (array ($publisherId));
-        if ($post = $result->fetchObject ()) {
-            return new Publisher ($post);
+        $result->execute(array($publisherId));
+        if ($post = $result->fetchObject()) {
+            return new Publisher($post);
         }
         return NULL;
     }
 
     public static function getAllPublishers() {
-        return Base::getEntryArrayWithBookNumber (self::SQL_ALL_PUBLISHERS, self::PUBLISHERS_COLUMNS, array (), "Publisher");
+        return Base::getEntryArrayWithBookNumber(self::SQL_ALL_PUBLISHERS, self::PUBLISHERS_COLUMNS, array(), "Publisher");
     }
 
     public static function getAllPublishersByQuery($query) {
-        return Base::getEntryArrayWithBookNumber (self::SQL_PUBLISHERS_FOR_SEARCH, self::PUBLISHERS_COLUMNS, array ('%' . $query . '%'), "Publisher");
+        return Base::getEntryArrayWithBookNumber(self::SQL_PUBLISHERS_FOR_SEARCH, self::PUBLISHERS_COLUMNS, array('%' . $query . '%'), "Publisher");
     }
 }

Braces +16 added lines, -8 removed lines

@@ -17,25 +17,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_PUBLISHER_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_PUBLISHERS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("publishers.alphabetical", count(array))
         return parent::getCountGeneric ("publishers", self::ALL_PUBLISHERS_ID, parent::PAGE_ALL_PUBLISHERS);
     }
 
-    public static function getPublisherByBookId ($bookId) {
+    public static function getPublisherByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select publishers.id as id, name
 from books_publishers_link, publishers
 where publishers.id = publisher and book = ?');
@@ -46,7 +51,8 @@ 
         return NULL;
     }
 
-    public static function getPublisherById ($publisherId) {
+    public static function getPublisherById ($publisherId)
+    {
         $result = parent::getDb ()->prepare('select id, name
 from publishers where id = ?');
         $result->execute (array ($publisherId));
@@ -56,11 +62,13 @@ 
         return NULL;
     }
 
-    public static function getAllPublishers() {
+    public static function getAllPublishers()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_PUBLISHERS, self::PUBLISHERS_COLUMNS, array (), "Publisher");
     }
 
-    public static function getAllPublishersByQuery($query) {
+    public static function getAllPublishersByQuery($query)
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_PUBLISHERS_FOR_SEARCH, self::PUBLISHERS_COLUMNS, array ('%' . $query . '%'), "Publisher");
     }
 }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new Publisher ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getPublisherById ($publisherId) {
@@ -53,7 +53,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new Publisher ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllPublishers() {

Doc Comments +3 added lines

@@ -60,6 +60,9 @@
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_PUBLISHERS, self::PUBLISHERS_COLUMNS, array (), "Publisher");
     }
 
+    /**
+     * @param string $query
+     */
     public static function getAllPublishersByQuery($query) {
         return Base::getEntryArrayWithBookNumber (self::SQL_PUBLISHERS_FOR_SEARCH, self::PUBLISHERS_COLUMNS, array ('%' . $query . '%'), "Publisher");
     }

lib/PagePublisherDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PagePublisherDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $publisher = Publisher::getPublisherById ($this->idGet);
+        $publisher = Publisher::getPublisherById($this->idGet);
         $this->title = $publisher->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByPublisher ($this->idGet, $this->n);
-        $this->idPage = $publisher->getEntryId ();
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByPublisher($this->idGet, $this->n);
+        $this->idPage = $publisher->getEntryId();
     }
 }

lib/PageAllRating.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class PageAllRating extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("ratings.title");
         $this->entryArray = Rating::getAllRatings();

lib/PageAllTags.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class PageAllTags extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("tags.title");
         $this->entryArray = Tag::getAllTags();