seblucas / cops

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);
         $custom = CustomColumn::createCustom ($customId, $this->idGet);
         $this->idPage = $custom->getEntryId ();
         $this->title = $custom->value;

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

lib/Data.php

Indentation +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     public function getUpdatedFilenameKepub () {
         $str = $this->getUpdatedFilename () . ".kepub.epub";
         return str_replace(array(':', '#', '&'),
-                           array('-', '-', ' '), $str );
+                            array('-', '-', ' '), $str );
     }
 
     public function getDataLink ($rel, $title = NULL) {

Spacing +43 added lines, -43 removed lines

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

Braces +42 added lines, -29 removed lines

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

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

@@ -108,7 +108,7 @@ 
                            array('-', '-', ' '), $str );
     }
 
-    public function getDataLink ($rel, $title = NULL) {
+    public function getDataLink ($rel, $title = null) {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
@@ -126,7 +126,7 @@ 
         return $this->book->path . "/" . $this->getFilename ();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL) {
+    public function getHtmlLinkWithRewriting ($title = null) {
         global $config;
 
         $database = "";
@@ -176,7 +176,7 @@ 
         return $urlParam;
     }
 
-    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL)
+    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = null, $height = null)
     {
         global $config;
 

lib/PageSerieDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageSerieDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $serie = Serie::getSerieById ($this->idGet);
+        $serie = Serie::getSerieById($this->idGet);
         $this->title = $serie->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksBySeries ($this->idGet, $this->n);
-        $this->idPage = $serie->getEntryId ();
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksBySeries($this->idGet, $this->n);
+        $this->idPage = $serie->getEntryId();
     }
 }

lib/Tag.php

Spacing +19 added lines, -19 removed lines

@@ -20,44 +20,44 @@
         $this->name = $post->name;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_TAG_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_TAG_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_TAGS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_TAGS_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("tags.alphabetical", count(array))
-        return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
+        return parent::getCountGeneric("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
-        $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
-        $result->execute (array ($tagId));
-        if ($post = $result->fetchObject ()) {
-            return new Tag ($post);
+    public static function getTagById($tagId) {
+        $result = parent::getDb()->prepare('select id, name  from tags where id = ?');
+        $result->execute(array($tagId));
+        if ($post = $result->fetchObject()) {
+            return new Tag($post);
         }
         return NULL;
     }
 
     public static function getAllTags() {
-        return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
+        return Base::getEntryArrayWithBookNumber(self::SQL_ALL_TAGS, self::TAG_COLUMNS, array(), "Tag");
     }
 
     public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
-        $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
+        $columns = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
-        list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);
+        list ($totalNumber, $result) = parent::executeQuery($sql, $columns, "", array('%' . $query . '%'), $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $tag = new Tag ($post);
-            array_push ($entryArray, new Entry ($tag->name, $tag->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($tag->getUri ()))));
+            $tag = new Tag($post);
+            array_push($entryArray, new Entry($tag->name, $tag->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($tag->getUri()))));
         }
-        return array ($entryArray, $totalNumber);
+        return array($entryArray, $totalNumber);
     }
 }

Braces +15 added lines, -9 removed lines

@@ -15,25 +15,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_TAG_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_TAGS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("tags.alphabetical", count(array))
         return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
+    public static function getTagById ($tagId)
+    {
         $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
         $result->execute (array ($tagId));
         if ($post = $result->fetchObject ()) {
@@ -42,17 +47,18 @@ 
         return NULL;
     }
 
-    public static function getAllTags() {
+    public static function getAllTags()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
         list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $tag = new Tag ($post);
             array_push ($entryArray, new Entry ($tag->name, $tag->getEntryId (),
                 str_format (localize("bookword", $post->count), $post->count), "text",

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

@@ -39,14 +39,14 @@
         if ($post = $result->fetchObject ()) {
             return new Tag ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllTags() {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getAllTagsByQuery($query, $n, $database = null, $numberPerPage = null) {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
         list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);

lib/CustomColumnTypeBool.php

Spacing +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@ 
     // PHP pre 5.6 does not support const arrays
     private $BOOLEAN_NAMES = array(
         -1 => "customcolumn.boolean.unknown", // localize("customcolumn.boolean.unknown")
-        00 => "customcolumn.boolean.no",      // localize("customcolumn.boolean.no")
-        +1 => "customcolumn.boolean.yes",     // localize("customcolumn.boolean.yes")
+        00 => "customcolumn.boolean.no", // localize("customcolumn.boolean.no")
+        +1 => "customcolumn.boolean.yes", // localize("customcolumn.boolean.yes")
     );
 
     protected function __construct($pcustomId)
@@ -60,7 +60,7 @@ 
         $entryArray = array();
         while ($post = $result->fetchObject()) {
             $entryPContent = str_format(localize("bookword", $post->count), $post->count);
-            $entryPLinkArray = array(new LinkNavigation ($this->getUri($post->id)));
+            $entryPLinkArray = array(new LinkNavigation($this->getUri($post->id)));
 
             $entry = new Entry(localize($this->BOOLEAN_NAMES[$post->id]), $this->getEntryId($post->id), $entryPContent, $this->datatype, $entryPLinkArray, "", $post->count);
 

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

@@ -42,7 +42,7 @@
             $query = str_format(Book::SQL_BOOKS_BY_CUSTOM_BOOL_TRUE, "{0}", "{1}", $this->getTableName());
             return array($query, array());
         } else {
-            return NULL;
+            return null;
         }
     }