View GitHub Repository cops

Schedule Inspection
Subscribe
Completed
Push — master ( 865827...08e2eb )
by Markus
04:14
created
Status
Category
Toggle Patches
base.php 2 patches
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove 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 
 }
Please login to merge, or discard this patch.
Braces   +58 added lines, -32 removed lines patch added patch discarded remove patch 
@@ -13,12 +13,14 @@  discard block
 
 block discarded – undo
13 13 
 date_default_timezone_set($config['default_timezone']);
14 14
15 15
16 
-function useServerSideRendering () {
16 
+function useServerSideRendering ()
17 
+{
17 18 
     global $config;
18 19 
     return preg_match("/" . $config['cops_server_side_render'] . "/", $_SERVER['HTTP_USER_AGENT']);
19 20 
 }
20 21
21 
-function serverSideRender ($data) {
22 
+function serverSideRender ($data)
23 
+{
22 24 
     // Get the templates
23 25 
     $theme = getCurrentTemplate ();
24 26 
     $header = file_get_contents('templates/' . $theme . '/header.html');
 
@@ -46,28 +48,32 @@  discard block
 
 block discarded – undo
46 48 
     return NULL;
47 49 
 }
48 50
49 
-function getQueryString () {
51 
+function getQueryString ()
52 
+{
50 53 
     if ( isset($_SERVER['QUERY_STRING']) ) {
51 54 
         return $_SERVER['QUERY_STRING'];
52 55 
     }
53 56 
     return "";
54 57 
 }
55 58
56 
-function notFound () {
59 
+function notFound ()
60 
+{
57 61 
     header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
58 62 
     header("Status: 404 Not Found");
59 63
60 64 
     $_SERVER['REDIRECT_STATUS'] = 404;
61 65 
 }
62 66
63 
-function getURLParam ($name, $default = NULL) {
67 
+function getURLParam ($name, $default = NULL)
68 
+{
64 69 
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
65 70 
         return $_GET[$name];
66 71 
     }
67 72 
     return $default;
68 73 
 }
69 74
70 
-function getCurrentOption ($option) {
75 
+function getCurrentOption ($option)
76 
+{
71 77 
     global $config;
72 78 
     if (isset($_COOKIE[$option])) {
73 79 
         if (isset($config ["cops_" . $option]) && is_array ($config ["cops_" . $option])) {
 
@@ -83,19 +89,23 @@  discard block
 
 block discarded – undo
83 89 
     return "";
84 90 
 }
85 91
86 
-function getCurrentCss () {
92 
+function getCurrentCss ()
93 
+{
87 94 
     return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
88 95 
 }
89 96
90 
-function getCurrentTemplate () {
97 
+function getCurrentTemplate ()
98 
+{
91 99 
     return getCurrentOption ("template");
92 100 
 }
93 101
94 
-function getUrlWithVersion ($url) {
102 
+function getUrlWithVersion ($url)
103 
+{
95 104 
     return $url . "?v=" . VERSION;
96 105 
 }
97 106
98 
-function xml2xhtml($xml) {
107 
+function xml2xhtml($xml)
108 
+{
99 109 
     return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', create_function('$m', '
100 110 
         $xhtml_tags = array("br", "hr", "input", "frame", "img", "area", "link", "col", "base", "basefont", "param");
101 111 
         return in_array($m[1], $xhtml_tags) ? "<$m[1]$m[2] />" : "<$m[1]$m[2]></$m[1]>";
 
@@ -135,12 +145,15 @@  discard block
 
 block discarded – undo
135 145 
     $errors = libxml_get_errors();
136 146
137 147 
     foreach ($errors as $error) {
138 
-        if ($error->code == 801) return false;
148 
+        if ($error->code == 801) {
149 
+            return false;
150 
+        }
139 151 
     }
140 152 
     return true;
141 153 
 }
142 154
143 
-function html2xhtml ($html) {
155 
+function html2xhtml ($html)
156 
+{
144 157 
     $doc = new DOMDocument();
145 158 
     libxml_use_internal_errors(true);
146 159 
 
@@ -160,7 +173,9 @@  discard block
 
 block discarded – undo
160 173 
     }
161 174 
     */
162 175
163 
-    if (!are_libxml_errors_ok ()) $output = "HTML code not valid.";
176 
+    if (!are_libxml_errors_ok ()) {
177 
+        $output = "HTML code not valid.";
178 
+    }
164 179
165 180 
     libxml_use_internal_errors(false);
166 181 
     return $output;
 
@@ -170,7 +185,8 @@  discard block
 
 block discarded – undo
170 185 
  * This method is a direct copy-paste from
171 186 
  * http://tmont.com/blargh/2010/1/string-format-in-php
172 187 
  */
173 
-function str_format($format) {
188 
+function str_format($format)
189 
+{
174 190 
     $args = func_get_args();
175 191 
     $format = array_shift($args);
176 192 
 
@@ -190,7 +206,8 @@  discard block
 
 block discarded – undo
190 206 
  * languages id are normalized : fr-fr -> fr_FR
191 207 
  * @return array of languages
192 208 
  */
193 
-function getAcceptLanguages() {
209 
+function getAcceptLanguages()
210 
+{
194 211 
     $langs = array();
195 212
196 213 
     if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 
@@ -218,7 +235,9 @@  discard block
 
 block discarded – undo
218 235
219 236 
             // set default to 1 for any without q factor
220 237 
             foreach ($langs as $lang => $val) {
221 
-                if ($val === '') $langs[$lang] = 1;
238 
+                if ($val === '') {
239 
+                    $langs[$lang] = 1;
240 
+                }
222 241 
             }
223 242
224 243 
             // sort list based on value
 
@@ -233,14 +252,14 @@  discard block
 
 block discarded – undo
233 252 
  * Find the best translation file possible based on the accepted languages
234 253 
  * @return array of language and language file
235 254 
  */
236 
-function getLangAndTranslationFile() {
255 
+function getLangAndTranslationFile()
256 
+{
237 257 
     global $config;
238 258 
     $langs = array();
239 259 
     $lang = "en";
240 260 
     if (!empty($config['cops_language'])) {
241 261 
         $lang = $config['cops_language'];
242 
-    }
243 
-    elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
262 
+    } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
244 263 
         $langs = getAcceptLanguages();
245 264 
     }
246 265 
     //echo var_dump($langs);
 
@@ -263,14 +282,18 @@  discard block
 
 block discarded – undo
263 282 
  * This method is based on this page
264 283 
  * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
265 284 
  */
266 
-function localize($phrase, $count=-1, $reset=false) {
285 
+function localize($phrase, $count=-1, $reset=false)
286 
+{
267 287 
     global $config;
268 
-    if ($count == 0)
269 
-        $phrase .= ".none";
270 
-    if ($count == 1)
271 
-        $phrase .= ".one";
272 
-    if ($count > 1)
273 
-        $phrase .= ".many";
288 
+    if ($count == 0) {
289 
+            $phrase .= ".none";
290 
+    }
291 
+    if ($count == 1) {
292 
+            $phrase .= ".one";
293 
+    }
294 
+    if ($count > 1) {
295 
+            $phrase .= ".many";
296 
+    }
274 297
275 298 
     /* Static keyword is used to ensure the file is loaded only once */
276 299 
     static $translations = NULL;
 
@@ -295,8 +318,7 @@  discard block
 
 block discarded – undo
295 318 
                 unset ($translations [$key]);
296 319 
             }
297 320 
         }
298 
-        if ($lang_file_en)
299 
-        {
321 
+        if ($lang_file_en) {
300 322 
             $lang_file_content = file_get_contents($lang_file_en);
301 323 
             $translations_en = json_decode($lang_file_content, true);
302 324 
             $translations = array_merge ($translations_en, $translations);
 
@@ -308,7 +330,8 @@  discard block
 
 block discarded – undo
308 330 
     return $phrase;
309 331 
 }
310 332
311 
-function addURLParameter($urlParams, $paramName, $paramValue) {
333 
+function addURLParameter($urlParams, $paramName, $paramValue)
334 
+{
312 335 
     if (empty ($urlParams)) {
313 336 
         $urlParams = "";
314 337 
     }
 
@@ -327,16 +350,19 @@  discard block
 
 block discarded – undo
327 350 
     return $start . http_build_query($params);
328 351 
 }
329 352
330 
-function useNormAndUp () {
353 
+function useNormAndUp ()
354 
+{
331 355 
     global $config;
332 356 
     return $config ['cops_normalized_search'] == "1";
333 357 
 }
334 358
335 
-function normalizeUtf8String( $s) {
359 
+function normalizeUtf8String( $s)
360 
+{
336 361 
     include_once 'transliteration.php';
337 362 
     return _transliteration_process($s);
338 363 
 }
339 364
340 
-function normAndUp ($s) {
365 
+function normAndUp ($s)
366 
+{
341 367 
     return mb_strtoupper (normalizeUtf8String($s), 'UTF-8');
342 368 
 }
Please login to merge, or discard this patch.
lib/Language.php 1 patch
Braces   +15 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -13,20 +13,24 @@  discard block
 
 block discarded – undo
13 13 
     public $id;
14 14 
     public $lang_code;
15 15
16 
-    public function __construct($pid, $plang_code) {
16 
+    public function __construct($pid, $plang_code)
17 
+    {
17 18 
         $this->id = $pid;
18 19 
         $this->lang_code = $plang_code;
19 20 
     }
20 21
21 
-    public function getUri () {
22 
+    public function getUri ()
23 
+    {
22 24 
         return "?page=".parent::PAGE_LANGUAGE_DETAIL."&id=$this->id";
23 25 
     }
24 26
25 
-    public function getEntryId () {
27 
+    public function getEntryId ()
28 
+    {
26 29 
         return self::ALL_LANGUAGES_ID.":".$this->id;
27 30 
     }
28 31
29 
-    public static function getLanguageString ($code) {
32 
+    public static function getLanguageString ($code)
33 
+    {
30 34 
         $string = localize("languages.".$code);
31 35 
         if (preg_match ("/^languages/", $string)) {
32 36 
             return $code;
 
@@ -34,12 +38,14 @@  discard block
 
 block discarded – undo
34 38 
         return $string;
35 39 
     }
36 40
37 
-    public static function getCount() {
41 
+    public static function getCount()
42 
+    {
38 43 
         // str_format (localize("languages.alphabetical", count(array))
39 44 
         return parent::getCountGeneric ("languages", self::ALL_LANGUAGES_ID, parent::PAGE_ALL_LANGUAGES);
40 45 
     }
41 46
42 
-    public static function getLanguageById ($languageId) {
47 
+    public static function getLanguageById ($languageId)
48 
+    {
43 49 
         $result = parent::getDb ()->prepare('select id, lang_code  from languages where id = ?');
44 50 
         $result->execute (array ($languageId));
45 51 
         if ($post = $result->fetchObject ()) {
 
@@ -50,15 +56,15 @@  discard block
 
 block discarded – undo
50 56
51 57
52 58
53 
-    public static function getAllLanguages() {
59 
+    public static function getAllLanguages()
60 
+    {
54 61 
         $result = parent::getDb ()->query('select languages.id as id, languages.lang_code as lang_code, count(*) as count
55 62 
 from languages, books_languages_link
56 63 
 where languages.id = books_languages_link.lang_code
57 64 
 group by languages.id, books_languages_link.lang_code
58 65 
 order by languages.lang_code');
59 66 
         $entryArray = array();
60 
-        while ($post = $result->fetchObject ())
61 
-        {
67 
+        while ($post = $result->fetchObject ()) {
62 68 
             $language = new Language ($post->id, $post->lang_code);
63 69 
             array_push ($entryArray, new Entry (Language::getLanguageString ($language->lang_code), $language->getEntryId (),
64 70 
                 str_format (localize("bookword", $post->count), $post->count), "text",
Please login to merge, or discard this patch.
lib/PageQueryResult.php 2 patches
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch 
@@ -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;
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -15,11 +15,13 @@  discard block
 
 block discarded – undo
15 15 
     const SCOPE_BOOK = "book";
16 16 
     const SCOPE_PUBLISHER = "publisher";
17 17
18 
-    private function useTypeahead () {
18 
+    private function useTypeahead ()
19 
+    {
19 20 
         return !is_null (getURLParam ("search"));
20 21 
     }
21 22
22 
-    private function searchByScope ($scope, $limit = FALSE) {
23 
+    private function searchByScope ($scope, $limit = FALSE)
24 
+    {
23 25 
         $n = $this->n;
24 26 
         $numberPerPage = NULL;
25 27 
         $queryNormedAndUp = $this->query;
 
@@ -54,7 +56,8 @@  discard block
 
 block discarded – undo
54 56 
         return $array;
55 57 
     }
56 58
57 
-    public function doSearchByCategory () {
59 
+    public function doSearchByCategory ()
60 
+    {
58 61 
         $database = GetUrlParam (DB);
59 62 
         $out = array ();
60 63 
         $pagequery = Base::PAGE_OPENSEARCH_QUERY;
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
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 
 }
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
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 
 }
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
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();
Please login to merge, or discard this patch.
lib/CustomColumn.php 1 patch
Braces   +27 added lines, -15 removed lines patch added patch discarded remove patch 
@@ -14,48 +14,58 @@  discard block
 
 block discarded – undo
14 14 
     public $name;
15 15 
     public $customId;
16 16
17 
-    public function __construct($pid, $pname, $pcustomId) {
17 
+    public function __construct($pid, $pname, $pcustomId)
18 
+    {
18 19 
         $this->id = $pid;
19 20 
         $this->name = $pname;
20 21 
         $this->customId = $pcustomId;
21 22 
     }
22 23
23 
-    public function getUri () {
24 
+    public function getUri ()
25 
+    {
24 26 
         return "?page=".parent::PAGE_CUSTOM_DETAIL."&custom={$this->customId}&id={$this->id}";
25 27 
     }
26 28
27 
-    public function getEntryId () {
29 
+    public function getEntryId ()
30 
+    {
28 31 
         return self::ALL_CUSTOMS_ID.":".$this->customId.":".$this->id;
29 32 
     }
30 33
31 
-    public static function getTableName ($customId) {
34 
+    public static function getTableName ($customId)
35 
+    {
32 36 
         return "custom_column_{$customId}";
33 37 
     }
34 38
35 
-    public static function getTableLinkName ($customId) {
39 
+    public static function getTableLinkName ($customId)
40 
+    {
36 41 
         return "books_custom_column_{$customId}_link";
37 42 
     }
38 43
39 
-    public static function getTableLinkColumn ($customId) {
44 
+    public static function getTableLinkColumn ($customId)
45 
+    {
40 46 
         return "value";
41 47 
     }
42 48
43 
-    public static function getAllCustomsId ($customId) {
49 
+    public static function getAllCustomsId ($customId)
50 
+    {
44 51 
         return self::ALL_CUSTOMS_ID . ":" . $customId;
45 52 
     }
46 53
47 
-    public static function getUriAllCustoms ($customId) {
54 
+    public static function getUriAllCustoms ($customId)
55 
+    {
48 56 
         return "?page=" . parent::PAGE_ALL_CUSTOMS . "&custom={$customId}";
49 57 
     }
50 58
51 
-    public static function getAllTitle ($customId) {
59 
+    public static function getAllTitle ($customId)
60 
+    {
52 61 
         $result = parent::getDb ()->prepare('select name from custom_columns where id = ?');
53 62 
         $result->execute (array ($customId));
54 63 
         $post = $result->fetchObject ();
55 64 
         return $post->name;
56 65 
     }
57 66
58 
-    public static function getCustomId ($lookup) {
67 
+    public static function getCustomId ($lookup)
68 
+    {
59 69 
         $result = parent::getDb ()->prepare('select id from custom_columns where label = ?');
60 70 
         $result->execute (array ($lookup));
61 71 
         if ($post = $result->fetchObject ()) {
 
@@ -64,7 +74,8 @@  discard block
 
 block discarded – undo
64 74 
         return NULL;
65 75 
     }
66 76
67 
-    public static function getCount($customId) {
77 
+    public static function getCount($customId)
78 
+    {
68 79 
         $nCustoms = parent::executeQuerySingle ('select count(*) from ' . self::getTableName ($customId));
69 80 
         $entry = new Entry (self::getAllTitle ($customId), self::getAllCustomsId ($customId),
70 81 
             str_format (localize("tags.alphabetical", $nCustoms), $nCustoms), "text",
 
@@ -72,7 +83,8 @@  discard block
 
 block discarded – undo
72 83 
         return $entry;
73 84 
     }
74 85
75 
-    public static function getCustomById ($customId, $id) {
86 
+    public static function getCustomById ($customId, $id)
87 
+    {
76 88 
         $result = parent::getDb ()->prepare('select id, value as name from ' . self::getTableName ($customId) . ' where id = ?');
77 89 
         $result->execute (array ($id));
78 90 
         if ($post = $result->fetchObject ()) {
 
@@ -81,15 +93,15 @@  discard block
 
 block discarded – undo
81 93 
         return NULL;
82 94 
     }
83 95
84 
-    public static function getAllCustoms($customId) {
96 
+    public static function getAllCustoms($customId)
97 
+    {
85 98 
         $result = parent::getDb ()->query(str_format ('select {0}.id as id, {0}.value as name, count(*) as count
86 99 
 from {0}, {1}
87 100 
 where {0}.id = {1}.{2}
88 101 
 group by {0}.id, {0}.value
89 102 
 order by {0}.value', self::getTableName ($customId), self::getTableLinkName ($customId), self::getTableLinkColumn ($customId)));
90 103 
         $entryArray = array();
91 
-        while ($post = $result->fetchObject ())
92 
-        {
104 
+        while ($post = $result->fetchObject ()) {
93 105 
             $customColumn = new CustomColumn ($post->id, $post->name, $customId);
94 106 
             array_push ($entryArray, new Entry ($customColumn->name, $customColumn->getEntryId (),
95 107 
                 str_format (localize("bookword", $post->count), $post->count), "text",
Please login to merge, or discard this patch.
lib/Page.php 2 patches
Spacing   +67 added lines, -67 removed lines patch added patch discarded remove patch 
@@ -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 
 }
Please login to merge, or discard this patch.
Braces   +26 added lines, -9 removed lines patch added patch discarded remove patch 
@@ -76,7 +76,8 @@  discard block
 
 block discarded – undo
76 76 
         }
77 77 
     }
78 78
79 
-    public function __construct($pid, $pquery, $pn) {
79 
+    public function __construct($pid, $pquery, $pn)
80 
+    {
80 81 
         global $config;
81 82
82 83 
         $this->idGet = $pid;
 
@@ -109,23 +110,33 @@  discard block
 
 block discarded – undo
109 110 
             }
110 111 
             if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
111 112 
                 $series = Serie::getCount();
112 
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
113 
+                if (!is_null ($series)) {
114 
+                    array_push ($this->entryArray, $series);
115 
+                }
113 116 
             }
114 117 
             if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
115 118 
                 $publisher = Publisher::getCount();
116 
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
119 
+                if (!is_null ($publisher)) {
120 
+                    array_push ($this->entryArray, $publisher);
121 
+                }
117 122 
             }
118 123 
             if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
119 124 
                 $tags = Tag::getCount();
120 
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
125 
+                if (!is_null ($tags)) {
126 
+                    array_push ($this->entryArray, $tags);
127 
+                }
121 128 
             }
122 129 
             if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
123 130 
                 $rating = Rating::getCount();
124 
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
131 
+                if (!is_null ($rating)) {
132 
+                    array_push ($this->entryArray, $rating);
133 
+                }
125 134 
             }
126 135 
             if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
127 136 
                 $languages = Language::getCount();
128 
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
137 
+                if (!is_null ($languages)) {
138 
+                    array_push ($this->entryArray, $languages);
139 
+                }
129 140 
             }
130 141 
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
131 142 
                 $customId = CustomColumn::getCustomId ($lookup);
 
@@ -135,7 +146,9 @@  discard block
 
 block discarded – undo
135 146 
             }
136 147 
             $this->entryArray = array_merge ($this->entryArray, Book::getCount());
137 148
138 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
149 
+            if (Base::isMultipleDatabaseEnabled ()) {
150 
+                $this->title =  Base::getDbName ();
151 
+            }
139 152 
         }
140 153 
     }
141 154 
 
@@ -171,8 +184,12 @@  discard block
 
 block discarded – undo
171 184
172 185 
     public function containsBook ()
173 186 
     {
174 
-        if (count ($this->entryArray) == 0) return false;
175 
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
187 
+        if (count ($this->entryArray) == 0) {
188 
+            return false;
189 
+        }
190 
+        if (get_class ($this->entryArray [0]) == "EntryBook") {
191 
+            return true;
192 
+        }
176 193 
         return false;
177 194 
     }
178 195 
 }
Please login to merge, or discard this patch.
lib/Data.php 1 patch
Braces   +42 added lines, -29 removed lines patch added patch discarded remove patch 
@@ -55,7 +55,8 @@  discard block
 
 block discarded – undo
55 55 
         'zip'   => 'application/zip'
56 56 
     );
57 57
58 
-    public function __construct($post, $book = null) {
58 
+    public function __construct($post, $book = null)
59 
+    {
59 60 
         $this->id = $post->id;
60 61 
         $this->name = $post->name;
61 62 
         $this->format = $post->format;
 
@@ -64,19 +65,20 @@  discard block
 
 block discarded – undo
64 65 
         $this->book = $book;
65 66 
     }
66 67
67 
-    public function isKnownType () {
68 
+    public function isKnownType ()
69 
+    {
68 70 
         return array_key_exists ($this->extension, self::$mimetypes);
69 71 
     }
70 72
71 
-    public function getMimeType () {
73 
+    public function getMimeType ()
74 
+    {
72 75 
         $result = "application/octet-stream";
73 76 
         if ($this->isKnownType ()) {
74 77 
             return self::$mimetypes [$this->extension];
75 78 
         } elseif (function_exists('finfo_open') === true) {
76 79 
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
77 80
78 
-            if (is_resource($finfo) === true)
79 
-            {
81 
+            if (is_resource($finfo) === true) {
80 82 
                 $result = finfo_file($finfo, $this->getLocalPath ());
81 83 
             }
82 84 
 
@@ -86,27 +88,33 @@  discard block
 
 block discarded – undo
86 88 
         return $result;
87 89 
     }
88 90
89 
-    public function isEpubValidOnKobo () {
91 
+    public function isEpubValidOnKobo ()
92 
+    {
90 93 
         return $this->format == "EPUB" || $this->format == "KEPUB";
91 94 
     }
92 95
93 
-    public function getFilename () {
96 
+    public function getFilename ()
97 
+    {
94 98 
         return $this->name . "." . strtolower ($this->format);
95 99 
     }
96 100
97 
-    public function getUpdatedFilename () {
101 
+    public function getUpdatedFilename ()
102 
+    {
98 103 
         return $this->book->getAuthorsSort () . " - " . $this->book->title;
99 104 
     }
100 105
101 
-    public function getUpdatedFilenameEpub () {
106 
+    public function getUpdatedFilenameEpub ()
107 
+    {
102 108 
         return $this->getUpdatedFilename () . ".epub";
103 109 
     }
104 110
105 
-    public function getUpdatedFilenameKepub () {
111 
+    public function getUpdatedFilenameKepub ()
112 
+    {
106 113 
         return $this->getUpdatedFilename () . ".kepub.epub";
107 114 
     }
108 115
109 
-    public function getDataLink ($rel, $title = NULL) {
116 
+    public function getDataLink ($rel, $title = NULL)
117 
+    {
110 118 
         global $config;
111 119
112 120 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
 
@@ -116,19 +124,24 @@  discard block
 
 block discarded – undo
116 124 
         return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title);
117 125 
     }
118 126
119 
-    public function getHtmlLink () {
127 
+    public function getHtmlLink ()
128 
+    {
120 129 
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE)->href;
121 130 
     }
122 131
123 
-    public function getLocalPath () {
132 
+    public function getLocalPath ()
133 
+    {
124 134 
         return $this->book->path . "/" . $this->getFilename ();
125 135 
     }
126 136
127 
-    public function getHtmlLinkWithRewriting ($title = NULL) {
137 
+    public function getHtmlLinkWithRewriting ($title = NULL)
138 
+    {
128 139 
         global $config;
129 140
130 141 
         $database = "";
131 
-        if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
142 
+        if (!is_null (GetUrlParam (DB))) {
143 
+            $database = GetUrlParam (DB) . "/";
144 
+        }
132 145
133 146 
         $href = "download/" . $this->id . "/" . $database;
134 147 
 
@@ -142,28 +155,27 @@  discard block
 
 block discarded – undo
142 155 
         return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
143 156 
     }
144 157
145 
-    public static function getDataByBook ($book) {
158 
+    public static function getDataByBook ($book)
159 
+    {
146 160 
         $out = array ();
147 161 
         $result = parent::getDb ()->prepare('select id, format, name
148 162 
                                              from data where book = ?');
149 163 
         $result->execute (array ($book->id));
150 164
151 
-        while ($post = $result->fetchObject ())
152 
-        {
165 
+        while ($post = $result->fetchObject ()) {
153 166 
             array_push ($out, new Data ($post, $book));
154 167 
         }
155 168 
         return $out;
156 169 
     }
157 170
158 
-    public static function handleThumbnailLink ($urlParam, $height) {
171 
+    public static function handleThumbnailLink ($urlParam, $height)
172 
+    {
159 173 
         global $config;
160 174
161 175 
         if (is_null ($height)) {
162 176 
             if (preg_match ('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
163 177 
                 $height = $config['cops_opds_thumbnail_height'];
164 
-            }
165 
-            else
166 
-            {
178 
+            } else {
167 179 
                 $height = $config['cops_html_thumbnail_height'];
168 180 
             }
169 181 
         }
 
@@ -182,14 +194,17 @@  discard block
 
 block discarded – undo
182 194
183 195 
         if (Base::useAbsolutePath () ||
184 196 
             $rel == Link::OPDS_THUMBNAIL_TYPE ||
185 
-            ($type == "epub" && $config['cops_update_epub-metadata']))
186 
-        {
187 
-            if ($type != "jpg") $urlParam = addURLParameter($urlParam, "type", $type);
197 
+            ($type == "epub" && $config['cops_update_epub-metadata'])) {
198 
+            if ($type != "jpg") {
199 
+                $urlParam = addURLParameter($urlParam, "type", $type);
200 
+            }
188 201 
             if ($rel == Link::OPDS_THUMBNAIL_TYPE) {
189 202 
                 $urlParam = self::handleThumbnailLink($urlParam, $height);
190 203 
             }
191 204 
             $urlParam = addURLParameter($urlParam, "id", $book->id);
192 
-            if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
205 
+            if (!is_null (GetUrlParam (DB))) {
206 
+                $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
207 
+            }
193 208 
             if ($config['cops_thumbnail_handling'] != "1" &&
194 209 
                 !empty ($config['cops_thumbnail_handling']) &&
195 210 
                 $rel == Link::OPDS_THUMBNAIL_TYPE) {
 
@@ -197,9 +212,7 @@  discard block
 
 block discarded – undo
197 212 
             } else {
198 213 
                 return new Link ("fetch.php?" . $urlParam, $mime, $rel, $title);
199 214 
             }
200 
-        }
201 
-        else
202 
-        {
215 
+        } else {
203 216 
             return new Link (str_replace('%2F','/',rawurlencode ($book->path."/".$filename)), $mime, $rel, $title);
204 217 
         }
205 218 
     }
Please login to merge, or discard this patch.