seblucas / cops

lib/Author.php

Spacing +29 added lines, -29 removed lines

@@ -25,69 +25,69 @@
         $this->sort = $post->sort;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_AUTHOR_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_AUTHOR_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_AUTHORS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_AUTHORS_ID . ":" . $this->id;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
-        return self::ALL_AUTHORS_ID.":letter:".$startingLetter;
+    public static function getEntryIdByLetter($startingLetter) {
+        return self::ALL_AUTHORS_ID . ":letter:" . $startingLetter;
     }
 
     public static function getCount() {
         // str_format (localize("authors.alphabetical", count(array))
-        return parent::getCountGeneric ("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS);
+        return parent::getCountGeneric("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS);
     }
 
     public static function getAllAuthorsByFirstLetter() {
-        list (, $result) = parent::executeQuery ("select {0}
+        list (, $result) = parent::executeQuery("select {0}
 from authors
 group by substr (upper (sort), 1, 1)
-order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array (), -1);
+order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array(), -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            array_push ($entryArray, new Entry ($post->title, Author::getEntryIdByLetter ($post->title),
-                str_format (localize("authorword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ("?page=".parent::PAGE_AUTHORS_FIRST_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
+            array_push($entryArray, new Entry($post->title, Author::getEntryIdByLetter($post->title),
+                str_format(localize("authorword", $post->count), $post->count), "text",
+                array(new LinkNavigation("?page=" . parent::PAGE_AUTHORS_FIRST_LETTER . "&id=" . rawurlencode($post->title))), "", $post->count));
         }
         return $entryArray;
     }
 
     public static function getAuthorsByStartingLetter($letter) {
-        return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%"));
+        return self::getEntryArray(self::SQL_AUTHORS_BY_FIRST_LETTER, array($letter . "%"));
     }
 
     public static function getAuthorsForSearch($query) {
-        return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%"));
+        return self::getEntryArray(self::SQL_AUTHORS_FOR_SEARCH, array($query . "%", $query . "%"));
     }
 
     public static function getAllAuthors() {
-        return self::getEntryArray (self::SQL_ALL_AUTHORS, array ());
+        return self::getEntryArray(self::SQL_ALL_AUTHORS, array());
     }
 
-    public static function getEntryArray ($query, $params) {
-        return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
+    public static function getEntryArray($query, $params) {
+        return Base::getEntryArrayWithBookNumber($query, self::AUTHOR_COLUMNS, $params, "Author");
     }
 
-    public static function getAuthorById ($authorId) {
-        $result = parent::getDb ()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
-        $result->execute (array ($authorId));
-        $post = $result->fetchObject ();
-        return new Author ($post);
+    public static function getAuthorById($authorId) {
+        $result = parent::getDb()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
+        $result->execute(array($authorId));
+        $post = $result->fetchObject();
+        return new Author($post);
     }
 
-    public static function getAuthorByBookId ($bookId) {
-        $result = parent::getDb ()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
+    public static function getAuthorByBookId($bookId) {
+        $result = parent::getDb()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
 where author = authors.id
 and book = ? order by books_authors_link.id');
-        $result->execute (array ($bookId));
-        $authorArray = array ();
-        while ($post = $result->fetchObject ()) {
-            array_push ($authorArray, new Author ($post));
+        $result->execute(array($bookId));
+        $authorArray = array();
+        while ($post = $result->fetchObject()) {
+            array_push($authorArray, new Author($post));
         }
         return $authorArray;
     }

Braces +25 added lines, -14 removed lines

@@ -19,37 +19,42 @@ 
     public $name;
     public $sort;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = str_replace("|", ",", $post->name);
         $this->sort = $post->sort;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_AUTHOR_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_AUTHORS_ID.":".$this->id;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
+    public static function getEntryIdByLetter ($startingLetter)
+    {
         return self::ALL_AUTHORS_ID.":letter:".$startingLetter;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("authors.alphabetical", count(array))
         return parent::getCountGeneric ("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS);
     }
 
-    public static function getAllAuthorsByFirstLetter() {
+    public static function getAllAuthorsByFirstLetter()
+    {
         list (, $result) = parent::executeQuery ("select {0}
 from authors
 group by substr (upper (sort), 1, 1)
 order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array (), -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             array_push ($entryArray, new Entry ($post->title, Author::getEntryIdByLetter ($post->title),
                 str_format (localize("authorword", $post->count), $post->count), "text",
                 array ( new LinkNavigation ("?page=".parent::PAGE_AUTHORS_FIRST_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
@@ -57,30 +62,36 @@ 
         return $entryArray;
     }
 
-    public static function getAuthorsByStartingLetter($letter) {
+    public static function getAuthorsByStartingLetter($letter)
+    {
         return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%"));
     }
 
-    public static function getAuthorsForSearch($query) {
+    public static function getAuthorsForSearch($query)
+    {
         return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%"));
     }
 
-    public static function getAllAuthors() {
+    public static function getAllAuthors()
+    {
         return self::getEntryArray (self::SQL_ALL_AUTHORS, array ());
     }
 
-    public static function getEntryArray ($query, $params) {
+    public static function getEntryArray ($query, $params)
+    {
         return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
     }
 
-    public static function getAuthorById ($authorId) {
+    public static function getAuthorById ($authorId)
+    {
         $result = parent::getDb ()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
         $result->execute (array ($authorId));
         $post = $result->fetchObject ();
         return new Author ($post);
     }
 
-    public static function getAuthorByBookId ($bookId) {
+    public static function getAuthorByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
 where author = authors.id
 and book = ? order by books_authors_link.id');

lib/PageCustomize.php

Indentation +5 added lines, -5 removed lines

@@ -55,11 +55,11 @@
         $this->entryArray = array ();
 
         $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR,
-                                   PageQueryResult::SCOPE_TAG,
-                                   PageQueryResult::SCOPE_SERIES,
-                                   PageQueryResult::SCOPE_PUBLISHER,
-                                   PageQueryResult::SCOPE_RATING,
-                                   "language");
+                                    PageQueryResult::SCOPE_TAG,
+                                    PageQueryResult::SCOPE_SERIES,
+                                    PageQueryResult::SCOPE_PUBLISHER,
+                                    PageQueryResult::SCOPE_RATING,
+                                    "language");
 
         $content = "";
         if (!preg_match("/(Kobo|Kindle\/3.0|EBRD1101)/", $_SERVER['HTTP_USER_AGENT'])) {

Spacing +49 added lines, -49 removed lines

@@ -8,10 +8,10 @@ 
 
 class PageCustomize extends Page
 {
-    private function isChecked ($key, $testedValue = 1) {
-        $value = getCurrentOption ($key);
-        if (is_array ($value)) {
-            if (in_array ($testedValue, $value)) {
+    private function isChecked($key, $testedValue = 1) {
+        $value = getCurrentOption($key);
+        if (is_array($value)) {
+            if (in_array($testedValue, $value)) {
                 return "checked='checked'";
             }
         } else {
@@ -22,39 +22,39 @@ 
         return "";
     }
 
-    private function isSelected ($key, $value) {
-        if (getCurrentOption ($key) == $value) {
+    private function isSelected($key, $value) {
+        if (getCurrentOption($key) == $value) {
             return "selected='selected'";
         }
         return "";
     }
 
-    private function getTemplateList () {
-        $result = array ();
-        foreach (glob ("templates/*") as $filename) {
-            if (preg_match ('/templates\/(.*)/', $filename, $m)) {
-                array_push ($result, $m [1]);
+    private function getTemplateList() {
+        $result = array();
+        foreach (glob("templates/*") as $filename) {
+            if (preg_match('/templates\/(.*)/', $filename, $m)) {
+                array_push($result, $m [1]);
             }            
         }
         return $result;
     }    
 
-    private function getStyleList () {
-        $result = array ();
-        foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) {
-            if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) {
-                array_push ($result, $m [1]);
+    private function getStyleList() {
+        $result = array();
+        foreach (glob("templates/" . getCurrentTemplate() . "/styles/style-*.css") as $filename) {
+            if (preg_match('/styles\/style-(.*?)\.css/', $filename, $m)) {
+                array_push($result, $m [1]);
             }
         }
         return $result;
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("customize.title");
-        $this->entryArray = array ();
+        $this->title = localize("customize.title");
+        $this->entryArray = array();
 
-        $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR,
+        $ignoredBaseArray = array(PageQueryResult::SCOPE_AUTHOR,
                                    PageQueryResult::SCOPE_TAG,
                                    PageQueryResult::SCOPE_SERIES,
                                    PageQueryResult::SCOPE_PUBLISHER,
@@ -65,60 +65,60 @@ 
         if (!preg_match("/(Kobo|Kindle\/3.0|EBRD1101)/", $_SERVER['HTTP_USER_AGENT'])) {
             $content .= "<select id='template' onchange='updateCookie (this); window.location=$(\".headleft\").attr(\"href\");'>";
 
-            foreach ($this-> getTemplateList () as $filename) {
-                $content .= "<option value='{$filename}' " . $this->isSelected ("template", $filename) . ">{$filename}</option>";
+            foreach ($this-> getTemplateList() as $filename) {
+                $content .= "<option value='{$filename}' " . $this->isSelected("template", $filename) . ">{$filename}</option>";
             }
             $content .= '</select>';
         } else {
-            foreach ($this-> getTemplateList () as $filename) {
-                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this); window.location=$(\".headleft\").attr(\"href\");' id='template' name='template' value='{$filename}' " . $this->isChecked ("template", $filename) . " /><label for='template-{$filename}'> {$filename} </label>";
+            foreach ($this-> getTemplateList() as $filename) {
+                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this); window.location=$(\".headleft\").attr(\"href\");' id='template' name='template' value='{$filename}' " . $this->isChecked("template", $filename) . " /><label for='template-{$filename}'> {$filename} </label>";
             }
         }
-        array_push ($this->entryArray, new Entry ("Template", "",
+        array_push($this->entryArray, new Entry("Template", "",
                                         $content, "text",
-                                        array ()));
+                                        array()));
 
         $content = "";
         if (!preg_match("/(Kobo|Kindle\/3.0|EBRD1101)/", $_SERVER['HTTP_USER_AGENT'])) {
             $content .= '<select id="style" onchange="updateCookie (this);">';
-            foreach ($this-> getStyleList () as $filename) {
-                $content .= "<option value='{$filename}' " . $this->isSelected ("style", $filename) . ">{$filename}</option>";
+            foreach ($this-> getStyleList() as $filename) {
+                $content .= "<option value='{$filename}' " . $this->isSelected("style", $filename) . ">{$filename}</option>";
             }
             $content .= '</select>';
         } else {
-            foreach ($this-> getStyleList () as $filename) {
-                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked ("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>";
+            foreach ($this-> getStyleList() as $filename) {
+                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>";
             }
         }
-        array_push ($this->entryArray, new Entry (localize ("customize.style"), "",
+        array_push($this->entryArray, new Entry(localize("customize.style"), "",
                                         $content, "text",
-                                        array ()));
-        if (!useServerSideRendering ()) {
-            $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked ("use_fancyapps") . ' />';
-            array_push ($this->entryArray, new Entry (localize ("customize.fancybox"), "",
+                                        array()));
+        if (!useServerSideRendering()) {
+            $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked("use_fancyapps") . ' />';
+            array_push($this->entryArray, new Entry(localize("customize.fancybox"), "",
                                             $content, "text",
-                                            array ()));
+                                            array()));
         }
-        $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption ("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />';
-        array_push ($this->entryArray, new Entry (localize ("customize.paging"), "",
+        $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />';
+        array_push($this->entryArray, new Entry(localize("customize.paging"), "",
                                         $content, "text",
-                                        array ()));
-        $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption ("email") . '" />';
-        array_push ($this->entryArray, new Entry (localize ("customize.email"), "",
+                                        array()));
+        $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption("email") . '" />';
+        array_push($this->entryArray, new Entry(localize("customize.email"), "",
                                         $content, "text",
-                                        array ()));
-        $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked ("html_tag_filter") . ' />';
-        array_push ($this->entryArray, new Entry (localize ("customize.filter"), "",
+                                        array()));
+        $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked("html_tag_filter") . ' />';
+        array_push($this->entryArray, new Entry(localize("customize.filter"), "",
                                         $content, "text",
-                                        array ()));
+                                        array()));
         $content = "";
         foreach ($ignoredBaseArray as $key) {
-            $keyPlural = preg_replace ('/(ss)$/', 's', $key . "s");
-            $content .=  '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked ("ignored_categories", $key) . ' > ' . localize ("{$keyPlural}.title") . '</input> ';
+            $keyPlural = preg_replace('/(ss)$/', 's', $key . "s");
+            $content .= '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked("ignored_categories", $key) . ' > ' . localize("{$keyPlural}.title") . '</input> ';
         }
 
-        array_push ($this->entryArray, new Entry (localize ("customize.ignored"), "",
+        array_push($this->entryArray, new Entry(localize("customize.ignored"), "",
                                         $content, "text",
-                                        array ()));
+                                        array()));
     }
 }

Braces +8 added lines, -4 removed lines

@@ -8,7 +8,8 @@ 
 
 class PageCustomize extends Page
 {
-    private function isChecked ($key, $testedValue = 1) {
+    private function isChecked ($key, $testedValue = 1)
+    {
         $value = getCurrentOption ($key);
         if (is_array ($value)) {
             if (in_array ($testedValue, $value)) {
@@ -22,14 +23,16 @@ 
         return "";
     }
 
-    private function isSelected ($key, $value) {
+    private function isSelected ($key, $value)
+    {
         if (getCurrentOption ($key) == $value) {
             return "selected='selected'";
         }
         return "";
     }
 
-    private function getTemplateList () {
+    private function getTemplateList ()
+    {
         $result = array ();
         foreach (glob ("templates/*") as $filename) {
             if (preg_match ('/templates\/(.*)/', $filename, $m)) {
@@ -39,7 +42,8 @@ 
         return $result;
     }    
 
-    private function getStyleList () {
+    private function getStyleList ()
+    {
         $result = array ();
         foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) {
             if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) {

lib/Data.php

Doc Comments +10 added lines

@@ -152,6 +152,9 @@ 
         return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
+    /**
+     * @param Book $book
+     */
     public static function getDataByBook ($book) {
         global $config;
 
@@ -176,6 +179,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $urlParam
+     */
     public static function handleThumbnailLink ($urlParam, $height) {
         global $config;
 
@@ -195,6 +201,10 @@ 
         return $urlParam;
     }
 
+    /**
+     * @param string $type
+     * @param string $filename
+     */
     public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL, $view = false)
     {
         global $config;

Spacing +44 added lines, -44 removed lines

@@ -59,25 +59,25 @@ 
         $this->id = $post->id;
         $this->name = $post->name;
         $this->format = $post->format;
-        $this->realFormat = str_replace ("ORIGINAL_", "", $post->format);
-        $this->extension = strtolower ($this->realFormat);
+        $this->realFormat = str_replace("ORIGINAL_", "", $post->format);
+        $this->extension = strtolower($this->realFormat);
         $this->book = $book;
     }
 
-    public function isKnownType () {
-        return array_key_exists ($this->extension, self::$mimetypes);
+    public function isKnownType() {
+        return array_key_exists($this->extension, self::$mimetypes);
     }
 
-    public function getMimeType () {
+    public function getMimeType() {
         $result = "application/octet-stream";
-        if ($this->isKnownType ()) {
+        if ($this->isKnownType()) {
             return self::$mimetypes [$this->extension];
         } elseif (function_exists('finfo_open') === true) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
             if (is_resource($finfo) === true)
             {
-                $result = finfo_file($finfo, $this->getLocalPath ());
+                $result = finfo_file($finfo, $this->getLocalPath());
             }
 
             finfo_close($finfo);
@@ -86,55 +86,55 @@ 
         return $result;
     }
 
-    public function isEpubValidOnKobo () {
+    public function isEpubValidOnKobo() {
         return $this->format == "EPUB" || $this->format == "KEPUB";
     }
 
-    public function getFilename () {
-        return $this->name . "." . strtolower ($this->format);
+    public function getFilename() {
+        return $this->name . "." . strtolower($this->format);
     }
 
-    public function getUpdatedFilename () {
-        return $this->book->getAuthorsSort () . " - " . $this->book->title;
+    public function getUpdatedFilename() {
+        return $this->book->getAuthorsSort() . " - " . $this->book->title;
     }
 
-    public function getUpdatedFilenameEpub () {
-        return $this->getUpdatedFilename () . ".epub";
+    public function getUpdatedFilenameEpub() {
+        return $this->getUpdatedFilename() . ".epub";
     }
 
-    public function getUpdatedFilenameKepub () {
-        $str = $this->getUpdatedFilename () . ".kepub.epub";
+    public function getUpdatedFilenameKepub() {
+        $str = $this->getUpdatedFilename() . ".kepub.epub";
         return str_replace(array(':', '#', '&'),
-                           array('-', '-', ' '), $str );
+                           array('-', '-', ' '), $str);
     }
 
-    public function getDataLink ($rel, $title = NULL, $view = false) {
+    public function getDataLink($rel, $title = NULL, $view = false) {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
             return $this->getHtmlLinkWithRewriting($title, $view);
         }
 
-        return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title, NULL, $view);
+        return self::getLink($this->book, $this->extension, $this->getMimeType(), $rel, $this->getFilename(), $this->id, $title, NULL, $view);
     }
 
-    public function getHtmlLink () {
+    public function getHtmlLink() {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE)->href;
     }
 
-    public function getViewHtmlLink () {
+    public function getViewHtmlLink() {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE, NULL, true)->href;
     }
 
-    public function getLocalPath () {
-        return $this->book->path . "/" . $this->getFilename ();
+    public function getLocalPath() {
+        return $this->book->path . "/" . $this->getFilename();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL, $view = false) {
+    public function getHtmlLinkWithRewriting($title = NULL, $view = false) {
         global $config;
 
         $database = "";
-        if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
+        if (!is_null(GetUrlParam(DB))) $database = GetUrlParam(DB) . "/";
 
         $prefix = "download";
         if ($view) {
@@ -143,19 +143,19 @@ 
         $href = $prefix . "/" . $this->id . "/" . $database;
 
         if ($config['cops_provide_kepub'] == "1" &&
-            $this->isEpubValidOnKobo () &&
+            $this->isEpubValidOnKobo() &&
             preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) {
-            $href .= rawurlencode ($this->getUpdatedFilenameKepub ());
+            $href .= rawurlencode($this->getUpdatedFilenameKepub());
         } else {
-            $href .= rawurlencode ($this->getFilename ());
+            $href .= rawurlencode($this->getFilename());
         }
-        return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
+        return new Link($href, $this->getMimeType(), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
-    public static function getDataByBook ($book) {
+    public static function getDataByBook($book) {
         global $config;
 
-        $out = array ();
+        $out = array();
 
         $sql = 'select id, format, name from data where book = ?';
         
@@ -166,21 +166,21 @@ 
             . "')";
         }
 
-        $result = parent::getDb ()->prepare($sql);
-        $result->execute (array ($book->id));
+        $result = parent::getDb()->prepare($sql);
+        $result->execute(array($book->id));
 
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            array_push ($out, new Data ($post, $book));
+            array_push($out, new Data($post, $book));
         }
         return $out;
     }
 
-    public static function handleThumbnailLink ($urlParam, $height) {
+    public static function handleThumbnailLink($urlParam, $height) {
         global $config;
 
-        if (is_null ($height)) {
-            if (preg_match ('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
+        if (is_null($height)) {
+            if (preg_match('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
                 $height = $config['cops_opds_thumbnail_height'];
             }
             else
@@ -195,14 +195,14 @@ 
         return $urlParam;
     }
 
-    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL, $view = false)
+    public static function getLink($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL, $view = false)
     {
         global $config;
 
         $urlParam = addURLParameter("", "data", $idData);
         if ($view) $urlParam = addURLParameter($urlParam, "view", 1);
 
-        if (Base::useAbsolutePath () ||
+        if (Base::useAbsolutePath() ||
             $rel == Link::OPDS_THUMBNAIL_TYPE ||
             ($type == "epub" && $config['cops_update_epub-metadata']))
         {
@@ -211,18 +211,18 @@ 
                 $urlParam = self::handleThumbnailLink($urlParam, $height);
             }
             $urlParam = addURLParameter($urlParam, "id", $book->id);
-            if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+            if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam(DB));
             if ($config['cops_thumbnail_handling'] != "1" &&
                 !empty ($config['cops_thumbnail_handling']) &&
                 $rel == Link::OPDS_THUMBNAIL_TYPE) {
-                return new Link ($config['cops_thumbnail_handling'], $mime, $rel, $title);
+                return new Link($config['cops_thumbnail_handling'], $mime, $rel, $title);
             } else {
-                return new Link ("fetch.php?" . $urlParam, $mime, $rel, $title);
+                return new Link("fetch.php?" . $urlParam, $mime, $rel, $title);
             }
         }
         else
         {
-            return new Link (str_replace('%2F','/',rawurlencode ($book->path."/".$filename)), $mime, $rel, $title);
+            return new Link(str_replace('%2F', '/', rawurlencode($book->path . "/" . $filename)), $mime, $rel, $title);
         }
     }
 }

Braces +47 added lines, -31 removed lines

@@ -55,7 +55,8 @@ 
         'zip'   => 'application/zip'
     );
 
-    public function __construct($post, $book = null) {
+    public function __construct($post, $book = null)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
         $this->format = $post->format;
@@ -64,19 +65,20 @@ 
         $this->book = $book;
     }
 
-    public function isKnownType () {
+    public function isKnownType ()
+    {
         return array_key_exists ($this->extension, self::$mimetypes);
     }
 
-    public function getMimeType () {
+    public function getMimeType ()
+    {
         $result = "application/octet-stream";
         if ($this->isKnownType ()) {
             return self::$mimetypes [$this->extension];
         } elseif (function_exists('finfo_open') === true) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
-            if (is_resource($finfo) === true)
-            {
+            if (is_resource($finfo) === true) {
                 $result = finfo_file($finfo, $this->getLocalPath ());
             }
 
@@ -86,29 +88,35 @@ 
         return $result;
     }
 
-    public function isEpubValidOnKobo () {
+    public function isEpubValidOnKobo ()
+    {
         return $this->format == "EPUB" || $this->format == "KEPUB";
     }
 
-    public function getFilename () {
+    public function getFilename ()
+    {
         return $this->name . "." . strtolower ($this->format);
     }
 
-    public function getUpdatedFilename () {
+    public function getUpdatedFilename ()
+    {
         return $this->book->getAuthorsSort () . " - " . $this->book->title;
     }
 
-    public function getUpdatedFilenameEpub () {
+    public function getUpdatedFilenameEpub ()
+    {
         return $this->getUpdatedFilename () . ".epub";
     }
 
-    public function getUpdatedFilenameKepub () {
+    public function getUpdatedFilenameKepub ()
+    {
         $str = $this->getUpdatedFilename () . ".kepub.epub";
         return str_replace(array(':', '#', '&'),
                            array('-', '-', ' '), $str );
     }
 
-    public function getDataLink ($rel, $title = NULL, $view = false) {
+    public function getDataLink ($rel, $title = NULL, $view = false)
+    {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
@@ -118,23 +126,29 @@ 
         return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title, NULL, $view);
     }
 
-    public function getHtmlLink () {
+    public function getHtmlLink ()
+    {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE)->href;
     }
 
-    public function getViewHtmlLink () {
+    public function getViewHtmlLink ()
+    {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE, NULL, true)->href;
     }
 
-    public function getLocalPath () {
+    public function getLocalPath ()
+    {
         return $this->book->path . "/" . $this->getFilename ();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL, $view = false) {
+    public function getHtmlLinkWithRewriting ($title = NULL, $view = false)
+    {
         global $config;
 
         $database = "";
-        if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
+        if (!is_null (GetUrlParam (DB))) {
+            $database = GetUrlParam (DB) . "/";
+        }
 
         $prefix = "download";
         if ($view) {
@@ -152,7 +166,8 @@ 
         return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
-    public static function getDataByBook ($book) {
+    public static function getDataByBook ($book)
+    {
         global $config;
 
         $out = array ();
@@ -169,22 +184,20 @@ 
         $result = parent::getDb ()->prepare($sql);
         $result->execute (array ($book->id));
 
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             array_push ($out, new Data ($post, $book));
         }
         return $out;
     }
 
-    public static function handleThumbnailLink ($urlParam, $height) {
+    public static function handleThumbnailLink ($urlParam, $height)
+    {
         global $config;
 
         if (is_null ($height)) {
             if (preg_match ('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
                 $height = $config['cops_opds_thumbnail_height'];
-            }
-            else
-            {
+            } else {
                 $height = $config['cops_html_thumbnail_height'];
             }
         }
@@ -200,18 +213,23 @@ 
         global $config;
 
         $urlParam = addURLParameter("", "data", $idData);
-        if ($view) $urlParam = addURLParameter($urlParam, "view", 1);
+        if ($view) {
+            $urlParam = addURLParameter($urlParam, "view", 1);
+        }
 
         if (Base::useAbsolutePath () ||
             $rel == Link::OPDS_THUMBNAIL_TYPE ||
-            ($type == "epub" && $config['cops_update_epub-metadata']))
-        {
-            if ($type != "jpg") $urlParam = addURLParameter($urlParam, "type", $type);
+            ($type == "epub" && $config['cops_update_epub-metadata'])) {
+            if ($type != "jpg") {
+                $urlParam = addURLParameter($urlParam, "type", $type);
+            }
             if ($rel == Link::OPDS_THUMBNAIL_TYPE) {
                 $urlParam = self::handleThumbnailLink($urlParam, $height);
             }
             $urlParam = addURLParameter($urlParam, "id", $book->id);
-            if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+            if (!is_null (GetUrlParam (DB))) {
+                $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+            }
             if ($config['cops_thumbnail_handling'] != "1" &&
                 !empty ($config['cops_thumbnail_handling']) &&
                 $rel == Link::OPDS_THUMBNAIL_TYPE) {
@@ -219,9 +237,7 @@ 
             } else {
                 return new Link ("fetch.php?" . $urlParam, $mime, $rel, $title);
             }
-        }
-        else
-        {
+        } else {
             return new Link (str_replace('%2F','/',rawurlencode ($book->path."/".$filename)), $mime, $rel, $title);
         }
     }

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

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

@@ -101,13 +101,13 @@ 
     public $seriesIndex;
     public $comment;
     public $rating;
-    public $datas = NULL;
-    public $authors = NULL;
-    public $publisher = NULL;
-    public $serie = NULL;
-    public $tags = NULL;
-    public $identifiers = NULL;
-    public $languages = NULL;
+    public $datas = null;
+    public $authors = null;
+    public $publisher = null;
+    public $serie = null;
+    public $tags = null;
+    public $identifiers = null;
+    public $languages = null;
     public $format = array ();
 
 
@@ -267,7 +267,7 @@ 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
     public static function getFilterString() {
-        $filter = getURLParam('tag', NULL);
+        $filter = getURLParam('tag', null);
         if (empty($filter)) return '';
 
         $exists = true;
@@ -289,7 +289,7 @@ 
     {
         $bestFormatForKindle = array('EPUB', 'PDF', 'AZW3', 'MOBI');
         $bestRank = -1;
-        $bestData = NULL;
+        $bestData = null;
         foreach ($this->getDatas() as $data) {
             $key = array_search($data->format, $bestFormatForKindle);
             if ($key !== false && $key > $bestRank) {
@@ -356,7 +356,7 @@ 
         return reset($reduced);
     }
 
-    public function getFilePath($extension, $idData = NULL, $relative = false)
+    public function getFilePath($extension, $idData = null, $relative = false)
     {
         if ($extension == 'jpg')
         {
@@ -365,7 +365,7 @@ 
         else
         {
             $data = $this->getDataById($idData);
-            if (!$data) return NULL;
+            if (!$data) return null;
             $file = $data->name . '.' . strtolower($data->format);
         }
 
@@ -417,7 +417,7 @@ 
         }
     }
 
-    public function getThumbnail($width, $height, $outputfile = NULL) {
+    public function getThumbnail($width, $height, $outputfile = null) {
         if (is_null($width) && is_null($height)) {
             return false;
         }
@@ -458,9 +458,9 @@ 
 
         if ($this->hasCover)
         {
-            array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
+            array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', null));
 
-            array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
+            array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', null));
         }
 
         foreach ($this->getDatas() as $data)
@@ -491,7 +491,7 @@ 
             $this->getLinkArray(), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = null) {
         return parent::executeQuerySingle('select count(*) from books', $database);
     }
 
@@ -560,7 +560,7 @@ 
             $book = new Book($post);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
     public static function getBookByDataId($dataId) {
@@ -576,10 +576,10 @@ 
             $book->datas = array($data);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
-    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByQuery($query, $n, $database = null, $numberPerPage = null) {
         $i = 0;
         $critArray = array();
         foreach (array(PageQueryResult::SCOPE_AUTHOR,
@@ -626,11 +626,11 @@ 
         return $entryArray;
     }
 
-    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByStartingLetter($letter, $n, $database = null, $numberPerPage = null) {
         return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getEntryArray($query, $params, $n, $database = null, $numberPerPage = null) {
         /* @var $totalNumber integer */
         /* @var $result PDOStatement */
         list($totalNumber, $result) = parent::executeQuery($query, self::BOOK_COLUMNS, self::getFilterString(), $params, $n, $database, $numberPerPage);

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,15 +335,15 @@ 
 
     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";
         }
         return $addition . html2xhtml($this->comment);
     }
 
     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);
@@ -364,11 +364,11 @@ 
 
         if ($relative)
         {
-            return $this->relativePath.'/'.$file;
+            return $this->relativePath . '/' . $file;
         }
         else
         {
-            return $this->path.'/'.$file;
+            return $this->path . '/' . $file;
         }
     }
 
@@ -388,7 +388,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);
@@ -398,7 +398,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();
             }
@@ -424,11 +424,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;
@@ -436,16 +436,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();
 
@@ -470,7 +470,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)));
         }
 
@@ -495,13 +495,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;
@@ -597,7 +597,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);
     }
 
@@ -614,7 +614,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;
     }
@@ -639,7 +639,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;
     }
 

Braces +106 added lines, -80 removed lines

@@ -111,7 +111,8 @@ 
     public $format = array ();
 
 
-    public function __construct($line) {
+    public function __construct($line)
+    {
         $this->id = $line->id;
         $this->title = $line->title;
         $this->timestamp = strtotime($line->timestamp);
@@ -129,25 +130,32 @@ 
         $this->rating = $line->rating;
     }
 
-    public function getEntryId() {
+    public function getEntryId()
+    {
         return self::ALL_BOOKS_UUID.':'.$this->uuid;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
+    public static function getEntryIdByLetter ($startingLetter)
+    {
         return self::ALL_BOOKS_ID.':letter:'.$startingLetter;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return '?page='.parent::PAGE_BOOK_DETAIL.'&id=' . $this->id;
     }
 
-    public function getDetailUrl () {
+    public function getDetailUrl ()
+    {
         $urlParam = $this->getUri();
-        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB));
+        if (!is_null(GetUrlParam(DB))) {
+            $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB));
+        }
         return 'index.php' . $urlParam;
     }
 
-    public function getTitle () {
+    public function getTitle ()
+    {
         return $this->title;
     }
 
@@ -156,22 +164,26 @@ 
     /**
      * @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 () {
+    public function getAuthorsName ()
+    {
         return implode(', ', array_map(function ($author) { return $author->name; }, $this->getAuthors()));
     }
 
-    public function getAuthorsSort () {
+    public function getAuthorsSort ()
+    {
         return implode(', ', array_map(function ($author) { return $author->sort; }, $this->getAuthors()));
     }
 
-    public function getPublisher () {
+    public function getPublisher ()
+    {
         if (is_null($this->publisher)) {
             $this->publisher = Publisher::getPublisherByBookId($this->id);
         }
@@ -181,7 +193,8 @@ 
     /**
      * @return Serie
      */
-    public function getSerie() {
+    public function getSerie()
+    {
         if (is_null($this->serie)) {
             $this->serie = Serie::getSerieByBookId($this->id);
         }
@@ -191,7 +204,8 @@ 
     /**
      * @return string
      */
-    public function getLanguages() {
+    public function getLanguages()
+    {
         $lang = array();
         $result = parent::getDb()->prepare('select languages.lang_code
                 from books_languages_link, languages
@@ -199,8 +213,7 @@ 
                 and book = ?
                 order by item_order');
         $result->execute(array($this->id));
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             array_push($lang, Language::getLanguageString($post->lang_code));
         }
         return implode(', ', $lang);
@@ -209,7 +222,8 @@ 
     /**
      * @return Tag[]
      */
-    public function getTags() {
+    public function getTags()
+    {
         if (is_null ($this->tags)) {
             $this->tags = array();
 
@@ -219,15 +233,15 @@ 
                 and book = ?
                 order by name');
             $result->execute(array($this->id));
-            while ($post = $result->fetchObject())
-            {
+            while ($post = $result->fetchObject()) {
                 array_push($this->tags, new Tag($post));
             }
         }
         return $this->tags;
     }
 
-    public function getTagsName() {
+    public function getTagsName()
+    {
         return implode(', ', array_map(function ($tag) { return $tag->name; }, $this->getTags()));
     }
 
@@ -235,7 +249,8 @@ 
     /**
      * @return Identifiers[]
      */
-    public function getIdentifiers() {
+    public function getIdentifiers()
+    {
         if (is_null ($this->identifiers)) {
             $this->identifiers = array();
 
@@ -244,8 +259,7 @@ 
                 where book = ?
                 order by type');
             $result->execute(array($this->id));
-            while ($post = $result->fetchObject())
-            {
+            while ($post = $result->fetchObject()) {
                 array_push($this->identifiers, new Identifier($post));
             }
             
@@ -266,9 +280,12 @@ 
 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
-    public static function getFilterString() {
+    public static function getFilterString()
+    {
         $filter = getURLParam('tag', NULL);
-        if (empty($filter)) return '';
+        if (empty($filter)) {
+            return '';
+        }
 
         $exists = true;
         if (preg_match("/^!(.*)$/", $filter, $matches)) {
@@ -308,7 +325,8 @@ 
         return reset($reduced);
     }
 
-    public function getRating() {
+    public function getRating()
+    {
         if (is_null($this->rating) || $this->rating == 0) {
             return '';
         }
@@ -322,7 +340,8 @@ 
         return $retour;
     }
 
-    public function getPubDate() {
+    public function getPubDate()
+    {
         if (empty ($this->pubdate)) {
             return '';
         }
@@ -333,7 +352,8 @@ 
         return '';
     }
 
-    public function getComment($withSerie = true) {
+    public function getComment($withSerie = true)
+    {
         $addition = '';
         $se = $this->getSerie ();
         if (!is_null ($se) && $withSerie) {
@@ -342,7 +362,8 @@ 
         return $addition . html2xhtml($this->comment);
     }
 
-    public function getDataFormat($format) {
+    public function getDataFormat($format)
+    {
         $reduced = array_filter($this->getDatas(), function ($data) use ($format) {
             return $data->format == $format;
         });
@@ -351,23 +372,19 @@ 
 
     public function getFilePath($extension, $idData = NULL, $relative = false)
     {
-        if ($extension == 'jpg')
-        {
+        if ($extension == 'jpg') {
             $file = 'cover.jpg';
-        }
-        else
-        {
+        } else {
             $data = $this->getDataById($idData);
-            if (!$data) return NULL;
+            if (!$data) {
+                return NULL;
+            }
             $file = $data->name . '.' . strtolower($data->format);
         }
 
-        if ($relative)
-        {
+        if ($relative) {
             return $this->relativePath.'/'.$file;
-        }
-        else
-        {
+        } else {
             return $this->path.'/'.$file;
         }
     }
@@ -377,8 +394,7 @@ 
         global $config;
         $data = $this->getDataById($idData);
 
-        try
-        {
+        try {
             $epub = new EPub($data->getLocalPath());
 
             $epub->Title($this->title);
@@ -403,14 +419,13 @@ 
                 $filename = $data->getUpdatedFilenameKepub();
             }
             $epub->download($filename);
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             echo 'Exception : ' . $e->getMessage();
         }
     }
 
-    public function getThumbnail($width, $height, $outputfile = NULL) {
+    public function getThumbnail($width, $height, $outputfile = NULL)
+    {
         if (is_null($width) && is_null($height)) {
             return false;
         }
@@ -449,17 +464,14 @@ 
     {
         $linkArray = array();
 
-        if ($this->hasCover)
-        {
+        if ($this->hasCover) {
             array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
 
             array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
         }
 
-        foreach ($this->getDatas() as $data)
-        {
-            if ($data->isKnownType())
-            {
+        foreach ($this->getDatas() as $data) {
+            if ($data->isKnownType()) {
                 array_push($linkArray, $data->getDataLink(Link::OPDS_ACQUISITION_TYPE, $data->format));
             }
         }
@@ -478,17 +490,20 @@ 
     }
 
 
-    public function getEntry() {
+    public function getEntry()
+    {
         return new EntryBook($this->getTitle(), $this->getEntryId(),
             $this->getComment(), 'text/html',
             $this->getLinkArray(), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = NULL)
+    {
         return parent::executeQuerySingle('select count(*) from books', $database);
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         global $config;
         $nBooks = parent::executeQuerySingle('select count(*) from books');
         $result = array();
@@ -507,27 +522,33 @@ 
         return $result;
     }
 
-    public static function getBooksByAuthor($authorId, $n) {
+    public static function getBooksByAuthor($authorId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_AUTHOR, array($authorId), $n);
     }
 
-    public static function getBooksByRating($ratingId, $n) {
+    public static function getBooksByRating($ratingId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_RATING, array($ratingId), $n);
     }
 
-    public static function getBooksByPublisher($publisherId, $n) {
+    public static function getBooksByPublisher($publisherId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_PUBLISHER, array($publisherId), $n);
     }
 
-    public static function getBooksBySeries($serieId, $n) {
+    public static function getBooksBySeries($serieId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_SERIE, array($serieId), $n);
     }
 
-    public static function getBooksByTag($tagId, $n) {
+    public static function getBooksByTag($tagId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_TAG, array($tagId), $n);
     }
 
-    public static function getBooksByLanguage($languageId, $n) {
+    public static function getBooksByLanguage($languageId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_LANGUAGE, array($languageId), $n);
     }
 
@@ -537,32 +558,33 @@ 
      * @param $n integer
      * @return array
      */
-    public static function getBooksByCustom($customColumn, $id, $n) {
+    public static function getBooksByCustom($customColumn, $id, $n)
+    {
         list($query, $params) = $customColumn->getQuery($id);
 
         return self::getEntryArray($query, $params, $n);
     }
 
-    public static function getBookById($bookId) {
+    public static function getBookById($bookId)
+    {
         $result = parent::getDb()->prepare('select ' . self::BOOK_COLUMNS . '
 from books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where books.id = ?');
         $result->execute(array($bookId));
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             $book = new Book($post);
             return $book;
         }
         return NULL;
     }
 
-    public static function getBookByDataId($dataId) {
+    public static function getBookByDataId($dataId)
+    {
         $result = parent::getDb()->prepare('select ' . self::BOOK_COLUMNS . ', data.name, data.format
 from data, books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where data.book = books.id and data.id = ?');
         $result->execute(array($dataId));
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             $book = new Book($post);
             $data = new Data($post, $book);
             $data->id = $dataId;
@@ -572,7 +594,8 @@ 
         return NULL;
     }
 
-    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $i = 0;
         $critArray = array();
         foreach (array(PageQueryResult::SCOPE_AUTHOR,
@@ -583,8 +606,7 @@ 
             if (in_array($key, getCurrentOption('ignored_categories')) ||
                 (!array_key_exists($key, $query) && !array_key_exists('all', $query))) {
                 $critArray[$i] = self::BAD_SEARCH;
-            }
-            else {
+            } else {
                 if (array_key_exists($key, $query)) {
                     $critArray[$i] = $query[$key];
                 } else {
@@ -596,12 +618,14 @@ 
         return self::getEntryArray(self::SQL_BOOKS_QUERY, $critArray, $n, $database, $numberPerPage);
     }
 
-    public static function getBooks($n) {
+    public static function getBooks($n)
+    {
         list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL , array (), $n);
         return array($entryArray, $totalNumber);
     }
 
-    public static function getAllBooks() {
+    public static function getAllBooks()
+    {
         /* @var $result PDOStatement */
 
         list (, $result) = parent::executeQuery('select {0}
@@ -610,8 +634,7 @@ 
 order by substr (upper (sort), 1, 1)', 'substr (upper (sort), 1, 1) as title, count(*) as count', self::getFilterString(), array(), -1);
 
         $entryArray = array();
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             array_push($entryArray, new Entry($post->title, Book::getEntryIdByLetter($post->title),
                 str_format(localize('bookword', $post->count), $post->count), 'text',
                 array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS_LETTER.'&id='. rawurlencode($post->title))), '', $post->count));
@@ -619,25 +642,27 @@ 
         return $entryArray;
     }
 
-    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL)
+    {
         /* @var $totalNumber integer */
         /* @var $result PDOStatement */
         list($totalNumber, $result) = parent::executeQuery($query, self::BOOK_COLUMNS, self::getFilterString(), $params, $n, $database, $numberPerPage);
 
         $entryArray = array();
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             $book = new Book($post);
             array_push($entryArray, $book->getEntry());
         }
         return array($entryArray, $totalNumber);
     }
 
-    public static function getAllRecentBooks() {
+    public static function getAllRecentBooks()
+    {
         global $config;
         list ($entryArray, ) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
         return $entryArray;
@@ -649,7 +674,8 @@ 
      * @param string[] $columns
      * @return CustomColumn[]
      */
-    public function getCustomColumnValues($columns, $asArray = false) {
+    public function getCustomColumnValues($columns, $asArray = false)
+    {
         $result = array();
 
         foreach ($columns as $lookup) {

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();
     }