seblucas / cops

lib/CustomColumnTypeFloat.php

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

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

Braces +3 added lines, -1 removed lines

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

lib/PageQueryResult.php

Spacing +48 added lines, -48 removed lines

@@ -15,16 +15,16 @@ 
     const SCOPE_BOOK = "book";
     const SCOPE_PUBLISHER = "publisher";
 
-    private function useTypeahead () {
-        return !is_null (getURLParam ("search"));
+    private function useTypeahead() {
+        return !is_null(getURLParam("search"));
     }
 
-    private function searchByScope ($scope, $limit = FALSE) {
+    private function searchByScope($scope, $limit = FALSE) {
         $n = $this->n;
         $numberPerPage = NULL;
         $queryNormedAndUp = trim($this->query);
-        if (useNormAndUp ()) {
-            $queryNormedAndUp = normAndUp ($this->query);
+        if (useNormAndUp()) {
+            $queryNormedAndUp = normAndUp($this->query);
         }
         if ($limit) {
             $n = 1;
@@ -32,59 +32,59 @@ 
         }
         switch ($scope) {
             case self::SCOPE_BOOK :
-                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Book::getBooksByStartingLetter('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
                 break;
             case self::SCOPE_AUTHOR :
-                $array = Author::getAuthorsForSearch ('%' . $queryNormedAndUp);
+                $array = Author::getAuthorsForSearch('%' . $queryNormedAndUp);
                 break;
             case self::SCOPE_SERIES :
-                $array = Serie::getAllSeriesByQuery ($queryNormedAndUp);
+                $array = Serie::getAllSeriesByQuery($queryNormedAndUp);
                 break;
             case self::SCOPE_TAG :
-                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Tag::getAllTagsByQuery($queryNormedAndUp, $n, NULL, $numberPerPage);
                 break;
             case self::SCOPE_PUBLISHER :
-                $array = Publisher::getAllPublishersByQuery ($queryNormedAndUp);
+                $array = Publisher::getAllPublishersByQuery($queryNormedAndUp);
                 break;
             default:
-                $array = Book::getBooksByQuery (
-                    array ("all" => "%" . $queryNormedAndUp . "%"), $n);
+                $array = Book::getBooksByQuery(
+                    array("all" => "%" . $queryNormedAndUp . "%"), $n);
         }
 
         return $array;
     }
 
-    public function doSearchByCategory () {
-        $database = GetUrlParam (DB);
-        $out = array ();
+    public function doSearchByCategory() {
+        $database = GetUrlParam(DB);
+        $out = array();
         $pagequery = Base::PAGE_OPENSEARCH_QUERY;
-        $dbArray = array ("");
+        $dbArray = array("");
         $d = $database;
         $query = $this->query;
         // Special case when no databases were chosen, we search on all databases
-        if (Base::noDatabaseSelected ()) {
-            $dbArray = Base::getDbNameList ();
+        if (Base::noDatabaseSelected()) {
+            $dbArray = Base::getDbNameList();
             $d = 0;
         }
         foreach ($dbArray as $key) {
-            if (Base::noDatabaseSelected ()) {
-                array_push ($this->entryArray, new Entry ($key, DB . ":query:{$d}",
+            if (Base::noDatabaseSelected()) {
+                array_push($this->entryArray, new Entry($key, DB . ":query:{$d}",
                                         " ", "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$d}")), "tt-header"));
-                Base::getDb ($d);
+                                        array(new LinkNavigation("?" . DB . "={$d}")), "tt-header"));
+                Base::getDb($d);
             }
-            foreach (array (PageQueryResult::SCOPE_BOOK,
+            foreach (array(PageQueryResult::SCOPE_BOOK,
                             PageQueryResult::SCOPE_AUTHOR,
                             PageQueryResult::SCOPE_SERIES,
                             PageQueryResult::SCOPE_TAG,
                             PageQueryResult::SCOPE_PUBLISHER) as $key) {
-                if (in_array($key, getCurrentOption ('ignored_categories'))) {
+                if (in_array($key, getCurrentOption('ignored_categories'))) {
                     continue;
                 }
-                $array = $this->searchByScope ($key, TRUE);
+                $array = $this->searchByScope($key, TRUE);
 
                 $i = 0;
-                if (count ($array) == 2 && is_array ($array [0])) {
+                if (count($array) == 2 && is_array($array [0])) {
                     $total = $array [1];
                     $array = $array [0];
                 } else {
@@ -97,32 +97,32 @@ 
                     // str_format (localize("seriesword", count($array))
                     // str_format (localize("tagword", count($array))
                     // str_format (localize("publisherword", count($array))
-                    array_push ($this->entryArray, new Entry (str_format (localize ("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
-                                        str_format (localize("{$key}word", $total), $total), "text",
-                                        array ( new LinkNavigation ("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
-                                        Base::noDatabaseSelected () ? "" : "tt-header", $total));
+                    array_push($this->entryArray, new Entry(str_format(localize("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
+                                        str_format(localize("{$key}word", $total), $total), "text",
+                                        array(new LinkNavigation("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
+                                        Base::noDatabaseSelected()?"":"tt-header", $total));
                 }
-                if (!Base::noDatabaseSelected () && $this->useTypeahead ()) {
+                if (!Base::noDatabaseSelected() && $this->useTypeahead()) {
                     foreach ($array as $entry) {
-                        array_push ($this->entryArray, $entry);
+                        array_push($this->entryArray, $entry);
                         $i++;
                         if ($i > 4) { break; };
                     }
                 }
             }
             $d++;
-            if (Base::noDatabaseSelected ()) {
-                Base::clearDb ();
+            if (Base::noDatabaseSelected()) {
+                Base::clearDb();
             }
         }
         return $out;
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $scope = getURLParam ("scope");
+        $scope = getURLParam("scope");
         if (empty ($scope)) {
-            $this->title = str_format (localize ("search.result"), $this->query);
+            $this->title = str_format(localize("search.result"), $this->query);
         } else {
             // Comment to help the perl i18n script
             // str_format (localize ("search.result.author"), $this->query)
@@ -130,31 +130,31 @@ 
             // str_format (localize ("search.result.series"), $this->query)
             // str_format (localize ("search.result.book"), $this->query)
             // str_format (localize ("search.result.publisher"), $this->query)
-            $this->title = str_format (localize ("search.result.{$scope}"), $this->query);
+            $this->title = str_format(localize("search.result.{$scope}"), $this->query);
         }
 
         $crit = "%" . $this->query . "%";
 
         // Special case when we are doing a search and no database is selected
-        if (Base::noDatabaseSelected () && !$this->useTypeahead ()) {
+        if (Base::noDatabaseSelected() && !$this->useTypeahead()) {
             $i = 0;
-            foreach (Base::getDbNameList () as $key) {
-                Base::clearDb ();
-                list ($array, $totalNumber) = Book::getBooksByQuery (array ("all" => $crit), 1, $i, 1);
-                array_push ($this->entryArray, new Entry ($key, DB . ":query:{$i}",
-                                        str_format (localize ("bookword", $totalNumber), $totalNumber), "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
+            foreach (Base::getDbNameList() as $key) {
+                Base::clearDb();
+                list ($array, $totalNumber) = Book::getBooksByQuery(array("all" => $crit), 1, $i, 1);
+                array_push($this->entryArray, new Entry($key, DB . ":query:{$i}",
+                                        str_format(localize("bookword", $totalNumber), $totalNumber), "text",
+                                        array(new LinkNavigation("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
                 $i++;
             }
             return;
         }
         if (empty ($scope)) {
-            $this->doSearchByCategory ();
+            $this->doSearchByCategory();
             return;
         }
 
-        $array = $this->searchByScope ($scope);
-        if (count ($array) == 2 && is_array ($array [0])) {
+        $array = $this->searchByScope($scope);
+        if (count($array) == 2 && is_array($array [0])) {
             list ($this->entryArray, $this->totalNumber) = $array;
         } else {
             $this->entryArray = $array;

Braces +6 added lines, -3 removed lines

@@ -15,11 +15,13 @@ 
     const SCOPE_BOOK = "book";
     const SCOPE_PUBLISHER = "publisher";
 
-    private function useTypeahead () {
+    private function useTypeahead ()
+    {
         return !is_null (getURLParam ("search"));
     }
 
-    private function searchByScope ($scope, $limit = FALSE) {
+    private function searchByScope ($scope, $limit = FALSE)
+    {
         $n = $this->n;
         $numberPerPage = NULL;
         $queryNormedAndUp = trim($this->query);
@@ -54,7 +56,8 @@ 
         return $array;
     }
 
-    public function doSearchByCategory () {
+    public function doSearchByCategory ()
+    {
         $database = GetUrlParam (DB);
         $out = array ();
         $pagequery = Base::PAGE_OPENSEARCH_QUERY;

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

@@ -19,9 +19,9 @@ 
         return !is_null (getURLParam ("search"));
     }
 
-    private function searchByScope ($scope, $limit = FALSE) {
+    private function searchByScope ($scope, $limit = false) {
         $n = $this->n;
-        $numberPerPage = NULL;
+        $numberPerPage = null;
         $queryNormedAndUp = trim($this->query);
         if (useNormAndUp ()) {
             $queryNormedAndUp = normAndUp ($this->query);
@@ -32,7 +32,7 @@ 
         }
         switch ($scope) {
             case self::SCOPE_BOOK :
-                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, null, $numberPerPage);
                 break;
             case self::SCOPE_AUTHOR :
                 $array = Author::getAuthorsForSearch ('%' . $queryNormedAndUp);
@@ -41,7 +41,7 @@ 
                 $array = Serie::getAllSeriesByQuery ($queryNormedAndUp);
                 break;
             case self::SCOPE_TAG :
-                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, null, $numberPerPage);
                 break;
             case self::SCOPE_PUBLISHER :
                 $array = Publisher::getAllPublishersByQuery ($queryNormedAndUp);
@@ -81,7 +81,7 @@ 
                 if (in_array($key, getCurrentOption ('ignored_categories'))) {
                     continue;
                 }
-                $array = $this->searchByScope ($key, TRUE);
+                $array = $this->searchByScope ($key, true);
 
                 $i = 0;
                 if (count ($array) == 2 && is_array ($array [0])) {

lib/PageBookDetail.php

Spacing +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
 
 class PageBookDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->book = Book::getBookById ($this->idGet);
+        $this->book = Book::getBookById($this->idGet);
         $this->title = $this->book->title;
     }
 }

lib/PageAllAuthors.php

Spacing +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 
 class PageAllAuthors extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("authors.title");
-        if (getCurrentOption ("author_split_first_letter") == 1) {
+        if (getCurrentOption("author_split_first_letter") == 1) {
             $this->entryArray = Author::getAllAuthorsByFirstLetter();
         }
         else {

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
         $this->title = localize("authors.title");
         if (getCurrentOption ("author_split_first_letter") == 1) {
             $this->entryArray = Author::getAllAuthorsByFirstLetter();
-        }
-        else {
+        } else {
             $this->entryArray = Author::getAllAuthors();
         }
         $this->idPage = Author::ALL_AUTHORS_ID;

lib/CustomColumnTypeRating.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 
     public function getCustom($id)
     {
-        return new CustomColumn ($id, str_format(localize("customcolumn.stars", $id / 2), $id / 2), $this);
+        return new CustomColumn($id, str_format(localize("customcolumn.stars", $id / 2), $id / 2), $this);
     }
 
     protected function getAllCustomValuesFromDatabase()

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

@@ -100,7 +100,7 @@
         if ($post = $result->fetchObject()) {
             return new CustomColumn($post->value, str_format(localize("customcolumn.stars", $post->value / 2), $post->value / 2), $this);
         }
-        return new CustomColumn(NULL, localize("customcolumn.rating.unknown"), $this);
+        return new CustomColumn(null, localize("customcolumn.rating.unknown"), $this);
     }
 
     public function isSearchable()

lib/PageAllCustoms.php

Spacing +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
 
 class PageAllCustoms extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $customId = getURLParam ("custom", NULL);
+        $customId = getURLParam("custom", NULL);
         $columnType = CustomColumnType::createByCustomID($customId);
         
         $this->title = $columnType->getTitle();

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

@@ -10,7 +10,7 @@
 {
     public function InitializeContent ()
     {
-        $customId = getURLParam ("custom", NULL);
+        $customId = getURLParam ("custom", null);
         $columnType = CustomColumnType::createByCustomID($customId);
         
         $this->title = $columnType->getTitle();

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

lib/PageRatingDetail.php

Spacing +5 added lines, -5 removed lines

@@ -8,11 +8,11 @@
 
 class PageRatingDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $rating = Rating::getRatingById ($this->idGet);
-        $this->idPage = $rating->getEntryId ();
-        $this->title =str_format (localize ("ratingword", $rating->name/2), $rating->name/2);
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByRating ($this->idGet, $this->n);
+        $rating = Rating::getRatingById($this->idGet);
+        $this->idPage = $rating->getEntryId();
+        $this->title = str_format(localize("ratingword", $rating->name / 2), $rating->name / 2);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByRating($this->idGet, $this->n);
     }
 }

lib/PageAuthorDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageAuthorDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $author = Author::getAuthorById ($this->idGet);
-        $this->idPage = $author->getEntryId ();
+        $author = Author::getAuthorById($this->idGet);
+        $this->idPage = $author->getEntryId();
         $this->title = $author->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByAuthor ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByAuthor($this->idGet, $this->n);
     }
 }