Inspection of "Moved classes into lib/ dir. Split base.php into s..." - mbirth/cops - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 865827...08e2eb )

by Markus

created 2016-06-29 20:30 UTC

Status

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

@@ -8,19 +8,19 @@  discard block
 block discarded – undo
 
 require_once 'config.php';
 
-define ("VERSION", "1.0.0RC4");
-define ("DB", "db");
+define("VERSION", "1.0.0RC4");
+define("DB", "db");
 date_default_timezone_set($config['default_timezone']);
 
 
-function useServerSideRendering () {
+function useServerSideRendering() {
     global $config;
     return preg_match("/" . $config['cops_server_side_render'] . "/", $_SERVER['HTTP_USER_AGENT']);
 }
 
-function serverSideRender ($data) {
+function serverSideRender($data) {
     // Get the templates
-    $theme = getCurrentTemplate ();
+    $theme = getCurrentTemplate();
     $header = file_get_contents('templates/' . $theme . '/header.html');
     $footer = file_get_contents('templates/' . $theme . '/footer.html');
     $main = file_get_contents('templates/' . $theme . '/main.html');
@@ -28,8 +28,8 @@  discard block
 block discarded – undo
     $page = file_get_contents('templates/' . $theme . '/page.html');
 
     // Generate the function for the template
-    $template = new doT ();
-    $dot = $template->template ($page, array ("bookdetail" => $bookdetail,
+    $template = new doT();
+    $dot = $template->template($page, array("bookdetail" => $bookdetail,
                                               "header" => $header,
                                               "footer" => $footer,
                                               "main" => $main));
@@ -40,38 +40,38 @@  discard block
 block discarded – undo
     }
     // Execute the template
     if (!empty ($data)) {
-        return $dot ($data);
+        return $dot($data);
     }
 
     return NULL;
 }
 
-function getQueryString () {
-    if ( isset($_SERVER['QUERY_STRING']) ) {
+function getQueryString() {
+    if (isset($_SERVER['QUERY_STRING'])) {
         return $_SERVER['QUERY_STRING'];
     }
     return "";
 }
 
-function notFound () {
-    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+function notFound() {
+    header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
     header("Status: 404 Not Found");
 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
-function getURLParam ($name, $default = NULL) {
+function getURLParam($name, $default = NULL) {
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
         return $_GET[$name];
     }
     return $default;
 }
 
-function getCurrentOption ($option) {
+function getCurrentOption($option) {
     global $config;
     if (isset($_COOKIE[$option])) {
-        if (isset($config ["cops_" . $option]) && is_array ($config ["cops_" . $option])) {
-            return explode (",", $_COOKIE[$option]);
+        if (isset($config ["cops_" . $option]) && is_array($config ["cops_" . $option])) {
+            return explode(",", $_COOKIE[$option]);
         } else {
             return $_COOKIE[$option];
         }
@@ -83,15 +83,15 @@  discard block
 block discarded – undo
     return "";
 }
 
-function getCurrentCss () {
-    return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
+function getCurrentCss() {
+    return "templates/" . getCurrentTemplate() . "/styles/style-" . getCurrentOption("style") . ".css";
 }
 
-function getCurrentTemplate () {
-    return getCurrentOption ("template");
+function getCurrentTemplate() {
+    return getCurrentOption("template");
 }
 
-function getUrlWithVersion ($url) {
+function getUrlWithVersion($url) {
     return $url . "?v=" . VERSION;
 }
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
     return "$return\n\n--------------------------------------------\n\n";
 }
 
-function are_libxml_errors_ok ()
+function are_libxml_errors_ok()
 {
     $errors = libxml_get_errors();
 
@@ -140,15 +140,15 @@  discard block
 block discarded – undo
     return true;
 }
 
-function html2xhtml ($html) {
+function html2xhtml($html) {
     $doc = new DOMDocument();
     libxml_use_internal_errors(true);
 
     $doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
-                        $html  . '</body></html>'); // Load the HTML
+                        $html . '</body></html>'); // Load the HTML
     $output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
     $output = xml2xhtml($output);
-    if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
+    if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
         $output = $matches [1]; // Remove <html><body>
     }
     /*
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
     }
     */
 
-    if (!are_libxml_errors_ok ()) $output = "HTML code not valid.";
+    if (!are_libxml_errors_ok()) $output = "HTML code not valid.";
 
     libxml_use_internal_errors(false);
     return $output;
@@ -246,7 +246,7 @@  discard block
 block discarded – undo
     //echo var_dump($langs);
     $lang_file = NULL;
     foreach ($langs as $language => $val) {
-        $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
+        $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
             $lang = $language;
             $lang_file = $temp_file;
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
         }
     }
     if (empty ($lang_file)) {
-        $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
+        $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
     }
     return array($lang, $lang_file);
 }
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
  * This method is based on this page
  * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
  */
-function localize($phrase, $count=-1, $reset=false) {
+function localize($phrase, $count = -1, $reset = false) {
     global $config;
     if ($count == 0)
         $phrase .= ".none";
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
         $lang_file_en = NULL;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != "en") {
-            $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
+            $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
         }
 
         $lang_file_content = file_get_contents($lang_file);
@@ -290,8 +290,8 @@  discard block
 block discarded – undo
         $translations = json_decode($lang_file_content, true);
 
         /* Clean the array of all unfinished translations */
-        foreach (array_keys ($translations) as $key) {
-            if (preg_match ("/^##TODO##/", $key)) {
+        foreach (array_keys($translations) as $key) {
+            if (preg_match("/^##TODO##/", $key)) {
                 unset ($translations [$key]);
             }
         }
@@ -299,10 +299,10 @@  discard block
 block discarded – undo
         {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
-            $translations = array_merge ($translations_en, $translations);
+            $translations = array_merge($translations_en, $translations);
         }
     }
-    if (array_key_exists ($phrase, $translations)) {
+    if (array_key_exists($phrase, $translations)) {
         return $translations[$phrase];
     }
     return $phrase;
@@ -313,7 +313,7 @@  discard block
 block discarded – undo
         $urlParams = "";
     }
     $start = "";
-    if (preg_match ("#^\?(.*)#", $urlParams, $matches)) {
+    if (preg_match("#^\?(.*)#", $urlParams, $matches)) {
         $start = "?";
         $urlParams = $matches[1];
     }
@@ -327,16 +327,16 @@  discard block
 block discarded – undo
     return $start . http_build_query($params);
 }
 
-function useNormAndUp () {
+function useNormAndUp() {
     global $config;
     return $config ['cops_normalized_search'] == "1";
 }
 
-function normalizeUtf8String( $s) {
+function normalizeUtf8String($s) {
     include_once 'transliteration.php';
     return _transliteration_process($s);
 }
 
-function normAndUp ($s) {
-    return mb_strtoupper (normalizeUtf8String($s), 'UTF-8');
+function normAndUp($s) {
+    return mb_strtoupper(normalizeUtf8String($s), 'UTF-8');
 }

Please login to merge, or discard this patch.

lib/PageQueryResult.php 1 patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -15,16 +15,16 @@  discard block
 block discarded – undo
     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 = $this->query;
-        if (useNormAndUp ()) {
-            $queryNormedAndUp = normAndUp ($this->query);
+        if (useNormAndUp()) {
+            $queryNormedAndUp = normAndUp($this->query);
         }
         if ($limit) {
             $n = 1;
@@ -32,59 +32,59 @@  discard block
 block discarded – undo
         }
         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 @@  discard block
 block discarded – undo
                     // 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 @@  discard block
 block discarded – undo
             // 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;

Please login to merge, or discard this patch.

lib/PageCustomDetail.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -8,12 +8,12 @@
 block discarded – undo
 
 class PageCustomDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $customId = getURLParam ("custom", NULL);
-        $custom = CustomColumn::getCustomById ($customId, $this->idGet);
-        $this->idPage = $custom->getEntryId ();
+        $customId = getURLParam("custom", NULL);
+        $custom = CustomColumn::getCustomById($customId, $this->idGet);
+        $this->idPage = $custom->getEntryId();
         $this->title = $custom->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom ($customId, $this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom($customId, $this->idGet, $this->n);
     }
 }

Please login to merge, or discard this patch.

lib/PageBookDetail.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -8,9 +8,9 @@
 block discarded – undo
 
 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;
     }
 }

Please login to merge, or discard this patch.

lib/PageAllRating.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -8,7 +8,7 @@
 block discarded – undo
 
 class PageAllRating extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("ratings.title");
         $this->entryArray = Rating::getAllRatings();

Please login to merge, or discard this patch.

lib/Page.php 1 patch

Spacing +67 added lines, -67 removed lines patch added patch discarded remove patch

@@ -22,55 +22,55 @@  discard block
 block discarded – undo
     public $totalNumber = -1;
     public $entryArray = array();
 
-    public static function getPage ($pageId, $id, $query, $n)
+    public static function getPage($pageId, $id, $query, $n)
     {
         switch ($pageId) {
             case Base::PAGE_ALL_AUTHORS :
-                return new PageAllAuthors ($id, $query, $n);
+                return new PageAllAuthors($id, $query, $n);
             case Base::PAGE_AUTHORS_FIRST_LETTER :
-                return new PageAllAuthorsLetter ($id, $query, $n);
+                return new PageAllAuthorsLetter($id, $query, $n);
             case Base::PAGE_AUTHOR_DETAIL :
-                return new PageAuthorDetail ($id, $query, $n);
+                return new PageAuthorDetail($id, $query, $n);
             case Base::PAGE_ALL_TAGS :
-                return new PageAllTags ($id, $query, $n);
+                return new PageAllTags($id, $query, $n);
             case Base::PAGE_TAG_DETAIL :
-                return new PageTagDetail ($id, $query, $n);
+                return new PageTagDetail($id, $query, $n);
             case Base::PAGE_ALL_LANGUAGES :
-                return new PageAllLanguages ($id, $query, $n);
+                return new PageAllLanguages($id, $query, $n);
             case Base::PAGE_LANGUAGE_DETAIL :
-                return new PageLanguageDetail ($id, $query, $n);
+                return new PageLanguageDetail($id, $query, $n);
             case Base::PAGE_ALL_CUSTOMS :
-                return new PageAllCustoms ($id, $query, $n);
+                return new PageAllCustoms($id, $query, $n);
             case Base::PAGE_CUSTOM_DETAIL :
-                return new PageCustomDetail ($id, $query, $n);
+                return new PageCustomDetail($id, $query, $n);
             case Base::PAGE_ALL_RATINGS :
-                return new PageAllRating ($id, $query, $n);
+                return new PageAllRating($id, $query, $n);
             case Base::PAGE_RATING_DETAIL :
-                return new PageRatingDetail ($id, $query, $n);
+                return new PageRatingDetail($id, $query, $n);
             case Base::PAGE_ALL_SERIES :
-                return new PageAllSeries ($id, $query, $n);
+                return new PageAllSeries($id, $query, $n);
             case Base::PAGE_ALL_BOOKS :
-                return new PageAllBooks ($id, $query, $n);
+                return new PageAllBooks($id, $query, $n);
             case Base::PAGE_ALL_BOOKS_LETTER:
-                return new PageAllBooksLetter ($id, $query, $n);
+                return new PageAllBooksLetter($id, $query, $n);
             case Base::PAGE_ALL_RECENT_BOOKS :
-                return new PageRecentBooks ($id, $query, $n);
+                return new PageRecentBooks($id, $query, $n);
             case Base::PAGE_SERIE_DETAIL :
-                return new PageSerieDetail ($id, $query, $n);
+                return new PageSerieDetail($id, $query, $n);
             case Base::PAGE_OPENSEARCH_QUERY :
-                return new PageQueryResult ($id, $query, $n);
+                return new PageQueryResult($id, $query, $n);
             case Base::PAGE_BOOK_DETAIL :
-                return new PageBookDetail ($id, $query, $n);
+                return new PageBookDetail($id, $query, $n);
             case Base::PAGE_ALL_PUBLISHERS:
-                return new PageAllPublishers ($id, $query, $n);
+                return new PageAllPublishers($id, $query, $n);
             case Base::PAGE_PUBLISHER_DETAIL :
-                return new PagePublisherDetail ($id, $query, $n);
+                return new PagePublisherDetail($id, $query, $n);
             case Base::PAGE_ABOUT :
-                return new PageAbout ($id, $query, $n);
+                return new PageAbout($id, $query, $n);
             case Base::PAGE_CUSTOMIZE :
-                return new PageCustomize ($id, $query, $n);
+                return new PageCustomize($id, $query, $n);
             default:
-                $page = new Page ($id, $query, $n);
+                $page = new Page($id, $query, $n);
                 $page->idPage = "cops:catalog";
                 return $page;
         }
@@ -83,96 +83,96 @@  discard block
 block discarded – undo
         $this->query = $pquery;
         $this->n = $pn;
         $this->favicon = $config['cops_icon'];
-        $this->authorName = empty($config['cops_author_name']) ? utf8_encode('Sébastien Lucas') : $config['cops_author_name'];
-        $this->authorUri = empty($config['cops_author_uri']) ? 'http://blog.slucas.fr' : $config['cops_author_uri'];
-        $this->authorEmail = empty($config['cops_author_email']) ? '[email protected]' : $config['cops_author_email'];
+        $this->authorName = empty($config['cops_author_name'])?utf8_encode('Sébastien Lucas'):$config['cops_author_name'];
+        $this->authorUri = empty($config['cops_author_uri'])?'http://blog.slucas.fr':$config['cops_author_uri'];
+        $this->authorEmail = empty($config['cops_author_email'])?'[email protected]':$config['cops_author_email'];
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         global $config;
         $this->title = $config['cops_title_default'];
         $this->subtitle = $config['cops_subtitle_default'];
-        if (Base::noDatabaseSelected ()) {
+        if (Base::noDatabaseSelected()) {
             $i = 0;
-            foreach (Base::getDbNameList () as $key) {
-                $nBooks = Book::getBookCount ($i);
-                array_push ($this->entryArray, new Entry ($key, "cops:{$i}:catalog",
-                                        str_format (localize ("bookword", $nBooks), $nBooks), "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$i}")), "", $nBooks));
+            foreach (Base::getDbNameList() as $key) {
+                $nBooks = Book::getBookCount($i);
+                array_push($this->entryArray, new Entry($key, "cops:{$i}:catalog",
+                                        str_format(localize("bookword", $nBooks), $nBooks), "text",
+                                        array(new LinkNavigation("?" . DB . "={$i}")), "", $nBooks));
                 $i++;
-                Base::clearDb ();
+                Base::clearDb();
             }
         } else {
-            if (!in_array (PageQueryResult::SCOPE_AUTHOR, getCurrentOption ('ignored_categories'))) {
-                array_push ($this->entryArray, Author::getCount());
+            if (!in_array(PageQueryResult::SCOPE_AUTHOR, getCurrentOption('ignored_categories'))) {
+                array_push($this->entryArray, Author::getCount());
             }
-            if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_SERIES, getCurrentOption('ignored_categories'))) {
                 $series = Serie::getCount();
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
+                if (!is_null($series)) array_push($this->entryArray, $series);
             }
-            if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_PUBLISHER, getCurrentOption('ignored_categories'))) {
                 $publisher = Publisher::getCount();
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
+                if (!is_null($publisher)) array_push($this->entryArray, $publisher);
             }
-            if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_TAG, getCurrentOption('ignored_categories'))) {
                 $tags = Tag::getCount();
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
+                if (!is_null($tags)) array_push($this->entryArray, $tags);
             }
-            if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_RATING, getCurrentOption('ignored_categories'))) {
                 $rating = Rating::getCount();
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
+                if (!is_null($rating)) array_push($this->entryArray, $rating);
             }
-            if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
+            if (!in_array("language", getCurrentOption('ignored_categories'))) {
                 $languages = Language::getCount();
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
+                if (!is_null($languages)) array_push($this->entryArray, $languages);
             }
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
-                $customId = CustomColumn::getCustomId ($lookup);
-                if (!is_null ($customId)) {
-                    array_push ($this->entryArray, CustomColumn::getCount($customId));
+                $customId = CustomColumn::getCustomId($lookup);
+                if (!is_null($customId)) {
+                    array_push($this->entryArray, CustomColumn::getCount($customId));
                 }
             }
-            $this->entryArray = array_merge ($this->entryArray, Book::getCount());
+            $this->entryArray = array_merge($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled()) $this->title = Base::getDbName();
         }
     }
 
-    public function isPaginated ()
+    public function isPaginated()
     {
-        return (getCurrentOption ("max_item_per_page") != -1 &&
+        return (getCurrentOption("max_item_per_page") != -1 &&
                 $this->totalNumber != -1 &&
-                $this->totalNumber > getCurrentOption ("max_item_per_page"));
+                $this->totalNumber > getCurrentOption("max_item_per_page"));
     }
 
-    public function getNextLink ()
+    public function getNextLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
-        if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
+        if (($this->n) * getCurrentOption("max_item_per_page") < $this->totalNumber) {
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n + 1), "next", localize("paging.next.alternate"));
         }
         return NULL;
     }
 
-    public function getPrevLink ()
+    public function getPrevLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
         if ($this->n > 1) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n - 1), "previous", localize("paging.previous.alternate"));
         }
         return NULL;
     }
 
