seblucas / cops

lib/PageTagDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageTagDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $tag = Tag::getTagById ($this->idGet);
-        $this->idPage = $tag->getEntryId ();
+        $tag = Tag::getTagById($this->idGet);
+        $this->idPage = $tag->getEntryId();
         $this->title = $tag->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByTag ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByTag($this->idGet, $this->n);
     }
 }

lib/PageLanguageDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageLanguageDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $language = Language::getLanguageById ($this->idGet);
-        $this->idPage = $language->getEntryId ();
+        $language = Language::getLanguageById($this->idGet);
+        $this->idPage = $language->getEntryId();
         $this->title = $language->lang_code;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage($this->idGet, $this->n);
     }
 }

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/LinkFacet.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 class LinkFacet extends Link
 {
     public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
-        parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        parent::__construct($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
+        if (!is_null(GetUrlParam(DB))) $this->href = addURLParameter($this->href, DB, GetUrlParam(DB));
         $this->href = parent::getScriptName() . $this->href;
     }
 }

Braces +5 added lines, -2 removed lines

@@ -8,9 +8,12 @@
 
 class LinkFacet extends Link
 {
-    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE)
+    {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        if (!is_null (GetUrlParam (DB))) {
+            $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        }
         $this->href = parent::getScriptName() . $this->href;
     }
 }

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

@@ -8,7 +8,7 @@
 
 class LinkFacet extends Link
 {
-    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptitle = null, $pfacetGroup = null, $pactiveFacet = false) {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
         $this->href = parent::getScriptName() . $this->href;