mbirth / cops

epubfs.php

Spacing +24 added lines, -24 removed lines

@@ -9,70 +9,70 @@
 require_once ("config.php");
 require_once ("base.php");
 
-function getComponentContent ($book, $component, $add) {
-    $data = $book->component ($component);
+function getComponentContent($book, $component, $add) {
+    $data = $book->component($component);
 
-    $callback = function ($m) use ($book, $component, $add) {
+    $callback = function($m) use ($book, $component, $add) {
         $method = $m[1];
         $path = $m[2];
         $end = "";
-        if (preg_match ("/^src\s*:/", $method)) {
+        if (preg_match("/^src\s*:/", $method)) {
             $end = ")";
         }
-        if (preg_match ("/^#/", $path)) {
+        if (preg_match("/^#/", $path)) {
             return "{$method}'{$path}'{$end}";
         }
         $hash = "";
-        if (preg_match ("/^(.+)#(.+)$/", $path, $matches)) {
+        if (preg_match("/^(.+)#(.+)$/", $path, $matches)) {
             $path = $matches [1];
             $hash = "#" . $matches [2];
         }
-        $comp = $book->getComponentName ($component, $path);
+        $comp = $book->getComponentName($component, $path);
         if (!$comp) return "{$method}'#'{$end}";
         $out = "{$method}'epubfs.php?{$add}comp={$comp}{$hash}'{$end}";
         if ($end) {
             return $out;
         }
-        return str_replace ("&", "&", $out);
+        return str_replace("&", "&", $out);
     };
 
-    $data = preg_replace_callback ("/(src=)[\"']([^:]*?)[\"']/", $callback, $data);
-    $data = preg_replace_callback ("/(href=)[\"']([^:]*?)[\"']/", $callback, $data);
-    $data = preg_replace_callback ("/(\@import\s+)[\"'](.*?)[\"'];/", $callback, $data);
-    $data = preg_replace_callback ("/(src\s*:\s*url\()(.*?)\)/", $callback, $data);
+    $data = preg_replace_callback("/(src=)[\"']([^:]*?)[\"']/", $callback, $data);
+    $data = preg_replace_callback("/(href=)[\"']([^:]*?)[\"']/", $callback, $data);
+    $data = preg_replace_callback("/(\@import\s+)[\"'](.*?)[\"'];/", $callback, $data);
+    $data = preg_replace_callback("/(src\s*:\s*url\()(.*?)\)/", $callback, $data);
 
     return $data;
 }
 
 if (php_sapi_name() === 'cli') { return; }
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null(GetUrlParam(DB))) $add .= DB . "=" . GetUrlParam(DB) . "&";
 $myBook = Book::getBookByDataId($idData);
 
-$book = new EPub ($myBook->getFilePath ("EPUB", $idData));
+$book = new EPub($myBook->getFilePath("EPUB", $idData));
 
-$book->initSpineComponent ();
+$book->initSpineComponent();
 
 if (!isset ($_GET["comp"])) {
-    notFound ();
+    notFound();
     return;
 }
 
 $component = $_GET["comp"];
 
 try {
-    $data = getComponentContent ($book, $component, $add);
+    $data = getComponentContent($book, $component, $add);
 
-    $expires = 60*60*24*14;
+    $expires = 60 * 60 * 24 * 14;
     header("Pragma: public");
-    header("Cache-Control: maxage=".$expires);
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    header ("Content-Type: " . $book->componentContentType($component));
+    header("Cache-Control: maxage=" . $expires);
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
+    header("Content-Type: " . $book->componentContentType($component));
     echo $data;
 }
 catch (Exception $e) {
-    error_log ($e);
-    notFound ();
+    error_log($e);
+    notFound();
 }
\ No newline at end of file

Braces +9 added lines, -5 removed lines

@@ -9,7 +9,8 @@ 
 require_once ("config.php");
 require_once ("base.php");
 
-function getComponentContent ($book, $component, $add) {
+function getComponentContent ($book, $component, $add)
+{
     $data = $book->component ($component);
 
     $callback = function ($m) use ($book, $component, $add) {
@@ -28,7 +29,9 @@ 
             $hash = "#" . $matches [2];
         }
         $comp = $book->getComponentName ($component, $path);
-        if (!$comp) return "{$method}'#'{$end}";
+        if (!$comp) {
+            return "{$method}'#'{$end}";
+        }
         $out = "{$method}'epubfs.php?{$add}comp={$comp}{$hash}'{$end}";
         if ($end) {
             return $out;
@@ -48,7 +51,9 @@ 
 
 $idData = getURLParam ("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null (GetUrlParam (DB))) {
+    $add .= DB . "=" . GetUrlParam (DB) . "&";
+}
 $myBook = Book::getBookByDataId($idData);
 
 $book = new EPub ($myBook->getFilePath ("EPUB", $idData));
@@ -71,8 +76,7 @@ 
     header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
     header ("Content-Type: " . $book->componentContentType($component));
     echo $data;
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     error_log ($e);
     notFound ();
 }
\ No newline at end of file

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

@@ -46,7 +46,7 @@
 
 if (php_sapi_name() === 'cli') { return; }
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam ("data", null);
 $add = "data=$idData&";
 if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
 $myBook = Book::getBookByDataId($idData);

publisher.php

Spacing +17 added lines, -17 removed lines

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

Braces +18 added lines, -9 removed lines

@@ -6,7 +6,8 @@ 
  * @author     At Libitum <eljarec@yahoo.com>
  */
 
-class Publisher extends Base {
+class Publisher extends Base
+{
     const ALL_PUBLISHERS_ID = "cops:publishers";
     const PUBLISHERS_COLUMNS = "publishers.id as id, publishers.name as name, count(*) as count";
     const SQL_ALL_PUBLISHERS = "select {0} from publishers, books_publishers_link where publishers.id = publisher group by publishers.id, publishers.name order by publishers.name";
@@ -16,25 +17,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_PUBLISHER_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_PUBLISHERS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("publishers.alphabetical", count(array))
         return parent::getCountGeneric ("publishers", self::ALL_PUBLISHERS_ID, parent::PAGE_ALL_PUBLISHERS);
     }
 
-    public static function getPublisherByBookId ($bookId) {
+    public static function getPublisherByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select publishers.id as id, name
 from books_publishers_link, publishers
 where publishers.id = publisher and book = ?');
@@ -45,7 +51,8 @@ 
         return NULL;
     }
 
-    public static function getPublisherById ($publisherId) {
+    public static function getPublisherById ($publisherId)
+    {
         $result = parent::getDb ()->prepare('select id, name
 from publishers where id = ?');
         $result->execute (array ($publisherId));
@@ -55,11 +62,13 @@ 
         return NULL;
     }
 
-    public static function getAllPublishers() {
+    public static function getAllPublishers()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_PUBLISHERS, self::PUBLISHERS_COLUMNS, array (), "Publisher");
     }
 
-    public static function getAllPublishersByQuery($query) {
+    public static function getAllPublishersByQuery($query)
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_PUBLISHERS_FOR_SEARCH, self::PUBLISHERS_COLUMNS, array ('%' . $query . '%'), "Publisher");
     }
 }

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

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

OPDS_renderer.php

Spacing +177 added lines, -177 removed lines

@@ -13,266 +13,266 @@
     private $xmlStream = NULL;
     private $updated = NULL;
 
-    private function getUpdatedTime () {
-        if (is_null ($this->updated)) {
+    private function getUpdatedTime() {
+        if (is_null($this->updated)) {
             $this->updated = time();
         }
-        return date (DATE_ATOM, $this->updated);
+        return date(DATE_ATOM, $this->updated);
     }
 
-    private function getXmlStream () {
-        if (is_null ($this->xmlStream)) {
+    private function getXmlStream() {
+        if (is_null($this->xmlStream)) {
             $this->xmlStream = new XMLWriter();
             $this->xmlStream->openMemory();
-            $this->xmlStream->setIndent (true);
+            $this->xmlStream->setIndent(true);
         }
         return $this->xmlStream;
     }
 
-    public function getOpenSearch () {
+    public function getOpenSearch() {
         global $config;
-        $xml = new XMLWriter ();
-        $xml->openMemory ();
-        $xml->setIndent (true);
-        $xml->startDocument('1.0','UTF-8');
-            $xml->startElement ("OpenSearchDescription");
-                $xml->writeAttribute ("xmlns", "http://a9.com/-/spec/opensearch/1.1/");
-                $xml->startElement ("ShortName");
-                    $xml->text ("My catalog");
-                $xml->endElement ();
-                $xml->startElement ("Description");
-                    $xml->text ("Search for ebooks");
-                $xml->endElement ();
-                $xml->startElement ("InputEncoding");
-                    $xml->text ("UTF-8");
-                $xml->endElement ();
-                $xml->startElement ("OutputEncoding");
-                    $xml->text ("UTF-8");
-                $xml->endElement ();
-                $xml->startElement ("Image");
-                    $xml->writeAttribute ("type", "image/x-icon");
-                    $xml->writeAttribute ("width", "16");
-                    $xml->writeAttribute ("height", "16");
-                    $xml->text ($config['cops_icon']);
-                $xml->endElement ();
-                $xml->startElement ("Url");
-                    $xml->writeAttribute ("type", 'application/atom+xml');
+        $xml = new XMLWriter();
+        $xml->openMemory();
+        $xml->setIndent(true);
+        $xml->startDocument('1.0', 'UTF-8');
+            $xml->startElement("OpenSearchDescription");
+                $xml->writeAttribute("xmlns", "http://a9.com/-/spec/opensearch/1.1/");
+                $xml->startElement("ShortName");
+                    $xml->text("My catalog");
+                $xml->endElement();
+                $xml->startElement("Description");
+                    $xml->text("Search for ebooks");
+                $xml->endElement();
+                $xml->startElement("InputEncoding");
+                    $xml->text("UTF-8");
+                $xml->endElement();
+                $xml->startElement("OutputEncoding");
+                    $xml->text("UTF-8");
+                $xml->endElement();
+                $xml->startElement("Image");
+                    $xml->writeAttribute("type", "image/x-icon");
+                    $xml->writeAttribute("width", "16");
+                    $xml->writeAttribute("height", "16");
+                    $xml->text($config['cops_icon']);
+                $xml->endElement();
+                $xml->startElement("Url");
+                    $xml->writeAttribute("type", 'application/atom+xml');
                     $urlparam = "?query={searchTerms}";
-                    if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
-                    $urlparam = str_replace ("%7B", "{", $urlparam);
-                    $urlparam = str_replace ("%7D", "}", $urlparam);
-                    $xml->writeAttribute ("template", $config['cops_full_url'] . 'feed.php' . $urlparam);
-                $xml->endElement ();
-                $xml->startElement ("Query");
-                    $xml->writeAttribute ("role", "example");
-                    $xml->writeAttribute ("searchTerms", "robot");
-                $xml->endElement ();
-            $xml->endElement ();
+                    if (!is_null(GetUrlParam(DB))) $urlparam = addURLParameter($urlparam, DB, GetUrlParam(DB));
+                    $urlparam = str_replace("%7B", "{", $urlparam);
+                    $urlparam = str_replace("%7D", "}", $urlparam);
+                    $xml->writeAttribute("template", $config['cops_full_url'] . 'feed.php' . $urlparam);
+                $xml->endElement();
+                $xml->startElement("Query");
+                    $xml->writeAttribute("role", "example");
+                    $xml->writeAttribute("searchTerms", "robot");
+                $xml->endElement();
+            $xml->endElement();
         $xml->endDocument();
         return $xml->outputMemory(true);
     }
 
-    private function startXmlDocument ($page) {
+    private function startXmlDocument($page) {
         global $config;
-        self::getXmlStream ()->startDocument('1.0','UTF-8');
-        self::getXmlStream ()->startElement ("feed");
-            self::getXmlStream ()->writeAttribute ("xmlns", "http://www.w3.org/2005/Atom");
-            self::getXmlStream ()->writeAttribute ("xmlns:xhtml", "http://www.w3.org/1999/xhtml");
-            self::getXmlStream ()->writeAttribute ("xmlns:opds", "http://opds-spec.org/2010/catalog");
-            self::getXmlStream ()->writeAttribute ("xmlns:opensearch", "http://a9.com/-/spec/opensearch/1.1/");
-            self::getXmlStream ()->writeAttribute ("xmlns:dcterms", "http://purl.org/dc/terms/");
-            self::getXmlStream ()->startElement ("title");
-                self::getXmlStream ()->text ($page->title);
-            self::getXmlStream ()->endElement ();
+        self::getXmlStream()->startDocument('1.0', 'UTF-8');
+        self::getXmlStream()->startElement("feed");
+            self::getXmlStream()->writeAttribute("xmlns", "http://www.w3.org/2005/Atom");
+            self::getXmlStream()->writeAttribute("xmlns:xhtml", "http://www.w3.org/1999/xhtml");
+            self::getXmlStream()->writeAttribute("xmlns:opds", "http://opds-spec.org/2010/catalog");
+            self::getXmlStream()->writeAttribute("xmlns:opensearch", "http://a9.com/-/spec/opensearch/1.1/");
+            self::getXmlStream()->writeAttribute("xmlns:dcterms", "http://purl.org/dc/terms/");
+            self::getXmlStream()->startElement("title");
+                self::getXmlStream()->text($page->title);
+            self::getXmlStream()->endElement();
             if ($page->subtitle != "")
             {
-                self::getXmlStream ()->startElement ("subtitle");
-                    self::getXmlStream ()->text ($page->subtitle);
-                self::getXmlStream ()->endElement ();
+                self::getXmlStream()->startElement("subtitle");
+                    self::getXmlStream()->text($page->subtitle);
+                self::getXmlStream()->endElement();
             }
-            self::getXmlStream ()->startElement ("id");
+            self::getXmlStream()->startElement("id");
                 if ($page->idPage)
                 {
                     $idPage = $page->idPage;
-                    if (!is_null (GetUrlParam (DB))) $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage);
-                    self::getXmlStream ()->text ($idPage);
+                    if (!is_null(GetUrlParam(DB))) $idPage = str_replace("cops:", "cops:" . GetUrlParam(DB) . ":", $idPage);
+                    self::getXmlStream()->text($idPage);
                 }
                 else
                 {
-                    self::getXmlStream ()->text ($_SERVER['REQUEST_URI']);
+                    self::getXmlStream()->text($_SERVER['REQUEST_URI']);
                 }
-            self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->startElement ("updated");
-                self::getXmlStream ()->text (self::getUpdatedTime ());
-            self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->startElement ("icon");
-                self::getXmlStream ()->text ($page->favicon);
-            self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->startElement ("author");
-                self::getXmlStream ()->startElement ("name");
-                    self::getXmlStream ()->text ($page->authorName);
-                self::getXmlStream ()->endElement ();
-                self::getXmlStream ()->startElement ("uri");
-                    self::getXmlStream ()->text ($page->authorUri);
-                self::getXmlStream ()->endElement ();
-                self::getXmlStream ()->startElement ("email");
-                    self::getXmlStream ()->text ($page->authorEmail);
-                self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->endElement ();
-            $link = new LinkNavigation ("", "start", "Home");
-            self::renderLink ($link);
-            $link = new LinkNavigation ("?" . getQueryString (), "self");
-            self::renderLink ($link);
+            self::getXmlStream()->endElement();
+            self::getXmlStream()->startElement("updated");
+                self::getXmlStream()->text(self::getUpdatedTime());
+            self::getXmlStream()->endElement();
+            self::getXmlStream()->startElement("icon");
+                self::getXmlStream()->text($page->favicon);
+            self::getXmlStream()->endElement();
+            self::getXmlStream()->startElement("author");
+                self::getXmlStream()->startElement("name");
+                    self::getXmlStream()->text($page->authorName);
+                self::getXmlStream()->endElement();
+                self::getXmlStream()->startElement("uri");
+                    self::getXmlStream()->text($page->authorUri);
+                self::getXmlStream()->endElement();
+                self::getXmlStream()->startElement("email");
+                    self::getXmlStream()->text($page->authorEmail);
+                self::getXmlStream()->endElement();
+            self::getXmlStream()->endElement();
+            $link = new LinkNavigation("", "start", "Home");
+            self::renderLink($link);
+            $link = new LinkNavigation("?" . getQueryString(), "self");
+            self::renderLink($link);
             $urlparam = "?";
-            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_generate_invalid_opds_stream'] == 0 || preg_match("/(MantanoReader|FBReader)/", $_SERVER['HTTP_USER_AGENT'])) {
                 // Good and compliant way of handling search
-                $urlparam = addURLParameter ($urlparam, "page", Base::PAGE_OPENSEARCH);
-                $link = new Link ("feed.php" . $urlparam, "application/opensearchdescription+xml", "search", "Search here");
+                $urlparam = addURLParameter($urlparam, "page", Base::PAGE_OPENSEARCH);
+                $link = new Link("feed.php" . $urlparam, "application/opensearchdescription+xml", "search", "Search here");
             }
             else
             {
                 // Bad way, will be removed when OPDS client are fixed
-                $urlparam = addURLParameter ($urlparam, "query", "{searchTerms}");
-                $urlparam = str_replace ("%7B", "{", $urlparam);
-                $urlparam = str_replace ("%7D", "}", $urlparam);
-                $link = new Link ($config['cops_full_url'] . 'feed.php' . $urlparam, "application/atom+xml", "search", "Search here");
+                $urlparam = addURLParameter($urlparam, "query", "{searchTerms}");
+                $urlparam = str_replace("%7B", "{", $urlparam);
+                $urlparam = str_replace("%7D", "}", $urlparam);
+                $link = new Link($config['cops_full_url'] . 'feed.php' . $urlparam, "application/atom+xml", "search", "Search here");
             }
-            self::renderLink ($link);
-            if ($page->containsBook () && !is_null ($config['cops_books_filter']) && count ($config['cops_books_filter']) > 0) {
-                $Urlfilter = getURLParam ("tag", "");
+            self::renderLink($link);
+            if ($page->containsBook() && !is_null($config['cops_books_filter']) && count($config['cops_books_filter']) > 0) {
+                $Urlfilter = getURLParam("tag", "");
                 foreach ($config['cops_books_filter'] as $lib => $filter) {
-                    $link = new LinkFacet ("?" . addURLParameter (getQueryString (), "tag", $filter), $lib, localize ("tagword.title"), $filter == $Urlfilter);
-                    self::renderLink ($link);
+                    $link = new LinkFacet("?" . addURLParameter(getQueryString(), "tag", $filter), $lib, localize("tagword.title"), $filter == $Urlfilter);
+                    self::renderLink($link);
                 }
             }
     }
 
-    private function endXmlDocument () {
-        self::getXmlStream ()->endElement ();
-        self::getXmlStream ()->endDocument ();
-        return self::getXmlStream ()->outputMemory(true);
+    private function endXmlDocument() {
+        self::getXmlStream()->endElement();
+        self::getXmlStream()->endDocument();
+        return self::getXmlStream()->outputMemory(true);
     }
 
-    private function renderLink ($link) {
-        self::getXmlStream ()->startElement ("link");
-            self::getXmlStream ()->writeAttribute ("href", $link->href);
-            self::getXmlStream ()->writeAttribute ("type", $link->type);
-            if (!is_null ($link->rel)) {
-                self::getXmlStream ()->writeAttribute ("rel", $link->rel);
+    private function renderLink($link) {
+        self::getXmlStream()->startElement("link");
+            self::getXmlStream()->writeAttribute("href", $link->href);
+            self::getXmlStream()->writeAttribute("type", $link->type);
+            if (!is_null($link->rel)) {
+                self::getXmlStream()->writeAttribute("rel", $link->rel);
             }
-            if (!is_null ($link->title)) {
-                self::getXmlStream ()->writeAttribute ("title", $link->title);
+            if (!is_null($link->title)) {
+                self::getXmlStream()->writeAttribute("title", $link->title);
             }
-            if (!is_null ($link->facetGroup)) {
-                self::getXmlStream ()->writeAttribute ("opds:facetGroup", $link->facetGroup);
+            if (!is_null($link->facetGroup)) {
+                self::getXmlStream()->writeAttribute("opds:facetGroup", $link->facetGroup);
             }
             if ($link->activeFacet) {
-                self::getXmlStream ()->writeAttribute ("opds:activeFacet", "true");
+                self::getXmlStream()->writeAttribute("opds:activeFacet", "true");
             }
-        self::getXmlStream ()->endElement ();
+        self::getXmlStream()->endElement();
     }
 
     private function getPublicationDate($book) {
         $dateYmd = substr($book->pubdate, 0, 10);
         $pubdate = \DateTime::createFromFormat('Y-m-d', $dateYmd);
         if ($pubdate === false ||
-            $pubdate->format ("Y") == "0101" ||
-            $pubdate->format ("Y") == "0100") {
+            $pubdate->format("Y") == "0101" ||
+            $pubdate->format("Y") == "0100") {
             return "";
         }
         return $pubdate->format("Y-m-d");
     }
 
-    private function renderEntry ($entry) {
-        self::getXmlStream ()->startElement ("title");
-            self::getXmlStream ()->text ($entry->title);
-        self::getXmlStream ()->endElement ();
-        self::getXmlStream ()->startElement ("updated");
-            self::getXmlStream ()->text (self::getUpdatedTime ());
-        self::getXmlStream ()->endElement ();
-        self::getXmlStream ()->startElement ("id");
-            self::getXmlStream ()->text ($entry->id);
-        self::getXmlStream ()->endElement ();
-        self::getXmlStream ()->startElement ("content");
-            self::getXmlStream ()->writeAttribute ("type", $entry->contentType);
+    private function renderEntry($entry) {
+        self::getXmlStream()->startElement("title");
+            self::getXmlStream()->text($entry->title);
+        self::getXmlStream()->endElement();
+        self::getXmlStream()->startElement("updated");
+            self::getXmlStream()->text(self::getUpdatedTime());
+        self::getXmlStream()->endElement();
+        self::getXmlStream()->startElement("id");
+            self::getXmlStream()->text($entry->id);
+        self::getXmlStream()->endElement();
+        self::getXmlStream()->startElement("content");
+            self::getXmlStream()->writeAttribute("type", $entry->contentType);
             if ($entry->contentType == "text") {
-                self::getXmlStream ()->text ($entry->content);
+                self::getXmlStream()->text($entry->content);
             } else {
-                self::getXmlStream ()->writeRaw ($entry->content);
+                self::getXmlStream()->writeRaw($entry->content);
             }
-        self::getXmlStream ()->endElement ();
+        self::getXmlStream()->endElement();
         foreach ($entry->linkArray as $link) {
-            self::renderLink ($link);
+            self::renderLink($link);
         }
 
-        if (get_class ($entry) != "EntryBook") {
+        if (get_class($entry) != "EntryBook") {
             return;
         }
 
-        foreach ($entry->book->getAuthors () as $author) {
-            self::getXmlStream ()->startElement ("author");
-                self::getXmlStream ()->startElement ("name");
-                    self::getXmlStream ()->text ($author->name);
-                self::getXmlStream ()->endElement ();
-                self::getXmlStream ()->startElement ("uri");
-                    self::getXmlStream ()->text ("feed.php" . $author->getUri ());
-                self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->endElement ();
+        foreach ($entry->book->getAuthors() as $author) {
+            self::getXmlStream()->startElement("author");
+                self::getXmlStream()->startElement("name");
+                    self::getXmlStream()->text($author->name);
+                self::getXmlStream()->endElement();
+                self::getXmlStream()->startElement("uri");
+                    self::getXmlStream()->text("feed.php" . $author->getUri());
+                self::getXmlStream()->endElement();
+            self::getXmlStream()->endElement();
         }
-        foreach ($entry->book->getTags () as $category) {
-            self::getXmlStream ()->startElement ("category");
-                self::getXmlStream ()->writeAttribute ("term", $category->name);
-                self::getXmlStream ()->writeAttribute ("label", $category->name);
-            self::getXmlStream ()->endElement ();
+        foreach ($entry->book->getTags() as $category) {
+            self::getXmlStream()->startElement("category");
+                self::getXmlStream()->writeAttribute("term", $category->name);
+                self::getXmlStream()->writeAttribute("label", $category->name);
+            self::getXmlStream()->endElement();
         }
-        if ($entry->book->getPubDate () != "") {
-            self::getXmlStream ()->startElement ("dcterms:issued");
-                self::getXmlStream ()->text (self::getPublicationDate($entry->book));
-            self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->startElement ("published");
-                self::getXmlStream ()->text (self::getPublicationDate($entry->book) . "T08:08:08Z");
-            self::getXmlStream ()->endElement ();
+        if ($entry->book->getPubDate() != "") {
+            self::getXmlStream()->startElement("dcterms:issued");
+                self::getXmlStream()->text(self::getPublicationDate($entry->book));
+            self::getXmlStream()->endElement();
+            self::getXmlStream()->startElement("published");
+                self::getXmlStream()->text(self::getPublicationDate($entry->book) . "T08:08:08Z");
+            self::getXmlStream()->endElement();
         }
 
-        $lang = $entry->book->getLanguages ();
+        $lang = $entry->book->getLanguages();
         if (!empty ($lang)) {
-            self::getXmlStream ()->startElement ("dcterms:language");
-                self::getXmlStream ()->text ($lang);
-            self::getXmlStream ()->endElement ();
+            self::getXmlStream()->startElement("dcterms:language");
+                self::getXmlStream()->text($lang);
+            self::getXmlStream()->endElement();
         }
 
     }
 
-    public function render ($page) {
+    public function render($page) {
         global $config;
-        self::startXmlDocument ($page);
-        if ($page->isPaginated ())
+        self::startXmlDocument($page);
+        if ($page->isPaginated())
         {
-            self::getXmlStream ()->startElement ("opensearch:totalResults");
-                self::getXmlStream ()->text ($page->totalNumber);
-            self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->startElement ("opensearch:itemsPerPage");
-                self::getXmlStream ()->text ($config['cops_max_item_per_page']);
-            self::getXmlStream ()->endElement ();
-            self::getXmlStream ()->startElement ("opensearch:startIndex");
-                self::getXmlStream ()->text (($page->n - 1) * $config['cops_max_item_per_page'] + 1);
-            self::getXmlStream ()->endElement ();
-            $prevLink = $page->getPrevLink ();
-            $nextLink = $page->getNextLink ();
-            if (!is_null ($prevLink)) {
-                self::renderLink ($prevLink);
+            self::getXmlStream()->startElement("opensearch:totalResults");
+                self::getXmlStream()->text($page->totalNumber);
+            self::getXmlStream()->endElement();
+            self::getXmlStream()->startElement("opensearch:itemsPerPage");
+                self::getXmlStream()->text($config['cops_max_item_per_page']);
+            self::getXmlStream()->endElement();
+            self::getXmlStream()->startElement("opensearch:startIndex");
+                self::getXmlStream()->text(($page->n - 1) * $config['cops_max_item_per_page'] + 1);
+            self::getXmlStream()->endElement();
+            $prevLink = $page->getPrevLink();
+            $nextLink = $page->getNextLink();
+            if (!is_null($prevLink)) {
+                self::renderLink($prevLink);
             }
-            if (!is_null ($nextLink)) {
-                self::renderLink ($nextLink);
+            if (!is_null($nextLink)) {
+                self::renderLink($nextLink);
             }
         }
         foreach ($page->entryArray as $entry) {
-            self::getXmlStream ()->startElement ("entry");
-                self::renderEntry ($entry);
-            self::getXmlStream ()->endElement ();
+            self::getXmlStream()->startElement("entry");
+                self::renderEntry($entry);
+            self::getXmlStream()->endElement();
         }
-        return self::endXmlDocument ();
+        return self::endXmlDocument();
     }
 }
 

Braces +32 added lines, -24 removed lines

@@ -13,14 +13,16 @@ 
     private $xmlStream = NULL;
     private $updated = NULL;
 
-    private function getUpdatedTime () {
+    private function getUpdatedTime ()
+    {
         if (is_null ($this->updated)) {
             $this->updated = time();
         }
         return date (DATE_ATOM, $this->updated);
     }
 
-    private function getXmlStream () {
+    private function getXmlStream ()
+    {
         if (is_null ($this->xmlStream)) {
             $this->xmlStream = new XMLWriter();
             $this->xmlStream->openMemory();
@@ -29,7 +31,8 @@ 
         return $this->xmlStream;
     }
 
-    public function getOpenSearch () {
+    public function getOpenSearch ()
+    {
         global $config;
         $xml = new XMLWriter ();
         $xml->openMemory ();
@@ -58,7 +61,9 @@ 
                 $xml->startElement ("Url");
                     $xml->writeAttribute ("type", 'application/atom+xml');
                     $urlparam = "?query={searchTerms}";
-                    if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+                    if (!is_null (GetUrlParam (DB))) {
+                        $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+                    }
                     $urlparam = str_replace ("%7B", "{", $urlparam);
                     $urlparam = str_replace ("%7D", "}", $urlparam);
                     $xml->writeAttribute ("template", $config['cops_full_url'] . 'feed.php' . $urlparam);
@@ -72,7 +77,8 @@ 
         return $xml->outputMemory(true);
     }
 
-    private function startXmlDocument ($page) {
+    private function startXmlDocument ($page)
+    {
         global $config;
         self::getXmlStream ()->startDocument('1.0','UTF-8');
         self::getXmlStream ()->startElement ("feed");
@@ -84,21 +90,19 @@ 
             self::getXmlStream ()->startElement ("title");
                 self::getXmlStream ()->text ($page->title);
             self::getXmlStream ()->endElement ();
-            if ($page->subtitle != "")
-            {
+            if ($page->subtitle != "") {
                 self::getXmlStream ()->startElement ("subtitle");
                     self::getXmlStream ()->text ($page->subtitle);
                 self::getXmlStream ()->endElement ();
             }
             self::getXmlStream ()->startElement ("id");
-                if ($page->idPage)
-                {
+                if ($page->idPage) {
                     $idPage = $page->idPage;
-                    if (!is_null (GetUrlParam (DB))) $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage);
+                    if (!is_null (GetUrlParam (DB))) {
+                        $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage);
+                    }
                     self::getXmlStream ()->text ($idPage);
-                }
-                else
-                {
+                } else {
                     self::getXmlStream ()->text ($_SERVER['REQUEST_URI']);
                 }
             self::getXmlStream ()->endElement ();
@@ -124,14 +128,14 @@ 
             $link = new LinkNavigation ("?" . getQueryString (), "self");
             self::renderLink ($link);
             $urlparam = "?";
-            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_generate_invalid_opds_stream'] == 0 || preg_match("/(MantanoReader|FBReader)/", $_SERVER['HTTP_USER_AGENT'])) {
                 // Good and compliant way of handling search
                 $urlparam = addURLParameter ($urlparam, "page", Base::PAGE_OPENSEARCH);
                 $link = new Link ("feed.php" . $urlparam, "application/opensearchdescription+xml", "search", "Search here");
-            }
-            else
-            {
+            } else {
                 // Bad way, will be removed when OPDS client are fixed
                 $urlparam = addURLParameter ($urlparam, "query", "{searchTerms}");
                 $urlparam = str_replace ("%7B", "{", $urlparam);
@@ -148,13 +152,15 @@ 
             }
     }
 
-    private function endXmlDocument () {
+    private function endXmlDocument ()
+    {
         self::getXmlStream ()->endElement ();
         self::getXmlStream ()->endDocument ();
         return self::getXmlStream ()->outputMemory(true);
     }
 
-    private function renderLink ($link) {
+    private function renderLink ($link)
+    {
         self::getXmlStream ()->startElement ("link");
             self::getXmlStream ()->writeAttribute ("href", $link->href);
             self::getXmlStream ()->writeAttribute ("type", $link->type);
@@ -173,7 +179,8 @@ 
         self::getXmlStream ()->endElement ();
     }
 
-    private function getPublicationDate($book) {
+    private function getPublicationDate($book)
+    {
         $dateYmd = substr($book->pubdate, 0, 10);
         $pubdate = \DateTime::createFromFormat('Y-m-d', $dateYmd);
         if ($pubdate === false ||
@@ -184,7 +191,8 @@ 
         return $pubdate->format("Y-m-d");
     }
 
-    private function renderEntry ($entry) {
+    private function renderEntry ($entry)
+    {
         self::getXmlStream ()->startElement ("title");
             self::getXmlStream ()->text ($entry->title);
         self::getXmlStream ()->endElement ();
@@ -244,11 +252,11 @@ 
 
     }
 
-    public function render ($page) {
+    public function render ($page)
+    {
         global $config;
         self::startXmlDocument ($page);
-        if ($page->isPaginated ())
-        {
+        if ($page->isPaginated ()) {
             self::getXmlStream ()->startElement ("opensearch:totalResults");
                 self::getXmlStream ()->text ($page->totalNumber);
             self::getXmlStream ()->endElement ();

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

@@ -10,8 +10,8 @@
 
 class OPDSRenderer
 {
-    private $xmlStream = NULL;
-    private $updated = NULL;
+    private $xmlStream = null;
+    private $updated = null;
 
     private function getUpdatedTime () {
         if (is_null ($this->updated)) {

customcolumn.php

Spacing +33 added lines, -33 removed lines

@@ -19,80 +19,80 @@
         $this->customId = $pcustomId;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_CUSTOM_DETAIL."&custom={$this->customId}&id={$this->id}";
+    public function getUri() {
+        return "?page=" . parent::PAGE_CUSTOM_DETAIL . "&custom={$this->customId}&id={$this->id}";
     }
 
-    public function getEntryId () {
-        return self::ALL_CUSTOMS_ID.":".$this->customId.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_CUSTOMS_ID . ":" . $this->customId . ":" . $this->id;
     }
 
-    public static function getTableName ($customId) {
+    public static function getTableName($customId) {
         return "custom_column_{$customId}";
     }
 
-    public static function getTableLinkName ($customId) {
+    public static function getTableLinkName($customId) {
         return "books_custom_column_{$customId}_link";
     }
 
-    public static function getTableLinkColumn ($customId) {
+    public static function getTableLinkColumn($customId) {
         return "value";
     }
 
-    public static function getAllCustomsId ($customId) {
+    public static function getAllCustomsId($customId) {
         return self::ALL_CUSTOMS_ID . ":" . $customId;
     }
 
-    public static function getUriAllCustoms ($customId) {
+    public static function getUriAllCustoms($customId) {
         return "?page=" . parent::PAGE_ALL_CUSTOMS . "&custom={$customId}";
     }
 
-    public static function getAllTitle ($customId) {
-        $result = parent::getDb ()->prepare('select name from custom_columns where id = ?');
-        $result->execute (array ($customId));
-        $post = $result->fetchObject ();
+    public static function getAllTitle($customId) {
+        $result = parent::getDb()->prepare('select name from custom_columns where id = ?');
+        $result->execute(array($customId));
+        $post = $result->fetchObject();
         return $post->name;
     }
 
-    public static function getCustomId ($lookup) {
-        $result = parent::getDb ()->prepare('select id from custom_columns where label = ?');
-        $result->execute (array ($lookup));
-        if ($post = $result->fetchObject ()) {
+    public static function getCustomId($lookup) {
+        $result = parent::getDb()->prepare('select id from custom_columns where label = ?');
+        $result->execute(array($lookup));
+        if ($post = $result->fetchObject()) {
             return $post->id;
         }
         return NULL;
     }
 
     public static function getCount($customId) {
-        $nCustoms = parent::executeQuerySingle ('select count(*) from ' . self::getTableName ($customId));
-        $entry = new Entry (self::getAllTitle ($customId), self::getAllCustomsId ($customId),
-            str_format (localize("tags.alphabetical", $nCustoms), $nCustoms), "text",
-            array ( new LinkNavigation (self::getUriAllCustoms ($customId))), "", $nCustoms);
+        $nCustoms = parent::executeQuerySingle('select count(*) from ' . self::getTableName($customId));
+        $entry = new Entry(self::getAllTitle($customId), self::getAllCustomsId($customId),
+            str_format(localize("tags.alphabetical", $nCustoms), $nCustoms), "text",
+            array(new LinkNavigation(self::getUriAllCustoms($customId))), "", $nCustoms);
         return $entry;
     }
 
-    public static function getCustomById ($customId, $id) {
-        $result = parent::getDb ()->prepare('select id, value as name from ' . self::getTableName ($customId) . ' where id = ?');
-        $result->execute (array ($id));
-        if ($post = $result->fetchObject ()) {
-            return new CustomColumn ($post->id, $post->name, $customId);
+    public static function getCustomById($customId, $id) {
+        $result = parent::getDb()->prepare('select id, value as name from ' . self::getTableName($customId) . ' where id = ?');
+        $result->execute(array($id));
+        if ($post = $result->fetchObject()) {
+            return new CustomColumn($post->id, $post->name, $customId);
         }
         return NULL;
     }
 
     public static function getAllCustoms($customId) {
-        $result = parent::getDb ()->query(str_format ('select {0}.id as id, {0}.value as name, count(*) as count
+        $result = parent::getDb()->query(str_format('select {0}.id as id, {0}.value as name, count(*) as count
 from {0}, {1}
 where {0}.id = {1}.{2}
 group by {0}.id, {0}.value
-order by {0}.value', self::getTableName ($customId), self::getTableLinkName ($customId), self::getTableLinkColumn ($customId)));
+order by {0}.value', self::getTableName($customId), self::getTableLinkName($customId), self::getTableLinkColumn($customId)));
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $customColumn = new CustomColumn ($post->id, $post->name, $customId);
-            array_push ($entryArray, new Entry ($customColumn->name, $customColumn->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($customColumn->getUri ())), "", $post->count));
+            $customColumn = new CustomColumn($post->id, $post->name, $customId);
+            array_push($entryArray, new Entry($customColumn->name, $customColumn->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($customColumn->getUri())), "", $post->count));
         }
         return $entryArray;
     }

Braces +29 added lines, -16 removed lines

@@ -6,55 +6,66 @@ 
  * @author     Sébastien Lucas <sebastien@slucas.fr>
  */
 
-class CustomColumn extends Base {
+class CustomColumn extends Base
+{
     const ALL_CUSTOMS_ID = "cops:custom";
 
     public $id;
     public $name;
     public $customId;
 
-    public function __construct($pid, $pname, $pcustomId) {
+    public function __construct($pid, $pname, $pcustomId)
+    {
         $this->id = $pid;
         $this->name = $pname;
         $this->customId = $pcustomId;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_CUSTOM_DETAIL."&custom={$this->customId}&id={$this->id}";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_CUSTOMS_ID.":".$this->customId.":".$this->id;
     }
 
-    public static function getTableName ($customId) {
+    public static function getTableName ($customId)
+    {
         return "custom_column_{$customId}";
     }
 
-    public static function getTableLinkName ($customId) {
+    public static function getTableLinkName ($customId)
+    {
         return "books_custom_column_{$customId}_link";
     }
 
-    public static function getTableLinkColumn ($customId) {
+    public static function getTableLinkColumn ($customId)
+    {
         return "value";
     }
 
-    public static function getAllCustomsId ($customId) {
+    public static function getAllCustomsId ($customId)
+    {
         return self::ALL_CUSTOMS_ID . ":" . $customId;
     }
 
-    public static function getUriAllCustoms ($customId) {
+    public static function getUriAllCustoms ($customId)
+    {
         return "?page=" . parent::PAGE_ALL_CUSTOMS . "&custom={$customId}";
     }
 
-    public static function getAllTitle ($customId) {
+    public static function getAllTitle ($customId)
+    {
         $result = parent::getDb ()->prepare('select name from custom_columns where id = ?');
         $result->execute (array ($customId));
         $post = $result->fetchObject ();
         return $post->name;
     }
 
-    public static function getCustomId ($lookup) {
+    public static function getCustomId ($lookup)
+    {
         $result = parent::getDb ()->prepare('select id from custom_columns where label = ?');
         $result->execute (array ($lookup));
         if ($post = $result->fetchObject ()) {
@@ -63,7 +74,8 @@ 
         return NULL;
     }
 
-    public static function getCount($customId) {
+    public static function getCount($customId)
+    {
         $nCustoms = parent::executeQuerySingle ('select count(*) from ' . self::getTableName ($customId));
         $entry = new Entry (self::getAllTitle ($customId), self::getAllCustomsId ($customId),
             str_format (localize("tags.alphabetical", $nCustoms), $nCustoms), "text",
@@ -71,7 +83,8 @@ 
         return $entry;
     }
 
-    public static function getCustomById ($customId, $id) {
+    public static function getCustomById ($customId, $id)
+    {
         $result = parent::getDb ()->prepare('select id, value as name from ' . self::getTableName ($customId) . ' where id = ?');
         $result->execute (array ($id));
         if ($post = $result->fetchObject ()) {
@@ -80,15 +93,15 @@ 
         return NULL;
     }
 
-    public static function getAllCustoms($customId) {
+    public static function getAllCustoms($customId)
+    {
         $result = parent::getDb ()->query(str_format ('select {0}.id as id, {0}.value as name, count(*) as count
 from {0}, {1}
 where {0}.id = {1}.{2}
 group by {0}.id, {0}.value
 order by {0}.value', self::getTableName ($customId), self::getTableLinkName ($customId), self::getTableLinkColumn ($customId)));
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $customColumn = new CustomColumn ($post->id, $post->name, $customId);
             array_push ($entryArray, new Entry ($customColumn->name, $customColumn->getEntryId (),
                 str_format (localize("bookword", $post->count), $post->count), "text",

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

@@ -60,7 +60,7 @@ 
         if ($post = $result->fetchObject ()) {
             return $post->id;
         }
-        return NULL;
+        return null;
     }
 
     public static function getCount($customId) {
@@ -77,7 +77,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new CustomColumn ($post->id, $post->name, $customId);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllCustoms($customId) {

epubreader.php

Spacing +7 added lines, -7 removed lines

@@ -11,15 +11,15 @@ 
 require_once ("config.php");
 require_once ("base.php");
 
-header ("Content-Type: text/html;charset=utf-8");
+header("Content-Type: text/html;charset=utf-8");
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null(GetUrlParam(DB))) $add .= DB . "=" . GetUrlParam(DB) . "&";
 $myBook = Book::getBookByDataId($idData);
 
-$book = new EPub ($myBook->getFilePath ("EPUB", $idData));
-$book->initSpineComponent ();
+$book = new EPub($myBook->getFilePath("EPUB", $idData));
+$book->initSpineComponent();
 
 ?>
 <head>
@@ -35,10 +35,10 @@ 
         Monocle.DEBUG = true;
         var bookData = {
           getComponents: function () {
-            <?php echo "return [" . implode (", ", array_map (function ($comp) { return "'" . $comp . "'"; }, $book->components ())) . "];"; ?>
+            <?php echo "return [" . implode(", ", array_map(function($comp) { return "'" . $comp . "'"; }, $book->components())) . "];"; ?>
           },
           getContents: function () {
-            <?php echo "return [" . implode (", ", array_map (function ($content) { return "{title: '" . addslashes($content["title"]) . "', src: '". $content["src"] . "'}"; }, $book->contents ())) . "];"; ?>
+            <?php echo "return [" . implode(", ", array_map(function($content) { return "{title: '" . addslashes($content["title"]) . "', src: '" . $content["src"] . "'}"; }, $book->contents())) . "];"; ?>
           },
           getComponent: function (componentId) {
             return { url: "epubfs.php?<?php echo $add ?>comp="  + componentId };

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 
 $idData = getURLParam ("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null (GetUrlParam (DB))) {
+    $add .= DB . "=" . GetUrlParam (DB) . "&";
+}
 $myBook = Book::getBookByDataId($idData);
 
 $book = new EPub ($myBook->getFilePath ("EPUB", $idData));

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

@@ -13,7 +13,7 @@
 
 header ("Content-Type: text/html;charset=utf-8");
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam ("data", null);
 $add = "data=$idData&";
 if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
 $myBook = Book::getBookByDataId($idData);

feed.php

Spacing +10 added lines, -10 removed lines

@@ -10,13 +10,13 @@ 
     require_once ("config.php");
     require_once ("base.php");
 
-    header ("Content-Type:application/xml");
-    $page = getURLParam ("page", Base::PAGE_INDEX);
-    $query = getURLParam ("query");
-    $n = getURLParam ("n", "1");
+    header("Content-Type:application/xml");
+    $page = getURLParam("page", Base::PAGE_INDEX);
+    $query = getURLParam("query");
+    $n = getURLParam("n", "1");
     if ($query)
         $page = Base::PAGE_OPENSEARCH_QUERY;
-    $qid = getURLParam ("id");
+    $qid = getURLParam("id");
 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
@@ -25,15 +25,15 @@ 
         }
     }
 
-    $OPDSRender = new OPDSRenderer ();
+    $OPDSRender = new OPDSRenderer();
 
     switch ($page) {
         case Base::PAGE_OPENSEARCH :
-            echo $OPDSRender->getOpenSearch ();
+            echo $OPDSRender->getOpenSearch();
             return;
         default:
-            $currentPage = Page::getPage ($page, $qid, $query, $n);
-            $currentPage->InitializeContent ();
-            echo $OPDSRender->render ($currentPage);
+            $currentPage = Page::getPage($page, $qid, $query, $n);
+            $currentPage->InitializeContent();
+            echo $OPDSRender->render($currentPage);
             return;
     }

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
     $page = getURLParam ("page", Base::PAGE_INDEX);
     $query = getURLParam ("query");
     $n = getURLParam ("n", "1");
-    if ($query)
-        $page = Base::PAGE_OPENSEARCH_QUERY;
+    if ($query) {
+            $page = Base::PAGE_OPENSEARCH_QUERY;
+    }
     $qid = getURLParam ("id");
 
     if ($config ['cops_fetch_protect'] == "1") {

JSON_renderer.php

Indentation +46 added lines, -46 removed lines

@@ -46,19 +46,19 @@ 
         }
 
         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);
+                        "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);
     }
 
     public static function getFullBookContentArray ($book) {
@@ -125,44 +125,44 @@ 
         $out = $in;
 
         $out ["c"] = array ("version" => VERSION, "i18n" => array (
-                           "coverAlt" => localize("i18n.coversection"),
-                           "authorsTitle" => localize("authors.title"),
-                           "bookwordTitle" => localize("bookword.title"),
-                           "tagsTitle" => localize("tags.title"),
-                           "seriesTitle" => localize("series.title"),
-                           "customizeTitle" => localize ("customize.title"),
-                           "aboutTitle" => localize ("about.title"),
-                           "previousAlt" => localize ("paging.previous.alternate"),
-                           "nextAlt" => localize ("paging.next.alternate"),
-                           "searchAlt" => localize ("search.alternate"),
-                           "sortAlt" => localize ("sort.alternate"),
-                           "homeAlt" => localize ("home.alternate"),
-                           "cogAlt" => localize ("cog.alternate"),
-                           "permalinkAlt" => localize ("permalink.alternate"),
-                           "publisherName" => localize("publisher.name"),
-                           "pubdateTitle" => localize("pubdate.title"),
-                           "languagesTitle" => localize("language.title"),
-                           "contentTitle" => localize("content.summary"),
-                           "sortorderAsc" => localize("search.sortorder.asc"),
-                           "sortorderDesc" => localize("search.sortorder.desc"),
-                           "customizeEmail" => localize("customize.email")),
-                       "url" => array (
-                           "detailUrl" => "index.php?page=13&id={0}&db={1}",
-                           "coverUrl" => "fetch.php?id={0}&db={1}",
-                           "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
-                       "config" => array (
-                           "use_fancyapps" => $config ["cops_use_fancyapps"],
-                           "max_item_per_page" => $config['cops_max_item_per_page'],
-                           "kindleHack"        => "",
-                           "server_side_rendering" => useServerSideRendering (),
-                           "html_tag_filter" => $config['cops_html_tag_filter']));
+                            "coverAlt" => localize("i18n.coversection"),
+                            "authorsTitle" => localize("authors.title"),
+                            "bookwordTitle" => localize("bookword.title"),
+                            "tagsTitle" => localize("tags.title"),
+                            "seriesTitle" => localize("series.title"),
+                            "customizeTitle" => localize ("customize.title"),
+                            "aboutTitle" => localize ("about.title"),
+                            "previousAlt" => localize ("paging.previous.alternate"),
+                            "nextAlt" => localize ("paging.next.alternate"),
+                            "searchAlt" => localize ("search.alternate"),
+                            "sortAlt" => localize ("sort.alternate"),
+                            "homeAlt" => localize ("home.alternate"),
+                            "cogAlt" => localize ("cog.alternate"),
+                            "permalinkAlt" => localize ("permalink.alternate"),
+                            "publisherName" => localize("publisher.name"),
+                            "pubdateTitle" => localize("pubdate.title"),
+                            "languagesTitle" => localize("language.title"),
+                            "contentTitle" => localize("content.summary"),
+                            "sortorderAsc" => localize("search.sortorder.asc"),
+                            "sortorderDesc" => localize("search.sortorder.desc"),
+                            "customizeEmail" => localize("customize.email")),
+                        "url" => array (
+                            "detailUrl" => "index.php?page=13&id={0}&db={1}",
+                            "coverUrl" => "fetch.php?id={0}&db={1}",
+                            "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
+                        "config" => array (
+                            "use_fancyapps" => $config ["cops_use_fancyapps"],
+                            "max_item_per_page" => $config['cops_max_item_per_page'],
+                            "kindleHack"        => "",
+                            "server_side_rendering" => useServerSideRendering (),
+                            "html_tag_filter" => $config['cops_html_tag_filter']));
         if ($config['cops_thumbnail_handling'] == "1") {
             $out ["c"]["url"]["thumbnailUrl"] = $out ["c"]["url"]["coverUrl"];
         } else if (!empty ($config['cops_thumbnail_handling'])) {
             $out ["c"]["url"]["thumbnailUrl"] = $config['cops_thumbnail_handling'];
         }
         if (preg_match("/./", $_SERVER['HTTP_USER_AGENT'])) {
-          $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
+            $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
         }
         return $out;
     }
@@ -221,7 +221,7 @@ 
         }
         if (!is_null (getURLParam ("complete")) || $complete) {
             $out = self::addCompleteArray ($out);
-       }
+        }
 
         $out ["containsBook"] = 0;
         if ($currentPage->containsBook ()) {

Spacing +94 added lines, -94 removed lines

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

Braces +16 added lines, -9 removed lines

@@ -10,12 +10,12 @@ 
 
 class JSONRenderer
 {
-    public static function getBookContentArray ($book) {
+    public static function getBookContentArray ($book)
+    {
         global $config;
         $i = 0;
         $preferedData = array ();
-        foreach ($config['cops_prefered_format'] as $format)
-        {
+        foreach ($config['cops_prefered_format'] as $format) {
             if ($i == 2) { break; }
             if ($data = $book->getDataFormat ($format)) {
                 $i++;
@@ -61,7 +61,8 @@ 
                       "seriesurl" => $su);
     }
 
-    public static function getFullBookContentArray ($book) {
+    public static function getFullBookContentArray ($book)
+    {
         global $config;
         $out = self::getBookContentArray ($book);
         $database = GetUrlParam (DB);
@@ -95,7 +96,8 @@ 
         return $out;
     }
 
-    public static function getContentArray ($entry) {
+    public static function getContentArray ($entry)
+    {
         if ($entry instanceof EntryBook) {
             $out = array ( "title" => $entry->title);
             $out ["book"] = self::getBookContentArray ($entry->book);
@@ -104,7 +106,8 @@ 
         return array ( "title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink (), "number" => $entry->numberOfElement );
     }
 
-    public static function getContentArrayTypeahead ($page) {
+    public static function getContentArrayTypeahead ($page)
+    {
         $out = array ();
         foreach ($page->entryArray as $entry) {
             if ($entry instanceof EntryBook) {
@@ -120,7 +123,8 @@ 
         return $out;
     }
 
-    public static function addCompleteArray ($in) {
+    public static function addCompleteArray ($in)
+    {
         global $config;
         $out = $in;
 
@@ -167,7 +171,8 @@ 
         return $out;
     }
 
-    public static function getJson ($complete = false) {
+    public static function getJson ($complete = false)
+    {
         global $config;
         $page = getURLParam ("page", Base::PAGE_INDEX);
         $query = getURLParam ("query");
@@ -236,7 +241,9 @@ 
         }
 
         $out ["homeurl"] = "index.php";
-        if ($page != Base::PAGE_INDEX && !is_null ($database)) $out ["homeurl"] = $out ["homeurl"] .  "?" . addURLParameter ("", DB, $database);
+        if ($page != Base::PAGE_INDEX && !is_null ($database)) {
+            $out ["homeurl"] = $out ["homeurl"] .  "?" . addURLParameter ("", DB, $database);
+        }
 
         return $out;
     }

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

@@ -66,8 +66,8 @@
         $out = self::getBookContentArray ($book);
         $database = GetUrlParam (DB);
 
-        $out ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", NULL)->hrefXhtml ();
-        $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL, NULL, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml ();
+        $out ["coverurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_IMAGE_TYPE, "cover.jpg", null)->hrefXhtml ();
+        $out ["thumbnailurl"] = Data::getLink ($book, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", null, null, $config['cops_html_thumbnail_height'] * 2)->hrefXhtml ();
         $out ["content"] = $book->getComment (false);
         $out ["datas"] = array ();
         $dataKindle = $book->GetMostInterestingDataToSendToKindle ();

index.php

Indentation +8 added lines, -8 removed lines

@@ -37,14 +37,14 @@
     header ("Content-Type:text/html;charset=utf-8");
 
     $data = array("title"                 => $config['cops_title_default'],
-                  "version"               => VERSION,
-                  "opds_url"              => $config['cops_full_url'] . "feed.php",
-                  "customHeader"          => "",
-                  "template"              => getCurrentTemplate (),
-                  "server_side_rendering" => useServerSideRendering (),
-                  "current_css"           => getCurrentCss (),
-                  "favico"                => $config['cops_icon'],
-                  "getjson_url"           => "getJSON.php?" . addURLParameter (getQueryString (), "complete", 1));
+                    "version"               => VERSION,
+                    "opds_url"              => $config['cops_full_url'] . "feed.php",
+                    "customHeader"          => "",
+                    "template"              => getCurrentTemplate (),
+                    "server_side_rendering" => useServerSideRendering (),
+                    "current_css"           => getCurrentCss (),
+                    "favico"                => $config['cops_icon'],
+                    "getjson_url"           => "getJSON.php?" . addURLParameter (getQueryString (), "complete", 1));
     if (preg_match("/Kindle/", $_SERVER['HTTP_USER_AGENT'])) {
         $data ["customHeader"] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>';
     }

Spacing +18 added lines, -18 removed lines

@@ -16,16 +16,16 @@ 
         exit ();
     }
 
-    $page = getURLParam ("page", Base::PAGE_INDEX);
-    $query = getURLParam ("query");
-    $qid = getURLParam ("id");
-    $n = getURLParam ("n", "1");
-    $database = GetUrlParam (DB);
+    $page = getURLParam("page", Base::PAGE_INDEX);
+    $query = getURLParam("query");
+    $qid = getURLParam("id");
+    $n = getURLParam("n", "1");
+    $database = GetUrlParam(DB);
 
 
     // Access the database ASAP to be sure it's readable, redirect if that's not the case.
     // It has to be done before any header is sent.
-    Base::checkDatabaseAvailability ();
+    Base::checkDatabaseAvailability();
 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
@@ -34,32 +34,32 @@ 
         }
     }
 
-    header ("Content-Type:text/html;charset=utf-8");
+    header("Content-Type:text/html;charset=utf-8");
 
     $data = array("title"                 => $config['cops_title_default'],
                   "version"               => VERSION,
                   "opds_url"              => $config['cops_full_url'] . "feed.php",
                   "customHeader"          => "",
-                  "template"              => getCurrentTemplate (),
-                  "server_side_rendering" => useServerSideRendering (),
-                  "current_css"           => getCurrentCss (),
+                  "template"              => getCurrentTemplate(),
+                  "server_side_rendering" => useServerSideRendering(),
+                  "current_css"           => getCurrentCss(),
                   "favico"                => $config['cops_icon'],
-                  "getjson_url"           => "getJSON.php?" . addURLParameter (getQueryString (), "complete", 1));
+                  "getjson_url"           => "getJSON.php?" . addURLParameter(getQueryString(), "complete", 1));
     if (preg_match("/Kindle/", $_SERVER['HTTP_USER_AGENT'])) {
         $data ["customHeader"] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>';
     }
-    $headcontent = file_get_contents('templates/' . getCurrentTemplate () . '/file.html');
-    $template = new doT ();
-    $dot = $template->template ($headcontent, NULL);
-    echo ($dot ($data));
+    $headcontent = file_get_contents('templates/' . getCurrentTemplate() . '/file.html');
+    $template = new doT();
+    $dot = $template->template($headcontent, NULL);
+    echo ($dot($data));
 ?><body>
 <?php
-if (useServerSideRendering ()) {
+if (useServerSideRendering()) {
     // Get the data
     require_once ("JSON_renderer.php");
-    $data = JSONRenderer::getJson (true);
+    $data = JSONRenderer::getJson(true);
 
-    echo serverSideRender ($data);
+    echo serverSideRender($data);
 }
 ?>
 </body>

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

@@ -50,7 +50,7 @@
     }
     $headcontent = file_get_contents('templates/' . getCurrentTemplate () . '/file.html');
     $template = new doT ();
-    $dot = $template->template ($headcontent, NULL);
+    $dot = $template->template ($headcontent, null);
     echo ($dot ($data));
 ?><body>
 <?php

getJSON.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 
     require_once ("config.php");
 
-    header ("Content-Type:application/json;charset=utf-8");
+    header("Content-Type:application/json;charset=utf-8");
 
 
-    echo json_encode (JSONRenderer::getJson ());
+    echo json_encode(JSONRenderer::getJson());