-    public function getMaxPage ()
+    public function getMaxPage()
     {
-        return ceil ($this->totalNumber / getCurrentOption ("max_item_per_page"));
+        return ceil($this->totalNumber / getCurrentOption("max_item_per_page"));
     }
 
-    public function containsBook ()
+    public function containsBook()
     {
-        if (count ($this->entryArray) == 0) return false;
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
+        if (count($this->entryArray) == 0) return false;
+        if (get_class($this->entryArray [0]) == "EntryBook") return true;
         return false;
     }
 }

Please login to merge, or discard this patch.

lib/PageAllBooksLetter.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -8,15 +8,15 @@
 block discarded – undo
 
 class PageAllBooksLetter extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter ($this->idGet, $this->n);
-        $this->idPage = Book::getEntryIdByLetter ($this->idGet);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter($this->idGet, $this->n);
+        $this->idPage = Book::getEntryIdByLetter($this->idGet);
 
         $count = $this->totalNumber;
         if ($count == -1)
-            $count = count ($this->entryArray);
+            $count = count($this->entryArray);
 
-        $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("bookword", $count), $count), $this->idGet);
+        $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("bookword", $count), $count), $this->idGet);
     }
 }

Please login to merge, or discard this patch.

lib/PageLanguageDetail.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -8,11 +8,11 @@
 block discarded – undo
 
 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);
     }
 }

Please login to merge, or discard this patch.

lib/PageAllAuthorsLetter.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -8,10 +8,10 @@
 block discarded – undo
 
 class PageAllAuthorsLetter extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->idPage = Author::getEntryIdByLetter ($this->idGet);
-        $this->entryArray = Author::getAuthorsByStartingLetter ($this->idGet);
-        $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("authorword", count ($this->entryArray)), count ($this->entryArray)), $this->idGet);
+        $this->idPage = Author::getEntryIdByLetter($this->idGet);
+        $this->entryArray = Author::getAuthorsByStartingLetter($this->idGet);
+        $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("authorword", count($this->entryArray)), count($this->entryArray)), $this->idGet);
     }
 }

Please login to merge, or discard this patch.

		@@ -8,19 +8,19 @@ discard block
		block discarded – undo
8	8
9	9	require_once 'config.php';
10	10
11		-define ("VERSION", "1.0.0RC4");
12		-define ("DB", "db");
	11	+define("VERSION", "1.0.0RC4");
	12	+define("DB", "db");
13	13	date_default_timezone_set($config['default_timezone']);
14	14
15	15
16		-function useServerSideRendering () {
	16	+function useServerSideRendering() {
17	17	global $config;
18	18	return preg_match("/" . $config['cops_server_side_render'] . "/", $_SERVER['HTTP_USER_AGENT']);
19	19	}
20	20
21		-function serverSideRender ($data) {
	21	+function serverSideRender($data) {
22	22	// Get the templates
23		- $theme = getCurrentTemplate ();
	23	+ $theme = getCurrentTemplate();
24	24	$header = file_get_contents('templates/' . $theme . '/header.html');
25	25	$footer = file_get_contents('templates/' . $theme . '/footer.html');
26	26	$main = file_get_contents('templates/' . $theme . '/main.html');
		@@ -28,8 +28,8 @@ discard block
		block discarded – undo
28	28	$page = file_get_contents('templates/' . $theme . '/page.html');
29	29
30	30	// Generate the function for the template
31		- $template = new doT ();
32		- $dot = $template->template ($page, array ("bookdetail" => $bookdetail,
	31	+ $template = new doT();
	32	+ $dot = $template->template($page, array("bookdetail" => $bookdetail,
33	33	"header" => $header,
34	34	"footer" => $footer,
35	35	"main" => $main));
		@@ -40,38 +40,38 @@ discard block
		block discarded – undo
40	40	}
41	41	// Execute the template
42	42	if (!empty ($data)) {
43		- return $dot ($data);
	43	+ return $dot($data);
44	44	}
45	45
46	46	return NULL;
47	47	}
48	48
49		-function getQueryString () {
50		- if ( isset($_SERVER['QUERY_STRING']) ) {
	49	+function getQueryString() {
	50	+ if (isset($_SERVER['QUERY_STRING'])) {
51	51	return $_SERVER['QUERY_STRING'];
52	52	}
53	53	return "";
54	54	}
55	55
56		-function notFound () {
57		- header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
	56	+function notFound() {
	57	+ header($_SERVER["SERVER_PROTOCOL"] . " 404 Not Found");
58	58	header("Status: 404 Not Found");
59	59
60	60	$_SERVER['REDIRECT_STATUS'] = 404;
61	61	}
62	62
63		-function getURLParam ($name, $default = NULL) {
	63	+function getURLParam($name, $default = NULL) {
64	64	if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
65	65	return $_GET[$name];
66	66	}
67	67	return $default;
68	68	}
69	69
70		-function getCurrentOption ($option) {
	70	+function getCurrentOption($option) {
71	71	global $config;
72	72	if (isset($_COOKIE[$option])) {
73		- if (isset($config ["cops_" . $option]) && is_array ($config ["cops_" . $option])) {
74		- return explode (",", $_COOKIE[$option]);
	73	+ if (isset($config ["cops_" . $option]) && is_array($config ["cops_" . $option])) {
	74	+ return explode(",", $_COOKIE[$option]);
75	75	} else {
76	76	return $_COOKIE[$option];
77	77	}
		@@ -83,15 +83,15 @@ discard block
		block discarded – undo
83	83	return "";
84	84	}
85	85
86		-function getCurrentCss () {
87		- return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
	86	+function getCurrentCss() {
	87	+ return "templates/" . getCurrentTemplate() . "/styles/style-" . getCurrentOption("style") . ".css";
88	88	}
89	89
90		-function getCurrentTemplate () {
91		- return getCurrentOption ("template");
	90	+function getCurrentTemplate() {
	91	+ return getCurrentOption("template");
92	92	}
93	93
94		-function getUrlWithVersion ($url) {
	94	+function getUrlWithVersion($url) {
95	95	return $url . "?v=" . VERSION;
96	96	}
97	97
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	return "$return\n\n--------------------------------------------\n\n";
131	131	}
132	132
133		-function are_libxml_errors_ok ()
	133	+function are_libxml_errors_ok()
134	134	{
135	135	$errors = libxml_get_errors();
136	136
		@@ -140,15 +140,15 @@ discard block
		block discarded – undo
140	140	return true;
141	141	}
142	142
143		-function html2xhtml ($html) {
	143	+function html2xhtml($html) {
144	144	$doc = new DOMDocument();
145	145	libxml_use_internal_errors(true);
146	146
147	147	$doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
148		- $html . '</body></html>'); // Load the HTML
	148	+ $html . '</body></html>'); // Load the HTML
149	149	$output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
150	150	$output = xml2xhtml($output);
151		- if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
	151	+ if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
152	152	$output = $matches [1]; // Remove <html><body>
153	153	}
154	154	/*
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	}
161	161	*/
162	162
163		- if (!are_libxml_errors_ok ()) $output = "HTML code not valid.";
	163	+ if (!are_libxml_errors_ok()) $output = "HTML code not valid.";
164	164
165	165	libxml_use_internal_errors(false);
166	166	return $output;
		@@ -246,7 +246,7 @@ discard block
		block discarded – undo
246	246	//echo var_dump($langs);
247	247	$lang_file = NULL;
248	248	foreach ($langs as $language => $val) {
249		- $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
	249	+ $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
250	250	if (file_exists($temp_file)) {
251	251	$lang = $language;
252	252	$lang_file = $temp_file;
		@@ -254,7 +254,7 @@ discard block
		block discarded – undo
254	254	}
255	255	}
256	256	if (empty ($lang_file)) {
257		- $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
	257	+ $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
258	258	}
259	259	return array($lang, $lang_file);
260	260	}
		@@ -263,7 +263,7 @@ discard block
		block discarded – undo
263	263	* This method is based on this page
264	264	* http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
265	265	*/
266		-function localize($phrase, $count=-1, $reset=false) {
	266	+function localize($phrase, $count = -1, $reset = false) {
267	267	global $config;
268	268	if ($count == 0)
269	269	$phrase .= ".none";
		@@ -282,7 +282,7 @@ discard block
		block discarded – undo
282	282	$lang_file_en = NULL;
283	283	list ($lang, $lang_file) = getLangAndTranslationFile();
284	284	if ($lang != "en") {
285		- $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
	285	+ $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
286	286	}
287	287
288	288	$lang_file_content = file_get_contents($lang_file);
		@@ -290,8 +290,8 @@ discard block
		block discarded – undo
290	290	$translations = json_decode($lang_file_content, true);
291	291
292	292	/* Clean the array of all unfinished translations */
293		- foreach (array_keys ($translations) as $key) {
294		- if (preg_match ("/^##TODO##/", $key)) {
	293	+ foreach (array_keys($translations) as $key) {
	294	+ if (preg_match("/^##TODO##/", $key)) {
295	295	unset ($translations [$key]);
296	296	}
297	297	}
		@@ -299,10 +299,10 @@ discard block
		block discarded – undo
299	299	{
300	300	$lang_file_content = file_get_contents($lang_file_en);
301	301	$translations_en = json_decode($lang_file_content, true);
302		- $translations = array_merge ($translations_en, $translations);
	302	+ $translations = array_merge($translations_en, $translations);
303	303	}
304	304	}
305		- if (array_key_exists ($phrase, $translations)) {
	305	+ if (array_key_exists($phrase, $translations)) {
306	306	return $translations[$phrase];
307	307	}
308	308	return $phrase;
		@@ -313,7 +313,7 @@ discard block
		block discarded – undo
313	313	$urlParams = "";
314	314	}
315	315	$start = "";
316		- if (preg_match ("#^\?(.*)#", $urlParams, $matches)) {
	316	+ if (preg_match("#^\?(.*)#", $urlParams, $matches)) {
317	317	$start = "?";
318	318	$urlParams = $matches[1];
319	319	}
		@@ -327,16 +327,16 @@ discard block
		block discarded – undo
327	327	return $start . http_build_query($params);
328	328	}
329	329
330		-function useNormAndUp () {
	330	+function useNormAndUp() {
331	331	global $config;
332	332	return $config ['cops_normalized_search'] == "1";
333	333	}
334	334
335		-function normalizeUtf8String( $s) {
	335	+function normalizeUtf8String($s) {
336	336	include_once 'transliteration.php';
337	337	return _transliteration_process($s);
338	338	}
339	339
340		-function normAndUp ($s) {
341		- return mb_strtoupper (normalizeUtf8String($s), 'UTF-8');
	340	+function normAndUp($s) {
	341	+ return mb_strtoupper(normalizeUtf8String($s), 'UTF-8');
342	342	}

		@@ -15,16 +15,16 @@ discard block
		block discarded – undo
15	15	const SCOPE_BOOK = "book";
16	16	const SCOPE_PUBLISHER = "publisher";
17	17
18		- private function useTypeahead () {
19		- return !is_null (getURLParam ("search"));
	18	+ private function useTypeahead() {
	19	+ return !is_null(getURLParam("search"));
20	20	}
21	21
22		- private function searchByScope ($scope, $limit = FALSE) {
	22	+ private function searchByScope($scope, $limit = FALSE) {
23	23	$n = $this->n;
24	24	$numberPerPage = NULL;
25	25	$queryNormedAndUp = $this->query;
26		- if (useNormAndUp ()) {
27		- $queryNormedAndUp = normAndUp ($this->query);
	26	+ if (useNormAndUp()) {
	27	+ $queryNormedAndUp = normAndUp($this->query);
28	28	}
29	29	if ($limit) {
30	30	$n = 1;
		@@ -32,59 +32,59 @@ discard block
		block discarded – undo
32	32	}
33	33	switch ($scope) {
34	34	case self::SCOPE_BOOK :
35		- $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
	35	+ $array = Book::getBooksByStartingLetter('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
36	36	break;
37	37	case self::SCOPE_AUTHOR :
38		- $array = Author::getAuthorsForSearch ('%' . $queryNormedAndUp);
	38	+ $array = Author::getAuthorsForSearch('%' . $queryNormedAndUp);
39	39	break;
40	40	case self::SCOPE_SERIES :
41		- $array = Serie::getAllSeriesByQuery ($queryNormedAndUp);
	41	+ $array = Serie::getAllSeriesByQuery($queryNormedAndUp);
42	42	break;
43	43	case self::SCOPE_TAG :
44		- $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, NULL, $numberPerPage);
	44	+ $array = Tag::getAllTagsByQuery($queryNormedAndUp, $n, NULL, $numberPerPage);
45	45	break;
46	46	case self::SCOPE_PUBLISHER :
47		- $array = Publisher::getAllPublishersByQuery ($queryNormedAndUp);
	47	+ $array = Publisher::getAllPublishersByQuery($queryNormedAndUp);
48	48	break;
49	49	default:
50		- $array = Book::getBooksByQuery (
51		- array ("all" => "%" . $queryNormedAndUp . "%"), $n);
	50	+ $array = Book::getBooksByQuery(
	51	+ array("all" => "%" . $queryNormedAndUp . "%"), $n);
52	52	}
53	53
54	54	return $array;
55	55	}
56	56
57		- public function doSearchByCategory () {
58		- $database = GetUrlParam (DB);
59		- $out = array ();
	57	+ public function doSearchByCategory() {
	58	+ $database = GetUrlParam(DB);
	59	+ $out = array();
60	60	$pagequery = Base::PAGE_OPENSEARCH_QUERY;
61		- $dbArray = array ("");
	61	+ $dbArray = array("");
62	62	$d = $database;
63	63	$query = $this->query;
64	64	// Special case when no databases were chosen, we search on all databases
65		- if (Base::noDatabaseSelected ()) {
66		- $dbArray = Base::getDbNameList ();
	65	+ if (Base::noDatabaseSelected()) {
	66	+ $dbArray = Base::getDbNameList();
67	67	$d = 0;
68	68	}
69	69	foreach ($dbArray as $key) {
70		- if (Base::noDatabaseSelected ()) {
71		- array_push ($this->entryArray, new Entry ($key, DB . ":query:{$d}",
	70	+ if (Base::noDatabaseSelected()) {
	71	+ array_push($this->entryArray, new Entry($key, DB . ":query:{$d}",
72	72	" ", "text",
73		- array ( new LinkNavigation ("?" . DB . "={$d}")), "tt-header"));
74		- Base::getDb ($d);
	73	+ array(new LinkNavigation("?" . DB . "={$d}")), "tt-header"));
	74	+ Base::getDb($d);
75	75	}
76		- foreach (array (PageQueryResult::SCOPE_BOOK,
	76	+ foreach (array(PageQueryResult::SCOPE_BOOK,
77	77	PageQueryResult::SCOPE_AUTHOR,
78	78	PageQueryResult::SCOPE_SERIES,
79	79	PageQueryResult::SCOPE_TAG,
80	80	PageQueryResult::SCOPE_PUBLISHER) as $key) {
81		- if (in_array($key, getCurrentOption ('ignored_categories'))) {
	81	+ if (in_array($key, getCurrentOption('ignored_categories'))) {
82	82	continue;
83	83	}
84		- $array = $this->searchByScope ($key, TRUE);
	84	+ $array = $this->searchByScope($key, TRUE);
85	85
86	86	$i = 0;
87		- if (count ($array) == 2 && is_array ($array [0])) {
	87	+ if (count($array) == 2 && is_array($array [0])) {
88	88	$total = $array [1];
89	89	$array = $array [0];
90	90	} else {
		@@ -97,32 +97,32 @@ discard block
		block discarded – undo
97	97	// str_format (localize("seriesword", count($array))
98	98	// str_format (localize("tagword", count($array))
99	99	// str_format (localize("publisherword", count($array))
100		- array_push ($this->entryArray, new Entry (str_format (localize ("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
101		- str_format (localize("{$key}word", $total), $total), "text",
102		- array ( new LinkNavigation ("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
103		- Base::noDatabaseSelected () ? "" : "tt-header", $total));
	100	+ array_push($this->entryArray, new Entry(str_format(localize("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
	101	+ str_format(localize("{$key}word", $total), $total), "text",
	102	+ array(new LinkNavigation("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
	103	+ Base::noDatabaseSelected()?"":"tt-header", $total));
104	104	}
105		- if (!Base::noDatabaseSelected () && $this->useTypeahead ()) {
	105	+ if (!Base::noDatabaseSelected() && $this->useTypeahead()) {
106	106	foreach ($array as $entry) {
107		- array_push ($this->entryArray, $entry);
	107	+ array_push($this->entryArray, $entry);
108	108	$i++;
109	109	if ($i > 4) { break; };
110	110	}
111	111	}
112	112	}
113	113	$d++;
114		- if (Base::noDatabaseSelected ()) {
115		- Base::clearDb ();
	114	+ if (Base::noDatabaseSelected()) {
	115	+ Base::clearDb();
116	116	}
117	117	}
118	118	return $out;
119	119	}
120	120
121		- public function InitializeContent ()
	121	+ public function InitializeContent()
122	122	{
123		- $scope = getURLParam ("scope");
	123	+ $scope = getURLParam("scope");
124	124	if (empty ($scope)) {
125		- $this->title = str_format (localize ("search.result"), $this->query);
	125	+ $this->title = str_format(localize("search.result"), $this->query);
126	126	} else {
127	127	// Comment to help the perl i18n script
128	128	// str_format (localize ("search.result.author"), $this->query)
		@@ -130,31 +130,31 @@ discard block
		block discarded – undo
130	130	// str_format (localize ("search.result.series"), $this->query)
131	131	// str_format (localize ("search.result.book"), $this->query)
132	132	// str_format (localize ("search.result.publisher"), $this->query)
133		- $this->title = str_format (localize ("search.result.{$scope}"), $this->query);
	133	+ $this->title = str_format(localize("search.result.{$scope}"), $this->query);
134	134	}
135	135
136	136	$crit = "%" . $this->query . "%";
137	137
138	138	// Special case when we are doing a search and no database is selected
139		- if (Base::noDatabaseSelected () && !$this->useTypeahead ()) {
	139	+ if (Base::noDatabaseSelected() && !$this->useTypeahead()) {
140	140	$i = 0;
141		- foreach (Base::getDbNameList () as $key) {
142		- Base::clearDb ();
143		- list ($array, $totalNumber) = Book::getBooksByQuery (array ("all" => $crit), 1, $i, 1);
144		- array_push ($this->entryArray, new Entry ($key, DB . ":query:{$i}",
145		- str_format (localize ("bookword", $totalNumber), $totalNumber), "text",
146		- array ( new LinkNavigation ("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
	141	+ foreach (Base::getDbNameList() as $key) {
	142	+ Base::clearDb();
	143	+ list ($array, $totalNumber) = Book::getBooksByQuery(array("all" => $crit), 1, $i, 1);
	144	+ array_push($this->entryArray, new Entry($key, DB . ":query:{$i}",
	145	+ str_format(localize("bookword", $totalNumber), $totalNumber), "text",
	146	+ array(new LinkNavigation("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
147	147	$i++;
148	148	}
149	149	return;
150	150	}
151	151	if (empty ($scope)) {
152		- $this->doSearchByCategory ();
	152	+ $this->doSearchByCategory();
153	153	return;
154	154	}
155	155
156		- $array = $this->searchByScope ($scope);
157		- if (count ($array) == 2 && is_array ($array [0])) {
	156	+ $array = $this->searchByScope($scope);
	157	+ if (count($array) == 2 && is_array($array [0])) {
158	158	list ($this->entryArray, $this->totalNumber) = $array;
159	159	} else {
160	160	$this->entryArray = $array;

		@@ -8,12 +8,12 @@
		block discarded – undo
8	8
9	9	class PageCustomDetail extends Page
10	10	{
11		- public function InitializeContent ()
	11	+ public function InitializeContent()
12	12	{
13		- $customId = getURLParam ("custom", NULL);
14		- $custom = CustomColumn::getCustomById ($customId, $this->idGet);
15		- $this->idPage = $custom->getEntryId ();
	13	+ $customId = getURLParam("custom", NULL);
	14	+ $custom = CustomColumn::getCustomById($customId, $this->idGet);
	15	+ $this->idPage = $custom->getEntryId();
16	16	$this->title = $custom->name;
17		- list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom ($customId, $this->idGet, $this->n);
	17	+ list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom($customId, $this->idGet, $this->n);
18	18	}
19	19	}

		@@ -8,9 +8,9 @@
		block discarded – undo
8	8
9	9	class PageBookDetail extends Page
10	10	{
11		- public function InitializeContent ()
	11	+ public function InitializeContent()
12	12	{
13		- $this->book = Book::getBookById ($this->idGet);
	13	+ $this->book = Book::getBookById($this->idGet);
14	14	$this->title = $this->book->title;
15	15	}
16	16	}

		@@ -8,7 +8,7 @@
		block discarded – undo
8	8
9	9	class PageAllRating extends Page
10	10	{
11		- public function InitializeContent ()
	11	+ public function InitializeContent()
12	12	{
13	13	$this->title = localize("ratings.title");
14	14	$this->entryArray = Rating::getAllRatings();

		@@ -22,55 +22,55 @@ discard block
		block discarded – undo
22	22	public $totalNumber = -1;
23	23	public $entryArray = array();
24	24
25		- public static function getPage ($pageId, $id, $query, $n)
	25	+ public static function getPage($pageId, $id, $query, $n)
26	26	{
27	27	switch ($pageId) {
28	28	case Base::PAGE_ALL_AUTHORS :
29		- return new PageAllAuthors ($id, $query, $n);
	29	+ return new PageAllAuthors($id, $query, $n);
30	30	case Base::PAGE_AUTHORS_FIRST_LETTER :
31		- return new PageAllAuthorsLetter ($id, $query, $n);
	31	+ return new PageAllAuthorsLetter($id, $query, $n);
32	32	case Base::PAGE_AUTHOR_DETAIL :
33		- return new PageAuthorDetail ($id, $query, $n);
	33	+ return new PageAuthorDetail($id, $query, $n);
34	34	case Base::PAGE_ALL_TAGS :
35		- return new PageAllTags ($id, $query, $n);
	35	+ return new PageAllTags($id, $query, $n);
36	36	case Base::PAGE_TAG_DETAIL :
37		- return new PageTagDetail ($id, $query, $n);
	37	+ return new PageTagDetail($id, $query, $n);
38	38	case Base::PAGE_ALL_LANGUAGES :
39		- return new PageAllLanguages ($id, $query, $n);
	39	+ return new PageAllLanguages($id, $query, $n);
40	40	case Base::PAGE_LANGUAGE_DETAIL :
41		- return new PageLanguageDetail ($id, $query, $n);
	41	+ return new PageLanguageDetail($id, $query, $n);
42	42	case Base::PAGE_ALL_CUSTOMS :
43		- return new PageAllCustoms ($id, $query, $n);
	43	+ return new PageAllCustoms($id, $query, $n);
44	44	case Base::PAGE_CUSTOM_DETAIL :
45		- return new PageCustomDetail ($id, $query, $n);
	45	+ return new PageCustomDetail($id, $query, $n);
46	46	case Base::PAGE_ALL_RATINGS :
47		- return new PageAllRating ($id, $query, $n);
	47	+ return new PageAllRating($id, $query, $n);
48	48	case Base::PAGE_RATING_DETAIL :
49		- return new PageRatingDetail ($id, $query, $n);
	49	+ return new PageRatingDetail($id, $query, $n);
50	50	case Base::PAGE_ALL_SERIES :
51		- return new PageAllSeries ($id, $query, $n);
	51	+ return new PageAllSeries($id, $query, $n);
52	52	case Base::PAGE_ALL_BOOKS :
53		- return new PageAllBooks ($id, $query, $n);
	53	+ return new PageAllBooks($id, $query, $n);
54	54	case Base::PAGE_ALL_BOOKS_LETTER:
55		- return new PageAllBooksLetter ($id, $query, $n);
	55	+ return new PageAllBooksLetter($id, $query, $n);
56	56	case Base::PAGE_ALL_RECENT_BOOKS :
57		- return new PageRecentBooks ($id, $query, $n);
	57	+ return new PageRecentBooks($id, $query, $n);
58	58	case Base::PAGE_SERIE_DETAIL :
59		- return new PageSerieDetail ($id, $query, $n);
	59	+ return new PageSerieDetail($id, $query, $n);
60	60	case Base::PAGE_OPENSEARCH_QUERY :
61		- return new PageQueryResult ($id, $query, $n);
	61	+ return new PageQueryResult($id, $query, $n);
62	62	case Base::PAGE_BOOK_DETAIL :
63		- return new PageBookDetail ($id, $query, $n);
	63	+ return new PageBookDetail($id, $query, $n);
64	64	case Base::PAGE_ALL_PUBLISHERS:
65		- return new PageAllPublishers ($id, $query, $n);
	65	+ return new PageAllPublishers($id, $query, $n);
66	66	case Base::PAGE_PUBLISHER_DETAIL :
67		- return new PagePublisherDetail ($id, $query, $n);
	67	+ return new PagePublisherDetail($id, $query, $n);
68	68	case Base::PAGE_ABOUT :
69		- return new PageAbout ($id, $query, $n);
	69	+ return new PageAbout($id, $query, $n);
70	70	case Base::PAGE_CUSTOMIZE :
71		- return new PageCustomize ($id, $query, $n);
	71	+ return new PageCustomize($id, $query, $n);
72	72	default:
73		- $page = new Page ($id, $query, $n);
	73	+ $page = new Page($id, $query, $n);
74	74	$page->idPage = "cops:catalog";
75	75	return $page;
76	76	}
		@@ -83,96 +83,96 @@ discard block
		block discarded – undo
83	83	$this->query = $pquery;
84	84	$this->n = $pn;
85	85	$this->favicon = $config['cops_icon'];
86		- $this->authorName = empty($config['cops_author_name']) ? utf8_encode('Sébastien Lucas') : $config['cops_author_name'];
87		- $this->authorUri = empty($config['cops_author_uri']) ? 'http://blog.slucas.fr' : $config['cops_author_uri'];
88		- $this->authorEmail = empty($config['cops_author_email']) ? '[email protected]' : $config['cops_author_email'];
	86	+ $this->authorName = empty($config['cops_author_name'])?utf8_encode('Sébastien Lucas'):$config['cops_author_name'];
	87	+ $this->authorUri = empty($config['cops_author_uri'])?'http://blog.slucas.fr':$config['cops_author_uri'];
	88	+ $this->authorEmail = empty($config['cops_author_email'])?'[email protected]':$config['cops_author_email'];
89	89	}
90	90
91		- public function InitializeContent ()
	91	+ public function InitializeContent()
92	92	{
93	93	global $config;
94	94	$this->title = $config['cops_title_default'];
95	95	$this->subtitle = $config['cops_subtitle_default'];
96		- if (Base::noDatabaseSelected ()) {
	96	+ if (Base::noDatabaseSelected()) {
97	97	$i = 0;
98		- foreach (Base::getDbNameList () as $key) {
99		- $nBooks = Book::getBookCount ($i);
100		- array_push ($this->entryArray, new Entry ($key, "cops:{$i}:catalog",
101		- str_format (localize ("bookword", $nBooks), $nBooks), "text",
102		- array ( new LinkNavigation ("?" . DB . "={$i}")), "", $nBooks));
	98	+ foreach (Base::getDbNameList() as $key) {
	99	+ $nBooks = Book::getBookCount($i);
	100	+ array_push($this->entryArray, new Entry($key, "cops:{$i}:catalog",
	101	+ str_format(localize("bookword", $nBooks), $nBooks), "text",
	102	+ array(new LinkNavigation("?" . DB . "={$i}")), "", $nBooks));
103	103	$i++;
104		- Base::clearDb ();
	104	+ Base::clearDb();
105	105	}
106	106	} else {
107		- if (!in_array (PageQueryResult::SCOPE_AUTHOR, getCurrentOption ('ignored_categories'))) {
108		- array_push ($this->entryArray, Author::getCount());
	107	+ if (!in_array(PageQueryResult::SCOPE_AUTHOR, getCurrentOption('ignored_categories'))) {
	108	+ array_push($this->entryArray, Author::getCount());
109	109	}
110		- if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
	110	+ if (!in_array(PageQueryResult::SCOPE_SERIES, getCurrentOption('ignored_categories'))) {
111	111	$series = Serie::getCount();
112		- if (!is_null ($series)) array_push ($this->entryArray, $series);
	112	+ if (!is_null($series)) array_push($this->entryArray, $series);
113	113	}
114		- if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
	114	+ if (!in_array(PageQueryResult::SCOPE_PUBLISHER, getCurrentOption('ignored_categories'))) {
115	115	$publisher = Publisher::getCount();
116		- if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
	116	+ if (!is_null($publisher)) array_push($this->entryArray, $publisher);
117	117	}
118		- if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
	118	+ if (!in_array(PageQueryResult::SCOPE_TAG, getCurrentOption('ignored_categories'))) {
119	119	$tags = Tag::getCount();
120		- if (!is_null ($tags)) array_push ($this->entryArray, $tags);
	120	+ if (!is_null($tags)) array_push($this->entryArray, $tags);
121	121	}
122		- if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
	122	+ if (!in_array(PageQueryResult::SCOPE_RATING, getCurrentOption('ignored_categories'))) {
123	123	$rating = Rating::getCount();
124		- if (!is_null ($rating)) array_push ($this->entryArray, $rating);
	124	+ if (!is_null($rating)) array_push($this->entryArray, $rating);
125	125	}
126		- if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
	126	+ if (!in_array("language", getCurrentOption('ignored_categories'))) {
127	127	$languages = Language::getCount();
128		- if (!is_null ($languages)) array_push ($this->entryArray, $languages);
	128	+ if (!is_null($languages)) array_push($this->entryArray, $languages);
129	129	}
130	130	foreach ($config['cops_calibre_custom_column'] as $lookup) {
131		- $customId = CustomColumn::getCustomId ($lookup);
132		- if (!is_null ($customId)) {
133		- array_push ($this->entryArray, CustomColumn::getCount($customId));
	131	+ $customId = CustomColumn::getCustomId($lookup);
	132	+ if (!is_null($customId)) {
	133	+ array_push($this->entryArray, CustomColumn::getCount($customId));
134	134	}
135	135	}
136		- $this->entryArray = array_merge ($this->entryArray, Book::getCount());
	136	+ $this->entryArray = array_merge($this->entryArray, Book::getCount());
137	137
138		- if (Base::isMultipleDatabaseEnabled ()) $this->title = Base::getDbName ();
	138	+ if (Base::isMultipleDatabaseEnabled()) $this->title = Base::getDbName();
139	139	}
140	140	}
141	141
142		- public function isPaginated ()
	142	+ public function isPaginated()
143	143	{
144		- return (getCurrentOption ("max_item_per_page") != -1 &&
	144	+ return (getCurrentOption("max_item_per_page") != -1 &&
145	145	$this->totalNumber != -1 &&
146		- $this->totalNumber > getCurrentOption ("max_item_per_page"));
	146	+ $this->totalNumber > getCurrentOption("max_item_per_page"));
147	147	}
148	148
149		- public function getNextLink ()
	149	+ public function getNextLink()
150	150	{
151		- $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
152		- if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
153		- return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
	151	+ $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
	152	+ if (($this->n) * getCurrentOption("max_item_per_page") < $this->totalNumber) {
	153	+ return new LinkNavigation($currentUrl . "&n=" . ($this->n + 1), "next", localize("paging.next.alternate"));
154	154	}
155	155	return NULL;
156	156	}
157	157
158		- public function getPrevLink ()
	158	+ public function getPrevLink()
159	159	{
160		- $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
	160	+ $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
161	161	if ($this->n > 1) {
162		- return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
	162	+ return new LinkNavigation($currentUrl . "&n=" . ($this->n - 1), "previous", localize("paging.previous.alternate"));
163	163	}
164	164	return NULL;
165	165	}
166	166
167		- public function getMaxPage ()
	167	+ public function getMaxPage()
168	168	{
169		- return ceil ($this->totalNumber / getCurrentOption ("max_item_per_page"));
	169	+ return ceil($this->totalNumber / getCurrentOption("max_item_per_page"));
170	170	}
171	171
172		- public function containsBook ()
	172	+ public function containsBook()
173	173	{
174		- if (count ($this->entryArray) == 0) return false;
175		- if (get_class ($this->entryArray [0]) == "EntryBook") return true;
	174	+ if (count($this->entryArray) == 0) return false;
	175	+ if (get_class($this->entryArray [0]) == "EntryBook") return true;
176	176	return false;
177	177	}
178	178	}

		@@ -8,15 +8,15 @@
		block discarded – undo
8	8
9	9	class PageAllBooksLetter extends Page
10	10	{
11		- public function InitializeContent ()
	11	+ public function InitializeContent()
12	12	{
13		- list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter ($this->idGet, $this->n);
14		- $this->idPage = Book::getEntryIdByLetter ($this->idGet);
	13	+ list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter($this->idGet, $this->n);
	14	+ $this->idPage = Book::getEntryIdByLetter($this->idGet);
15	15
16	16	$count = $this->totalNumber;
17	17	if ($count == -1)
18		- $count = count ($this->entryArray);
	18	+ $count = count($this->entryArray);
19	19
20		- $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("bookword", $count), $count), $this->idGet);
	20	+ $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("bookword", $count), $count), $this->idGet);
21	21	}
22	22	}

		@@ -8,11 +8,11 @@
		block discarded – undo
8	8
9	9	class PageLanguageDetail extends Page
10	10	{
11		- public function InitializeContent ()
	11	+ public function InitializeContent()
12	12	{
13		- $language = Language::getLanguageById ($this->idGet);
14		- $this->idPage = $language->getEntryId ();
	13	+ $language = Language::getLanguageById($this->idGet);
	14	+ $this->idPage = $language->getEntryId();
15	15	$this->title = $language->lang_code;
16		- list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage ($this->idGet, $this->n);
	16	+ list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage($this->idGet, $this->n);
17	17	}
18	18	}

		@@ -8,10 +8,10 @@
		block discarded – undo
8	8
9	9	class PageAllAuthorsLetter extends Page
10	10	{
11		- public function InitializeContent ()
	11	+ public function InitializeContent()
12	12	{
13		- $this->idPage = Author::getEntryIdByLetter ($this->idGet);
14		- $this->entryArray = Author::getAuthorsByStartingLetter ($this->idGet);
15		- $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("authorword", count ($this->entryArray)), count ($this->entryArray)), $this->idGet);
	13	+ $this->idPage = Author::getEntryIdByLetter($this->idGet);
	14	+ $this->entryArray = Author::getAuthorsByStartingLetter($this->idGet);
	15	+ $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("authorword", count($this->entryArray)), count($this->entryArray)), $this->idGet);
16	16	}
17	17	}

mbirth / cops

Push — master ( 865827...08e2eb )

Status

Category

Spacing +39 added lines, -39 removed lines patch added patch discarded remove patch

Spacing +48 added lines, -48 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +67 added lines, -67 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch