@@ -64,6 +64,9 @@ discard block |
||
64 | 64 | $_SERVER['REDIRECT_STATUS'] = 404; |
65 | 65 | } |
66 | 66 | |
67 | +/** |
|
68 | + * @param string $name |
|
69 | + */ |
|
67 | 70 | function getURLParam($name, $default = NULL) |
68 | 71 | { |
69 | 72 | if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != '') { |
@@ -104,6 +107,11 @@ discard block |
||
104 | 107 | return $url . '?v=' . VERSION; |
105 | 108 | } |
106 | 109 | |
110 | +/** |
|
111 | + * @param string $xml |
|
112 | + * |
|
113 | + * @return string |
|
114 | + */ |
|
107 | 115 | function xml2xhtml($xml) |
108 | 116 | { |
109 | 117 | return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', function($m) { |
@@ -326,6 +334,9 @@ discard block |
||
326 | 334 | return $phrase; |
327 | 335 | } |
328 | 336 | |
337 | +/** |
|
338 | + * @param string $paramName |
|
339 | + */ |
|
329 | 340 | function addURLParameter($urlParams, $paramName, $paramValue) |
330 | 341 | { |
331 | 342 | if (empty ($urlParams)) { |
@@ -8,8 +8,8 @@ discard block |
||
8 | 8 | |
9 | 9 | require 'config.php'; |
10 | 10 | |
11 | -define ('VERSION', '1.2.0'); |
|
12 | -define ('DB', 'db'); |
|
11 | +define('VERSION', '1.2.0'); |
|
12 | +define('DB', 'db'); |
|
13 | 13 | date_default_timezone_set($config['default_timezone']); |
14 | 14 | |
15 | 15 | |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | function serverSideRender($data) |
23 | 23 | { |
24 | 24 | // Get the templates |
25 | - $theme = getCurrentTemplate (); |
|
25 | + $theme = getCurrentTemplate(); |
|
26 | 26 | $header = file_get_contents('templates/' . $theme . '/header.html'); |
27 | 27 | $footer = file_get_contents('templates/' . $theme . '/footer.html'); |
28 | 28 | $main = file_get_contents('templates/' . $theme . '/main.html'); |
@@ -30,8 +30,8 @@ discard block |
||
30 | 30 | $page = file_get_contents('templates/' . $theme . '/page.html'); |
31 | 31 | |
32 | 32 | // Generate the function for the template |
33 | - $template = new doT (); |
|
34 | - $dot = $template->template ($page, array ('bookdetail' => $bookdetail, |
|
33 | + $template = new doT(); |
|
34 | + $dot = $template->template($page, array('bookdetail' => $bookdetail, |
|
35 | 35 | 'header' => $header, |
36 | 36 | 'footer' => $footer, |
37 | 37 | 'main' => $main)); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | } |
43 | 43 | // Execute the template |
44 | 44 | if (!empty ($data)) { |
45 | - return $dot ($data); |
|
45 | + return $dot($data); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | return NULL; |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | |
59 | 59 | function notFound() |
60 | 60 | { |
61 | - header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found'); |
|
61 | + header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found'); |
|
62 | 62 | header('Status: 404 Not Found'); |
63 | 63 | |
64 | 64 | $_SERVER['REDIRECT_STATUS'] = 404; |
@@ -76,8 +76,8 @@ discard block |
||
76 | 76 | { |
77 | 77 | global $config; |
78 | 78 | if (isset($_COOKIE[$option])) { |
79 | - if (isset($config ['cops_' . $option]) && is_array ($config ['cops_' . $option])) { |
|
80 | - return explode (',', $_COOKIE[$option]); |
|
79 | + if (isset($config ['cops_' . $option]) && is_array($config ['cops_' . $option])) { |
|
80 | + return explode(',', $_COOKIE[$option]); |
|
81 | 81 | } else { |
82 | 82 | return $_COOKIE[$option]; |
83 | 83 | } |
@@ -91,12 +91,12 @@ discard block |
||
91 | 91 | |
92 | 92 | function getCurrentCss() |
93 | 93 | { |
94 | - return 'templates/' . getCurrentTemplate () . '/styles/style-' . getCurrentOption('style') . '.css'; |
|
94 | + return 'templates/' . getCurrentTemplate() . '/styles/style-' . getCurrentOption('style') . '.css'; |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | function getCurrentTemplate() |
98 | 98 | { |
99 | - return getCurrentOption ('template'); |
|
99 | + return getCurrentOption('template'); |
|
100 | 100 | } |
101 | 101 | |
102 | 102 | function getUrlWithVersion($url) |
@@ -160,10 +160,10 @@ discard block |
||
160 | 160 | libxml_use_internal_errors(true); |
161 | 161 | |
162 | 162 | $doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' . |
163 | - $html . '</body></html>'); // Load the HTML |
|
163 | + $html . '</body></html>'); // Load the HTML |
|
164 | 164 | $output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream |
165 | 165 | $output = xml2xhtml($output); |
166 | - if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) { |
|
166 | + if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) { |
|
167 | 167 | $output = $matches [1]; // Remove <html><body> |
168 | 168 | } |
169 | 169 | /* |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | } |
176 | 176 | */ |
177 | 177 | |
178 | - if (!are_libxml_errors_ok ()) $output = 'HTML code not valid.'; |
|
178 | + if (!are_libxml_errors_ok()) $output = 'HTML code not valid.'; |
|
179 | 179 | |
180 | 180 | libxml_use_internal_errors(false); |
181 | 181 | return $output; |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | //echo var_dump($langs); |
265 | 265 | $lang_file = NULL; |
266 | 266 | foreach ($langs as $language => $val) { |
267 | - $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json'; |
|
267 | + $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json'; |
|
268 | 268 | if (file_exists($temp_file)) { |
269 | 269 | $lang = $language; |
270 | 270 | $lang_file = $temp_file; |
@@ -272,7 +272,7 @@ discard block |
||
272 | 272 | } |
273 | 273 | } |
274 | 274 | if (empty ($lang_file)) { |
275 | - $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json'; |
|
275 | + $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json'; |
|
276 | 276 | } |
277 | 277 | return array($lang, $lang_file); |
278 | 278 | } |
@@ -281,7 +281,7 @@ discard block |
||
281 | 281 | * This method is based on this page |
282 | 282 | * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/ |
283 | 283 | */ |
284 | -function localize($phrase, $count=-1, $reset=false) |
|
284 | +function localize($phrase, $count = -1, $reset = false) |
|
285 | 285 | { |
286 | 286 | global $config; |
287 | 287 | if ($count == 0) |
@@ -301,7 +301,7 @@ discard block |
||
301 | 301 | $lang_file_en = NULL; |
302 | 302 | list ($lang, $lang_file) = getLangAndTranslationFile(); |
303 | 303 | if ($lang != 'en') { |
304 | - $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json'; |
|
304 | + $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json'; |
|
305 | 305 | } |
306 | 306 | |
307 | 307 | $lang_file_content = file_get_contents($lang_file); |
@@ -309,18 +309,18 @@ discard block |
||
309 | 309 | $translations = json_decode($lang_file_content, true); |
310 | 310 | |
311 | 311 | /* Clean the array of all unfinished translations */ |
312 | - foreach (array_keys ($translations) as $key) { |
|
313 | - if (preg_match ('/^##TODO##/', $key)) { |
|
312 | + foreach (array_keys($translations) as $key) { |
|
313 | + if (preg_match('/^##TODO##/', $key)) { |
|
314 | 314 | unset ($translations [$key]); |
315 | 315 | } |
316 | 316 | } |
317 | 317 | if (!is_null($lang_file_en)) { |
318 | 318 | $lang_file_content = file_get_contents($lang_file_en); |
319 | 319 | $translations_en = json_decode($lang_file_content, true); |
320 | - $translations = array_merge ($translations_en, $translations); |
|
320 | + $translations = array_merge($translations_en, $translations); |
|
321 | 321 | } |
322 | 322 | } |
323 | - if (array_key_exists ($phrase, $translations)) { |
|
323 | + if (array_key_exists($phrase, $translations)) { |
|
324 | 324 | return $translations[$phrase]; |
325 | 325 | } |
326 | 326 | return $phrase; |
@@ -332,7 +332,7 @@ discard block |
||
332 | 332 | $urlParams = ''; |
333 | 333 | } |
334 | 334 | $start = ''; |
335 | - if (preg_match ('#^\?(.*)#', $urlParams, $matches)) { |
|
335 | + if (preg_match('#^\?(.*)#', $urlParams, $matches)) { |
|
336 | 336 | $start = '?'; |
337 | 337 | $urlParams = $matches[1]; |
338 | 338 | } |
@@ -62,6 +62,9 @@ discard block |
||
62 | 62 | return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%")); |
63 | 63 | } |
64 | 64 | |
65 | + /** |
|
66 | + * @param string $query |
|
67 | + */ |
|
65 | 68 | public static function getAuthorsForSearch($query) { |
66 | 69 | return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%")); |
67 | 70 | } |
@@ -70,6 +73,9 @@ discard block |
||
70 | 73 | return self::getEntryArray (self::SQL_ALL_AUTHORS, array ()); |
71 | 74 | } |
72 | 75 | |
76 | + /** |
|
77 | + * @param string $query |
|
78 | + */ |
|
73 | 79 | public static function getEntryArray ($query, $params) { |
74 | 80 | return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author"); |
75 | 81 | } |
@@ -25,69 +25,69 @@ |
||
25 | 25 | $this->sort = $post->sort; |
26 | 26 | } |
27 | 27 | |
28 | - public function getUri () { |
|
29 | - return "?page=".parent::PAGE_AUTHOR_DETAIL."&id=$this->id"; |
|
28 | + public function getUri() { |
|
29 | + return "?page=" . parent::PAGE_AUTHOR_DETAIL . "&id=$this->id"; |
|
30 | 30 | } |
31 | 31 | |
32 | - public function getEntryId () { |
|
33 | - return self::ALL_AUTHORS_ID.":".$this->id; |
|
32 | + public function getEntryId() { |
|
33 | + return self::ALL_AUTHORS_ID . ":" . $this->id; |
|
34 | 34 | } |
35 | 35 | |
36 | - public static function getEntryIdByLetter ($startingLetter) { |
|
37 | - return self::ALL_AUTHORS_ID.":letter:".$startingLetter; |
|
36 | + public static function getEntryIdByLetter($startingLetter) { |
|
37 | + return self::ALL_AUTHORS_ID . ":letter:" . $startingLetter; |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | public static function getCount() { |
41 | 41 | // str_format (localize("authors.alphabetical", count(array)) |
42 | - return parent::getCountGeneric ("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS); |
|
42 | + return parent::getCountGeneric("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS); |
|
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function getAllAuthorsByFirstLetter() { |
46 | - list (, $result) = parent::executeQuery ("select {0} |
|
46 | + list (, $result) = parent::executeQuery("select {0} |
|
47 | 47 | from authors |
48 | 48 | group by substr (upper (sort), 1, 1) |
49 | -order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array (), -1); |
|
49 | +order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array(), -1); |
|
50 | 50 | $entryArray = array(); |
51 | - while ($post = $result->fetchObject ()) |
|
51 | + while ($post = $result->fetchObject()) |
|
52 | 52 | { |
53 | - array_push ($entryArray, new Entry ($post->title, Author::getEntryIdByLetter ($post->title), |
|
54 | - str_format (localize("authorword", $post->count), $post->count), "text", |
|
55 | - array ( new LinkNavigation ("?page=".parent::PAGE_AUTHORS_FIRST_LETTER."&id=". rawurlencode ($post->title))), "", $post->count)); |
|
53 | + array_push($entryArray, new Entry($post->title, Author::getEntryIdByLetter($post->title), |
|
54 | + str_format(localize("authorword", $post->count), $post->count), "text", |
|
55 | + array(new LinkNavigation("?page=" . parent::PAGE_AUTHORS_FIRST_LETTER . "&id=" . rawurlencode($post->title))), "", $post->count)); |
|
56 | 56 | } |
57 | 57 | return $entryArray; |
58 | 58 | } |
59 | 59 | |
60 | 60 | public static function getAuthorsByStartingLetter($letter) { |
61 | - return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%")); |
|
61 | + return self::getEntryArray(self::SQL_AUTHORS_BY_FIRST_LETTER, array($letter . "%")); |
|
62 | 62 | } |
63 | 63 | |
64 | 64 | public static function getAuthorsForSearch($query) { |
65 | - return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%")); |
|
65 | + return self::getEntryArray(self::SQL_AUTHORS_FOR_SEARCH, array($query . "%", $query . "%")); |
|
66 | 66 | } |
67 | 67 | |
68 | 68 | public static function getAllAuthors() { |
69 | - return self::getEntryArray (self::SQL_ALL_AUTHORS, array ()); |
|
69 | + return self::getEntryArray(self::SQL_ALL_AUTHORS, array()); |
|
70 | 70 | } |
71 | 71 | |
72 | - public static function getEntryArray ($query, $params) { |
|
73 | - return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author"); |
|
72 | + public static function getEntryArray($query, $params) { |
|
73 | + return Base::getEntryArrayWithBookNumber($query, self::AUTHOR_COLUMNS, $params, "Author"); |
|
74 | 74 | } |
75 | 75 | |
76 | - public static function getAuthorById ($authorId) { |
|
77 | - $result = parent::getDb ()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?'); |
|
78 | - $result->execute (array ($authorId)); |
|
79 | - $post = $result->fetchObject (); |
|
80 | - return new Author ($post); |
|
76 | + public static function getAuthorById($authorId) { |
|
77 | + $result = parent::getDb()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?'); |
|
78 | + $result->execute(array($authorId)); |
|
79 | + $post = $result->fetchObject(); |
|
80 | + return new Author($post); |
|
81 | 81 | } |
82 | 82 | |
83 | - public static function getAuthorByBookId ($bookId) { |
|
84 | - $result = parent::getDb ()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link |
|
83 | + public static function getAuthorByBookId($bookId) { |
|
84 | + $result = parent::getDb()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link |
|
85 | 85 | where author = authors.id |
86 | 86 | and book = ?'); |
87 | - $result->execute (array ($bookId)); |
|
88 | - $authorArray = array (); |
|
89 | - while ($post = $result->fetchObject ()) { |
|
90 | - array_push ($authorArray, new Author ($post)); |
|
87 | + $result->execute(array($bookId)); |
|
88 | + $authorArray = array(); |
|
89 | + while ($post = $result->fetchObject()) { |
|
90 | + array_push($authorArray, new Author($post)); |
|
91 | 91 | } |
92 | 92 | return $authorArray; |
93 | 93 | } |
@@ -84,6 +84,9 @@ discard block |
||
84 | 84 | return ""; |
85 | 85 | } |
86 | 86 | |
87 | + /** |
|
88 | + * @return string |
|
89 | + */ |
|
87 | 90 | public static function getDbDirectory ($database = NULL) { |
88 | 91 | global $config; |
89 | 92 | if (self::isMultipleDatabaseEnabled ()) { |
@@ -143,10 +146,18 @@ discard block |
||
143 | 146 | self::$db = NULL; |
144 | 147 | } |
145 | 148 | |
149 | + /** |
|
150 | + * @param string $query |
|
151 | + */ |
|
146 | 152 | public static function executeQuerySingle ($query, $database = NULL) { |
147 | 153 | return self::getDb ($database)->query($query)->fetchColumn(); |
148 | 154 | } |
149 | 155 | |
156 | + /** |
|
157 | + * @param string $table |
|
158 | + * @param string $id |
|
159 | + * @param string $numberOfString |
|
160 | + */ |
|
150 | 161 | public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) { |
151 | 162 | if (!$numberOfString) { |
152 | 163 | $numberOfString = $table . ".alphabetical"; |
@@ -159,6 +170,10 @@ discard block |
||
159 | 170 | return $entry; |
160 | 171 | } |
161 | 172 | |
173 | + /** |
|
174 | + * @param string $columns |
|
175 | + * @param string $category |
|
176 | + */ |
|
162 | 177 | public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) { |
163 | 178 | /* @var $result PDOStatement */ |
164 | 179 | |
@@ -181,6 +196,9 @@ discard block |
||
181 | 196 | return $entryArray; |
182 | 197 | } |
183 | 198 | |
199 | + /** |
|
200 | + * @param string $filter |
|
201 | + */ |
|
184 | 202 | public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) { |
185 | 203 | $totalResult = -1; |
186 | 204 |
@@ -37,146 +37,146 @@ discard block |
||
37 | 37 | |
38 | 38 | private static $db = NULL; |
39 | 39 | |
40 | - public static function isMultipleDatabaseEnabled () { |
|
40 | + public static function isMultipleDatabaseEnabled() { |
|
41 | 41 | global $config; |
42 | - return is_array ($config['calibre_directory']); |
|
42 | + return is_array($config['calibre_directory']); |
|
43 | 43 | } |
44 | 44 | |
45 | - public static function useAbsolutePath () { |
|
45 | + public static function useAbsolutePath() { |
|
46 | 46 | global $config; |
47 | 47 | $path = self::getDbDirectory(); |
48 | - return preg_match ('/^\//', $path) || // Linux / |
|
49 | - preg_match ('/^\w\:/', $path); // Windows X: |
|
48 | + return preg_match('/^\//', $path) || // Linux / |
|
49 | + preg_match('/^\w\:/', $path); // Windows X: |
|
50 | 50 | } |
51 | 51 | |
52 | - public static function noDatabaseSelected () { |
|
53 | - return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB)); |
|
52 | + public static function noDatabaseSelected() { |
|
53 | + return self::isMultipleDatabaseEnabled() && is_null(GetUrlParam(DB)); |
|
54 | 54 | } |
55 | 55 | |
56 | - public static function getDbList () { |
|
56 | + public static function getDbList() { |
|
57 | 57 | global $config; |
58 | - if (self::isMultipleDatabaseEnabled ()) { |
|
58 | + if (self::isMultipleDatabaseEnabled()) { |
|
59 | 59 | return $config['calibre_directory']; |
60 | 60 | } else { |
61 | - return array ("" => $config['calibre_directory']); |
|
61 | + return array("" => $config['calibre_directory']); |
|
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - public static function getDbNameList () { |
|
65 | + public static function getDbNameList() { |
|
66 | 66 | global $config; |
67 | - if (self::isMultipleDatabaseEnabled ()) { |
|
68 | - return array_keys ($config['calibre_directory']); |
|
67 | + if (self::isMultipleDatabaseEnabled()) { |
|
68 | + return array_keys($config['calibre_directory']); |
|
69 | 69 | } else { |
70 | - return array (""); |
|
70 | + return array(""); |
|
71 | 71 | } |
72 | 72 | } |
73 | 73 | |
74 | - public static function getDbName ($database = NULL) { |
|
74 | + public static function getDbName($database = NULL) { |
|
75 | 75 | global $config; |
76 | - if (self::isMultipleDatabaseEnabled ()) { |
|
77 | - if (is_null ($database)) $database = GetUrlParam (DB, 0); |
|
76 | + if (self::isMultipleDatabaseEnabled()) { |
|
77 | + if (is_null($database)) $database = GetUrlParam(DB, 0); |
|
78 | 78 | if (!is_null($database) && !preg_match('/^\d+$/', $database)) { |
79 | - self::error ($database); |
|
79 | + self::error($database); |
|
80 | 80 | } |
81 | - $array = array_keys ($config['calibre_directory']); |
|
81 | + $array = array_keys($config['calibre_directory']); |
|
82 | 82 | return $array[$database]; |
83 | 83 | } |
84 | 84 | return ""; |
85 | 85 | } |
86 | 86 | |
87 | - public static function getDbDirectory ($database = NULL) { |
|
87 | + public static function getDbDirectory($database = NULL) { |
|
88 | 88 | global $config; |
89 | - if (self::isMultipleDatabaseEnabled ()) { |
|
90 | - if (is_null ($database)) $database = GetUrlParam (DB, 0); |
|
89 | + if (self::isMultipleDatabaseEnabled()) { |
|
90 | + if (is_null($database)) $database = GetUrlParam(DB, 0); |
|
91 | 91 | if (!is_null($database) && !preg_match('/^\d+$/', $database)) { |
92 | - self::error ($database); |
|
92 | + self::error($database); |
|
93 | 93 | } |
94 | - $array = array_values ($config['calibre_directory']); |
|
94 | + $array = array_values($config['calibre_directory']); |
|
95 | 95 | return $array[$database]; |
96 | 96 | } |
97 | 97 | return $config['calibre_directory']; |
98 | 98 | } |
99 | 99 | |
100 | 100 | |
101 | - public static function getDbFileName ($database = NULL) { |
|
102 | - return self::getDbDirectory ($database) .'metadata.db'; |
|
101 | + public static function getDbFileName($database = NULL) { |
|
102 | + return self::getDbDirectory($database) . 'metadata.db'; |
|
103 | 103 | } |
104 | 104 | |
105 | - private static function error ($database) { |
|
105 | + private static function error($database) { |
|
106 | 106 | if (php_sapi_name() != "cli") { |
107 | 107 | header("location: checkconfig.php?err=1"); |
108 | 108 | } |
109 | 109 | throw new Exception("Database <{$database}> not found."); |
110 | 110 | } |
111 | 111 | |
112 | - public static function getDb ($database = NULL) { |
|
113 | - if (is_null (self::$db)) { |
|
112 | + public static function getDb($database = NULL) { |
|
113 | + if (is_null(self::$db)) { |
|
114 | 114 | try { |
115 | - if (is_readable (self::getDbFileName ($database))) { |
|
116 | - self::$db = new PDO('sqlite:'. self::getDbFileName ($database)); |
|
117 | - if (useNormAndUp ()) { |
|
118 | - self::$db->sqliteCreateFunction ('normAndUp', 'normAndUp', 1); |
|
115 | + if (is_readable(self::getDbFileName($database))) { |
|
116 | + self::$db = new PDO('sqlite:' . self::getDbFileName($database)); |
|
117 | + if (useNormAndUp()) { |
|
118 | + self::$db->sqliteCreateFunction('normAndUp', 'normAndUp', 1); |
|
119 | 119 | } |
120 | 120 | } else { |
121 | - self::error ($database); |
|
121 | + self::error($database); |
|
122 | 122 | } |
123 | 123 | } catch (Exception $e) { |
124 | - self::error ($database); |
|
124 | + self::error($database); |
|
125 | 125 | } |
126 | 126 | } |
127 | 127 | return self::$db; |
128 | 128 | } |
129 | 129 | |
130 | - public static function checkDatabaseAvailability () { |
|
131 | - if (self::noDatabaseSelected ()) { |
|
132 | - for ($i = 0; $i < count (self::getDbList ()); $i++) { |
|
133 | - self::getDb ($i); |
|
134 | - self::clearDb (); |
|
130 | + public static function checkDatabaseAvailability() { |
|
131 | + if (self::noDatabaseSelected()) { |
|
132 | + for ($i = 0; $i < count(self::getDbList()); $i++) { |
|
133 | + self::getDb($i); |
|
134 | + self::clearDb(); |
|
135 | 135 | } |
136 | 136 | } else { |
137 | - self::getDb (); |
|
137 | + self::getDb(); |
|
138 | 138 | } |
139 | 139 | return true; |
140 | 140 | } |
141 | 141 | |
142 | - public static function clearDb () { |
|
142 | + public static function clearDb() { |
|
143 | 143 | self::$db = NULL; |
144 | 144 | } |
145 | 145 | |
146 | - public static function executeQuerySingle ($query, $database = NULL) { |
|
147 | - return self::getDb ($database)->query($query)->fetchColumn(); |
|
146 | + public static function executeQuerySingle($query, $database = NULL) { |
|
147 | + return self::getDb($database)->query($query)->fetchColumn(); |
|
148 | 148 | } |
149 | 149 | |
150 | 150 | public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) { |
151 | 151 | if (!$numberOfString) { |
152 | 152 | $numberOfString = $table . ".alphabetical"; |
153 | 153 | } |
154 | - $count = self::executeQuerySingle ('select count(*) from ' . $table); |
|
154 | + $count = self::executeQuerySingle('select count(*) from ' . $table); |
|
155 | 155 | if ($count == 0) return NULL; |
156 | - $entry = new Entry (localize($table . ".title"), $id, |
|
157 | - str_format (localize($numberOfString, $count), $count), "text", |
|
158 | - array ( new LinkNavigation ("?page=".$pageId)), "", $count); |
|
156 | + $entry = new Entry(localize($table . ".title"), $id, |
|
157 | + str_format(localize($numberOfString, $count), $count), "text", |
|
158 | + array(new LinkNavigation("?page=" . $pageId)), "", $count); |
|
159 | 159 | return $entry; |
160 | 160 | } |
161 | 161 | |
162 | - public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) { |
|
162 | + public static function getEntryArrayWithBookNumber($query, $columns, $params, $category) { |
|
163 | 163 | /* @var $result PDOStatement */ |
164 | 164 | |
165 | - list (, $result) = self::executeQuery ($query, $columns, "", $params, -1); |
|
165 | + list (, $result) = self::executeQuery($query, $columns, "", $params, -1); |
|
166 | 166 | $entryArray = array(); |
167 | - while ($post = $result->fetchObject ()) |
|
167 | + while ($post = $result->fetchObject()) |
|
168 | 168 | { |
169 | 169 | /* @var $instance Author|Tag|Serie|Publisher */ |
170 | 170 | |
171 | - $instance = new $category ($post); |
|
171 | + $instance = new $category($post); |
|
172 | 172 | if (property_exists($post, "sort")) { |
173 | 173 | $title = $post->sort; |
174 | 174 | } else { |
175 | 175 | $title = $post->name; |
176 | 176 | } |
177 | - array_push ($entryArray, new Entry ($title, $instance->getEntryId (), |
|
178 | - str_format (localize("bookword", $post->count), $post->count), "text", |
|
179 | - array ( new LinkNavigation ($instance->getUri ())), "", $post->count)); |
|
177 | + array_push($entryArray, new Entry($title, $instance->getEntryId(), |
|
178 | + str_format(localize("bookword", $post->count), $post->count), "text", |
|
179 | + array(new LinkNavigation($instance->getUri())), "", $post->count)); |
|
180 | 180 | } |
181 | 181 | return $entryArray; |
182 | 182 | } |
@@ -184,30 +184,30 @@ discard block |
||
184 | 184 | public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) { |
185 | 185 | $totalResult = -1; |
186 | 186 | |
187 | - if (useNormAndUp ()) { |
|
187 | + if (useNormAndUp()) { |
|
188 | 188 | $query = preg_replace("/upper/", "normAndUp", $query); |
189 | 189 | $columns = preg_replace("/upper/", "normAndUp", $columns); |
190 | 190 | } |
191 | 191 | |
192 | - if (is_null ($numberPerPage)) { |
|
193 | - $numberPerPage = getCurrentOption ("max_item_per_page"); |
|
192 | + if (is_null($numberPerPage)) { |
|
193 | + $numberPerPage = getCurrentOption("max_item_per_page"); |
|
194 | 194 | } |
195 | 195 | |
196 | 196 | if ($numberPerPage != -1 && $n != -1) |
197 | 197 | { |
198 | 198 | // First check total number of results |
199 | - $result = self::getDb ($database)->prepare (str_format ($query, "count(*)", $filter)); |
|
200 | - $result->execute ($params); |
|
201 | - $totalResult = $result->fetchColumn (); |
|
199 | + $result = self::getDb($database)->prepare(str_format($query, "count(*)", $filter)); |
|
200 | + $result->execute($params); |
|
201 | + $totalResult = $result->fetchColumn(); |
|
202 | 202 | |
203 | 203 | // Next modify the query and params |
204 | 204 | $query .= " limit ?, ?"; |
205 | - array_push ($params, ($n - 1) * $numberPerPage, $numberPerPage); |
|
205 | + array_push($params, ($n - 1) * $numberPerPage, $numberPerPage); |
|
206 | 206 | } |
207 | 207 | |
208 | - $result = self::getDb ($database)->prepare(str_format ($query, $columns, $filter)); |
|
209 | - $result->execute ($params); |
|
210 | - return array ($totalResult, $result); |
|
208 | + $result = self::getDb($database)->prepare(str_format($query, $columns, $filter)); |
|
209 | + $result->execute($params); |
|
210 | + return array($totalResult, $result); |
|
211 | 211 | } |
212 | 212 | |
213 | 213 | } |
@@ -144,6 +144,9 @@ discard block |
||
144 | 144 | return 'index.php' . $urlParam; |
145 | 145 | } |
146 | 146 | |
147 | + /** |
|
148 | + * @return string |
|
149 | + */ |
|
147 | 150 | public function getTitle () { |
148 | 151 | return $this->title; |
149 | 152 | } |
@@ -331,6 +334,9 @@ discard block |
||
331 | 334 | return reset($reduced); |
332 | 335 | } |
333 | 336 | |
337 | + /** |
|
338 | + * @param string $extension |
|
339 | + */ |
|
334 | 340 | public function getFilePath($extension, $idData = NULL, $relative = false) |
335 | 341 | { |
336 | 342 | if ($extension == 'jpg') |
@@ -464,6 +470,9 @@ discard block |
||
464 | 470 | $this->getLinkArray(), $this); |
465 | 471 | } |
466 | 472 | |
473 | + /** |
|
474 | + * @param integer $database |
|
475 | + */ |
|
467 | 476 | public static function getBookCount($database = NULL) { |
468 | 477 | return parent::executeQuerySingle('select count(*) from books', $database); |
469 | 478 | } |
@@ -512,7 +521,7 @@ discard block |
||
512 | 521 | } |
513 | 522 | |
514 | 523 | /** |
515 | - * @param $customColumn CustomColumn |
|
524 | + * @param CustomColumn $customColumn CustomColumn |
|
516 | 525 | * @param $id integer |
517 | 526 | * @param $n integer |
518 | 527 | * @return array |
@@ -552,6 +561,10 @@ discard block |
||
552 | 561 | return NULL; |
553 | 562 | } |
554 | 563 | |
564 | + /** |
|
565 | + * @param integer $database |
|
566 | + * @param integer $numberPerPage |
|
567 | + */ |
|
555 | 568 | public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) { |
556 | 569 | $i = 0; |
557 | 570 | $critArray = array(); |
@@ -599,6 +612,9 @@ discard block |
||
599 | 612 | return $entryArray; |
600 | 613 | } |
601 | 614 | |
615 | + /** |
|
616 | + * @param integer $numberPerPage |
|
617 | + */ |
|
602 | 618 | public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) { |
603 | 619 | return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage); |
604 | 620 | } |
@@ -7,55 +7,55 @@ discard block |
||
7 | 7 | */ |
8 | 8 | |
9 | 9 | // Silly thing because PHP forbid string concatenation in class const |
10 | -define ('SQL_BOOKS_LEFT_JOIN', 'left outer join comments on comments.book = books.id |
|
10 | +define('SQL_BOOKS_LEFT_JOIN', 'left outer join comments on comments.book = books.id |
|
11 | 11 | left outer join books_ratings_link on books_ratings_link.book = books.id |
12 | 12 | left outer join ratings on books_ratings_link.rating = ratings.id '); |
13 | -define ('SQL_BOOKS_ALL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' order by books.sort '); |
|
14 | -define ('SQL_BOOKS_BY_PUBLISHER', 'select {0} from books_publishers_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
13 | +define('SQL_BOOKS_ALL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' order by books.sort '); |
|
14 | +define('SQL_BOOKS_BY_PUBLISHER', 'select {0} from books_publishers_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
15 | 15 | where books_publishers_link.book = books.id and publisher = ? {1} order by publisher'); |
16 | -define ('SQL_BOOKS_BY_FIRST_LETTER', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
16 | +define('SQL_BOOKS_BY_FIRST_LETTER', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
17 | 17 | where upper (books.sort) like ? order by books.sort'); |
18 | -define ('SQL_BOOKS_BY_AUTHOR', 'select {0} from books_authors_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
18 | +define('SQL_BOOKS_BY_AUTHOR', 'select {0} from books_authors_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
19 | 19 | left outer join books_series_link on books_series_link.book = books.id |
20 | 20 | where books_authors_link.book = books.id and author = ? {1} order by series desc, series_index asc, pubdate asc'); |
21 | -define ('SQL_BOOKS_BY_SERIE', 'select {0} from books_series_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
21 | +define('SQL_BOOKS_BY_SERIE', 'select {0} from books_series_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
22 | 22 | where books_series_link.book = books.id and series = ? {1} order by series_index'); |
23 | -define ('SQL_BOOKS_BY_TAG', 'select {0} from books_tags_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
23 | +define('SQL_BOOKS_BY_TAG', 'select {0} from books_tags_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
24 | 24 | where books_tags_link.book = books.id and tag = ? {1} order by sort'); |
25 | -define ('SQL_BOOKS_BY_LANGUAGE', 'select {0} from books_languages_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
25 | +define('SQL_BOOKS_BY_LANGUAGE', 'select {0} from books_languages_link, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
26 | 26 | where books_languages_link.book = books.id and lang_code = ? {1} order by sort'); |
27 | -define ('SQL_BOOKS_BY_CUSTOM', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
27 | +define('SQL_BOOKS_BY_CUSTOM', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
28 | 28 | where {2}.book = books.id and {2}.{3} = ? {1} order by sort'); |
29 | -define ('SQL_BOOKS_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
29 | +define('SQL_BOOKS_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
30 | 30 | where {2}.book = books.id and {2}.value = 1 {1} order by sort'); |
31 | -define ('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
31 | +define('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
32 | 32 | where {2}.book = books.id and {2}.value = 0 {1} order by sort'); |
33 | -define ('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
33 | +define('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
34 | 34 | where books.id not in (select book from {2}) {1} order by sort'); |
35 | -define ('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
35 | +define('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
36 | 36 | left join {2} on {2}.book = books.id |
37 | 37 | left join {3} on {3}.id = {2}.{4} |
38 | 38 | where {3}.value = ? order by sort'); |
39 | -define ('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
39 | +define('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
40 | 40 | left join {2} on {2}.book = books.id |
41 | 41 | left join {3} on {3}.id = {2}.{4} |
42 | 42 | where ((books.id not in (select {2}.book from {2})) or ({3}.value = 0)) {1} order by sort'); |
43 | -define ('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
43 | +define('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
44 | 44 | where {2}.book = books.id and date({2}.value) = ? {1} order by sort'); |
45 | -define ('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
45 | +define('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
46 | 46 | where {2}.book = books.id and {2}.value = ? {1} order by sort'); |
47 | -define ('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
47 | +define('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
48 | 48 | where {2}.book = books.id and {2}.id = ? {1} order by sort'); |
49 | -define ('SQL_BOOKS_QUERY', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
49 | +define('SQL_BOOKS_QUERY', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
50 | 50 | where ( |
51 | 51 | exists (select null from authors, books_authors_link where book = books.id and author = authors.id and authors.name like ?) or |
52 | 52 | exists (select null from tags, books_tags_link where book = books.id and tag = tags.id and tags.name like ?) or |
53 | 53 | exists (select null from series, books_series_link on book = books.id and books_series_link.series = series.id and series.name like ?) or |
54 | 54 | exists (select null from publishers, books_publishers_link where book = books.id and books_publishers_link.publisher = publishers.id and publishers.name like ?) or |
55 | 55 | title like ?) {1} order by books.sort'); |
56 | -define ('SQL_BOOKS_RECENT', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
56 | +define('SQL_BOOKS_RECENT', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
57 | 57 | where 1=1 {1} order by timestamp desc limit '); |
58 | -define ('SQL_BOOKS_BY_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
58 | +define('SQL_BOOKS_BY_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' |
|
59 | 59 | where books_ratings_link.book = books.id and ratings.id = ? {1} order by sort'); |
60 | 60 | |
61 | 61 | require('Identifier.php'); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | public $tags = NULL; |
109 | 109 | public $identifiers = NULL; |
110 | 110 | public $languages = NULL; |
111 | - public $format = array (); |
|
111 | + public $format = array(); |
|
112 | 112 | |
113 | 113 | |
114 | 114 | public function __construct($line) { |
@@ -130,24 +130,24 @@ discard block |
||
130 | 130 | } |
131 | 131 | |
132 | 132 | public function getEntryId() { |
133 | - return self::ALL_BOOKS_UUID.':'.$this->uuid; |
|
133 | + return self::ALL_BOOKS_UUID . ':' . $this->uuid; |
|
134 | 134 | } |
135 | 135 | |
136 | - public static function getEntryIdByLetter ($startingLetter) { |
|
137 | - return self::ALL_BOOKS_ID.':letter:'.$startingLetter; |
|
136 | + public static function getEntryIdByLetter($startingLetter) { |
|
137 | + return self::ALL_BOOKS_ID . ':letter:' . $startingLetter; |
|
138 | 138 | } |
139 | 139 | |
140 | - public function getUri () { |
|
141 | - return '?page='.parent::PAGE_BOOK_DETAIL.'&id=' . $this->id; |
|
140 | + public function getUri() { |
|
141 | + return '?page=' . parent::PAGE_BOOK_DETAIL . '&id=' . $this->id; |
|
142 | 142 | } |
143 | 143 | |
144 | - public function getDetailUrl () { |
|
144 | + public function getDetailUrl() { |
|
145 | 145 | $urlParam = $this->getUri(); |
146 | - if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB)); |
|
146 | + if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam(DB)); |
|
147 | 147 | return 'index.php' . $urlParam; |
148 | 148 | } |
149 | 149 | |
150 | - public function getTitle () { |
|
150 | + public function getTitle() { |
|
151 | 151 | return $this->title; |
152 | 152 | } |
153 | 153 | |
@@ -156,22 +156,22 @@ discard block |
||
156 | 156 | /** |
157 | 157 | * @return Author[] |
158 | 158 | */ |
159 | - public function getAuthors () { |
|
159 | + public function getAuthors() { |
|
160 | 160 | if (is_null($this->authors)) { |
161 | 161 | $this->authors = Author::getAuthorByBookId($this->id); |
162 | 162 | } |
163 | 163 | return $this->authors; |
164 | 164 | } |
165 | 165 | |
166 | - public function getAuthorsName () { |
|
167 | - return implode(', ', array_map(function ($author) { return $author->name; }, $this->getAuthors())); |
|
166 | + public function getAuthorsName() { |
|
167 | + return implode(', ', array_map(function($author) { return $author->name; }, $this->getAuthors())); |
|
168 | 168 | } |
169 | 169 | |
170 | - public function getAuthorsSort () { |
|
171 | - return implode(', ', array_map(function ($author) { return $author->sort; }, $this->getAuthors())); |
|
170 | + public function getAuthorsSort() { |
|
171 | + return implode(', ', array_map(function($author) { return $author->sort; }, $this->getAuthors())); |
|
172 | 172 | } |
173 | 173 | |
174 | - public function getPublisher () { |
|
174 | + public function getPublisher() { |
|
175 | 175 | if (is_null($this->publisher)) { |
176 | 176 | $this->publisher = Publisher::getPublisherByBookId($this->id); |
177 | 177 | } |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | * @return Tag[] |
211 | 211 | */ |
212 | 212 | public function getTags() { |
213 | - if (is_null ($this->tags)) { |
|
213 | + if (is_null($this->tags)) { |
|
214 | 214 | $this->tags = array(); |
215 | 215 | |
216 | 216 | $result = parent::getDb()->prepare('select tags.id as id, name |
@@ -228,7 +228,7 @@ discard block |
||
228 | 228 | } |
229 | 229 | |
230 | 230 | public function getTagsName() { |
231 | - return implode(', ', array_map(function ($tag) { return $tag->name; }, $this->getTags())); |
|
231 | + return implode(', ', array_map(function($tag) { return $tag->name; }, $this->getTags())); |
|
232 | 232 | } |
233 | 233 | |
234 | 234 | |
@@ -236,7 +236,7 @@ discard block |
||
236 | 236 | * @return Identifiers[] |
237 | 237 | */ |
238 | 238 | public function getIdentifiers() { |
239 | - if (is_null ($this->identifiers)) { |
|
239 | + if (is_null($this->identifiers)) { |
|
240 | 240 | $this->identifiers = array(); |
241 | 241 | |
242 | 242 | $result = parent::getDb()->prepare('select type, val, id |
@@ -302,7 +302,7 @@ discard block |
||
302 | 302 | |
303 | 303 | public function getDataById($idData) |
304 | 304 | { |
305 | - $reduced = array_filter($this->getDatas(), function ($data) use ($idData) { |
|
305 | + $reduced = array_filter($this->getDatas(), function($data) use ($idData) { |
|
306 | 306 | return $data->id == $idData; |
307 | 307 | }); |
308 | 308 | return reset($reduced); |
@@ -326,7 +326,7 @@ discard block |
||
326 | 326 | if (empty ($this->pubdate)) { |
327 | 327 | return ''; |
328 | 328 | } |
329 | - $dateY = (int) substr($this->pubdate, 0, 4); |
|
329 | + $dateY = (int)substr($this->pubdate, 0, 4); |
|
330 | 330 | if ($dateY > 102) { |
331 | 331 | return str_pad($dateY, 4, '0', STR_PAD_LEFT); |
332 | 332 | } |
@@ -335,8 +335,8 @@ discard block |
||
335 | 335 | |
336 | 336 | public function getComment($withSerie = true) { |
337 | 337 | $addition = ''; |
338 | - $se = $this->getSerie (); |
|
339 | - if (!is_null ($se) && $withSerie) { |
|
338 | + $se = $this->getSerie(); |
|
339 | + if (!is_null($se) && $withSerie) { |
|
340 | 340 | $addition = $addition . '<strong>' . localize('content.series') . '</strong>' . str_format(localize('content.series.data'), $this->seriesIndex, htmlspecialchars($se->name)) . "<br />\n"; |
341 | 341 | } |
342 | 342 | if (preg_match('/<\/(div|p|a|span)>/', $this->comment)) |
@@ -350,7 +350,7 @@ discard block |
||
350 | 350 | } |
351 | 351 | |
352 | 352 | public function getDataFormat($format) { |
353 | - $reduced = array_filter($this->getDatas(), function ($data) use ($format) { |
|
353 | + $reduced = array_filter($this->getDatas(), function($data) use ($format) { |
|
354 | 354 | return $data->format == $format; |
355 | 355 | }); |
356 | 356 | return reset($reduced); |
@@ -371,11 +371,11 @@ discard block |
||
371 | 371 | |
372 | 372 | if ($relative) |
373 | 373 | { |
374 | - return $this->relativePath.'/'.$file; |
|
374 | + return $this->relativePath . '/' . $file; |
|
375 | 375 | } |
376 | 376 | else |
377 | 377 | { |
378 | - return $this->path.'/'.$file; |
|
378 | + return $this->path . '/' . $file; |
|
379 | 379 | } |
380 | 380 | } |
381 | 381 | |
@@ -395,7 +395,7 @@ discard block |
||
395 | 395 | } |
396 | 396 | $epub->Authors($authorArray); |
397 | 397 | $epub->Language($this->getLanguages()); |
398 | - $epub->Description ($this->getComment(false)); |
|
398 | + $epub->Description($this->getComment(false)); |
|
399 | 399 | $epub->Subjects($this->getTagsName()); |
400 | 400 | $epub->Cover2($this->getFilePath('jpg'), 'image/jpeg'); |
401 | 401 | $epub->Calibre($this->uuid); |
@@ -405,7 +405,7 @@ discard block |
||
405 | 405 | $epub->SerieIndex($this->seriesIndex); |
406 | 406 | } |
407 | 407 | $filename = $data->getUpdatedFilenameEpub(); |
408 | - if ($config['cops_provide_kepub'] == '1' && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) { |
|
408 | + if ($config['cops_provide_kepub'] == '1' && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) { |
|
409 | 409 | $epub->updateForKepub(); |
410 | 410 | $filename = $data->getUpdatedFilenameKepub(); |
411 | 411 | } |
@@ -431,11 +431,11 @@ discard block |
||
431 | 431 | if (!is_null($width)) { |
432 | 432 | $nw = $width; |
433 | 433 | if ($nw >= $w) { return false; } |
434 | - $nh = ($nw*$h)/$w; |
|
434 | + $nh = ($nw * $h) / $w; |
|
435 | 435 | } else { |
436 | 436 | $nh = $height; |
437 | 437 | if ($nh >= $h) { return false; } |
438 | - $nw = ($nh*$w)/$h; |
|
438 | + $nw = ($nh * $w) / $h; |
|
439 | 439 | } |
440 | 440 | } else { |
441 | 441 | return false; |
@@ -443,16 +443,16 @@ discard block |
||
443 | 443 | |
444 | 444 | //draw the image |
445 | 445 | $src_img = imagecreatefromjpeg($file); |
446 | - $dst_img = imagecreatetruecolor($nw,$nh); |
|
447 | - imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h);//resizing the image |
|
448 | - imagejpeg($dst_img,$outputfile,80); |
|
446 | + $dst_img = imagecreatetruecolor($nw, $nh); |
|
447 | + imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h); //resizing the image |
|
448 | + imagejpeg($dst_img, $outputfile, 80); |
|
449 | 449 | imagedestroy($src_img); |
450 | 450 | imagedestroy($dst_img); |
451 | 451 | |
452 | 452 | return true; |
453 | 453 | } |
454 | 454 | |
455 | - public function getLinkArray () |
|
455 | + public function getLinkArray() |
|
456 | 456 | { |
457 | 457 | $linkArray = array(); |
458 | 458 | |
@@ -477,7 +477,7 @@ discard block |
||
477 | 477 | } |
478 | 478 | |
479 | 479 | $serie = $this->getSerie(); |
480 | - if (!is_null ($serie)) { |
|
480 | + if (!is_null($serie)) { |
|
481 | 481 | array_push($linkArray, new LinkNavigation($serie->getUri(), 'related', str_format(localize('content.series.data'), $this->seriesIndex, $serie->name))); |
482 | 482 | } |
483 | 483 | |
@@ -502,13 +502,13 @@ discard block |
||
502 | 502 | $entry = new Entry(localize('allbooks.title'), |
503 | 503 | self::ALL_BOOKS_ID, |
504 | 504 | str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text', |
505 | - array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks); |
|
505 | + array(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS)), '', $nBooks); |
|
506 | 506 | array_push($result, $entry); |
507 | 507 | if ($config['cops_recentbooks_limit'] > 0) { |
508 | 508 | $entry = new Entry(localize('recent.title'), |
509 | 509 | self::ALL_RECENT_BOOKS_ID, |
510 | 510 | str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text', |
511 | - array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']); |
|
511 | + array(new LinkNavigation('?page=' . parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']); |
|
512 | 512 | array_push($result, $entry); |
513 | 513 | } |
514 | 514 | return $result; |
@@ -604,7 +604,7 @@ discard block |
||
604 | 604 | } |
605 | 605 | |
606 | 606 | public static function getBooks($n) { |
607 | - list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL , array (), $n); |
|
607 | + list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL, array(), $n); |
|
608 | 608 | return array($entryArray, $totalNumber); |
609 | 609 | } |
610 | 610 | |
@@ -621,7 +621,7 @@ discard block |
||
621 | 621 | { |
622 | 622 | array_push($entryArray, new Entry($post->title, Book::getEntryIdByLetter($post->title), |
623 | 623 | str_format(localize('bookword', $post->count), $post->count), 'text', |
624 | - array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS_LETTER.'&id='. rawurlencode($post->title))), '', $post->count)); |
|
624 | + array(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS_LETTER . '&id=' . rawurlencode($post->title))), '', $post->count)); |
|
625 | 625 | } |
626 | 626 | return $entryArray; |
627 | 627 | } |
@@ -646,7 +646,7 @@ discard block |
||
646 | 646 | |
647 | 647 | public static function getAllRecentBooks() { |
648 | 648 | global $config; |
649 | - list ($entryArray, ) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1); |
|
649 | + list ($entryArray,) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1); |
|
650 | 650 | return $entryArray; |
651 | 651 | } |
652 | 652 |
@@ -39,6 +39,9 @@ discard block |
||
39 | 39 | /** @var null|Entry[] */ |
40 | 40 | private $customValues = NULL; |
41 | 41 | |
42 | + /** |
|
43 | + * @param string $pdatatype |
|
44 | + */ |
|
42 | 45 | protected function __construct($pcustomId, $pdatatype) |
43 | 46 | { |
44 | 47 | $this->columnTitle = self::getTitleByCustomID($pcustomId); |
@@ -147,7 +150,7 @@ discard block |
||
147 | 150 | /** |
148 | 151 | * Encode a value of this column ready to be displayed in an HTML document |
149 | 152 | * |
150 | - * @param integer|string $value |
|
153 | + * @param string $value |
|
151 | 154 | * @return string |
152 | 155 | */ |
153 | 156 | public function encodeHTMLValue($value) |
@@ -277,7 +280,7 @@ discard block |
||
277 | 280 | /** |
278 | 281 | * Get a CustomColumn for a specified (by ID) value |
279 | 282 | * |
280 | - * @param string|integer $id the id of the searched value |
|
283 | + * @param integer $id the id of the searched value |
|
281 | 284 | * @return CustomColumn |
282 | 285 | */ |
283 | 286 | abstract public function getCustom($id); |
@@ -11,18 +11,18 @@ discard block |
||
11 | 11 | */ |
12 | 12 | abstract class CustomColumnType extends Base |
13 | 13 | { |
14 | - const ALL_CUSTOMS_ID = "cops:custom"; |
|
14 | + const ALL_CUSTOMS_ID = "cops:custom"; |
|
15 | 15 | |
16 | - const CUSTOM_TYPE_TEXT = "text"; // type 1 + 2 |
|
17 | - const CUSTOM_TYPE_COMMENT = "comments"; // type 3 |
|
18 | - const CUSTOM_TYPE_SERIES = "series"; // type 4 |
|
16 | + const CUSTOM_TYPE_TEXT = "text"; // type 1 + 2 |
|
17 | + const CUSTOM_TYPE_COMMENT = "comments"; // type 3 |
|
18 | + const CUSTOM_TYPE_SERIES = "series"; // type 4 |
|
19 | 19 | const CUSTOM_TYPE_ENUM = "enumeration"; // type 5 |
20 | - const CUSTOM_TYPE_DATE = "datetime"; // type 6 |
|
21 | - const CUSTOM_TYPE_FLOAT = "float"; // type 7 |
|
22 | - const CUSTOM_TYPE_INT = "int"; // type 8 |
|
23 | - const CUSTOM_TYPE_RATING = "rating"; // type 9 |
|
24 | - const CUSTOM_TYPE_BOOL = "bool"; // type 10 |
|
25 | - const CUSTOM_TYPE_COMPOSITE = "composite"; // type 11 + 12 |
|
20 | + const CUSTOM_TYPE_DATE = "datetime"; // type 6 |
|
21 | + const CUSTOM_TYPE_FLOAT = "float"; // type 7 |
|
22 | + const CUSTOM_TYPE_INT = "int"; // type 8 |
|
23 | + const CUSTOM_TYPE_RATING = "rating"; // type 9 |
|
24 | + const CUSTOM_TYPE_BOOL = "bool"; // type 10 |
|
25 | + const CUSTOM_TYPE_COMPOSITE = "composite"; // type 11 + 12 |
|
26 | 26 | |
27 | 27 | /** @var array[integer]CustomColumnType */ |
28 | 28 | private static $customColumnCacheID = array(); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $result->execute(array($this->customId)); |
111 | 111 | if ($post = $result->fetchObject()) { |
112 | 112 | $json = json_decode($post->display); |
113 | - return (isset($json->description) && !empty($json->description)) ? $json->description : NULL; |
|
113 | + return (isset($json->description) && !empty($json->description))?$json->description:NULL; |
|
114 | 114 | } |
115 | 115 | return NULL; |
116 | 116 | } |
@@ -8,6 +8,9 @@ |
||
8 | 8 | |
9 | 9 | class LinkFacet extends Link |
10 | 10 | { |
11 | + /** |
|
12 | + * @param string $phref |
|
13 | + */ |
|
11 | 14 | public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) { |
12 | 15 | parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet); |
13 | 16 | if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
@@ -9,8 +9,8 @@ |
||
9 | 9 | class LinkFacet extends Link |
10 | 10 | { |
11 | 11 | public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) { |
12 | - parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet); |
|
13 | - if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
|
12 | + parent::__construct($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet); |
|
13 | + if (!is_null(GetUrlParam(DB))) $this->href = addURLParameter($this->href, DB, GetUrlParam(DB)); |
|
14 | 14 | $this->href = parent::getScriptName() . $this->href; |
15 | 15 | } |
16 | 16 | } |
@@ -8,6 +8,9 @@ |
||
8 | 8 | |
9 | 9 | class LinkNavigation extends Link |
10 | 10 | { |
11 | + /** |
|
12 | + * @param string $prel |
|
13 | + */ |
|
11 | 14 | public function __construct($phref, $prel = NULL, $ptitle = NULL) { |
12 | 15 | parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle); |
13 | 16 | if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
@@ -9,10 +9,10 @@ |
||
9 | 9 | class LinkNavigation extends Link |
10 | 10 | { |
11 | 11 | public function __construct($phref, $prel = NULL, $ptitle = NULL) { |
12 | - parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle); |
|
13 | - if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB)); |
|
14 | - if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href; |
|
15 | - if (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) { |
|
12 | + parent::__construct($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle); |
|
13 | + if (!is_null(GetUrlParam(DB))) $this->href = addURLParameter($this->href, DB, GetUrlParam(DB)); |
|
14 | + if (!preg_match("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href; |
|
15 | + if (preg_match("/(bookdetail|getJSON).php/", parent::getScriptName())) { |
|
16 | 16 | $this->href = "index.php" . $this->href; |
17 | 17 | } else { |
18 | 18 | $this->href = parent::getScriptName() . $this->href; |
@@ -8,6 +8,9 @@ discard block |
||
8 | 8 | |
9 | 9 | class PageCustomize extends Page |
10 | 10 | { |
11 | + /** |
|
12 | + * @param string $key |
|
13 | + */ |
|
11 | 14 | private function isChecked ($key, $testedValue = 1) { |
12 | 15 | $value = getCurrentOption ($key); |
13 | 16 | if (is_array ($value)) { |
@@ -22,6 +25,9 @@ discard block |
||
22 | 25 | return ""; |
23 | 26 | } |
24 | 27 | |
28 | + /** |
|
29 | + * @param string $key |
|
30 | + */ |
|
25 | 31 | private function isSelected ($key, $value) { |
26 | 32 | if (getCurrentOption ($key) == $value) { |
27 | 33 | return "selected='selected'"; |
@@ -8,10 +8,10 @@ discard block |
||
8 | 8 | |
9 | 9 | class PageCustomize extends Page |
10 | 10 | { |
11 | - private function isChecked ($key, $testedValue = 1) { |
|
12 | - $value = getCurrentOption ($key); |
|
13 | - if (is_array ($value)) { |
|
14 | - if (in_array ($testedValue, $value)) { |
|
11 | + private function isChecked($key, $testedValue = 1) { |
|
12 | + $value = getCurrentOption($key); |
|
13 | + if (is_array($value)) { |
|
14 | + if (in_array($testedValue, $value)) { |
|
15 | 15 | return "checked='checked'"; |
16 | 16 | } |
17 | 17 | } else { |
@@ -22,29 +22,29 @@ discard block |
||
22 | 22 | return ""; |
23 | 23 | } |
24 | 24 | |
25 | - private function isSelected ($key, $value) { |
|
26 | - if (getCurrentOption ($key) == $value) { |
|
25 | + private function isSelected($key, $value) { |
|
26 | + if (getCurrentOption($key) == $value) { |
|
27 | 27 | return "selected='selected'"; |
28 | 28 | } |
29 | 29 | return ""; |
30 | 30 | } |
31 | 31 | |
32 | - private function getStyleList () { |
|
33 | - $result = array (); |
|
34 | - foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) { |
|
35 | - if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) { |
|
36 | - array_push ($result, $m [1]); |
|
32 | + private function getStyleList() { |
|
33 | + $result = array(); |
|
34 | + foreach (glob("templates/" . getCurrentTemplate() . "/styles/style-*.css") as $filename) { |
|
35 | + if (preg_match('/styles\/style-(.*?)\.css/', $filename, $m)) { |
|
36 | + array_push($result, $m [1]); |
|
37 | 37 | } |
38 | 38 | } |
39 | 39 | return $result; |
40 | 40 | } |
41 | 41 | |
42 | - public function InitializeContent () |
|
42 | + public function InitializeContent() |
|
43 | 43 | { |
44 | - $this->title = localize ("customize.title"); |
|
45 | - $this->entryArray = array (); |
|
44 | + $this->title = localize("customize.title"); |
|
45 | + $this->entryArray = array(); |
|
46 | 46 | |
47 | - $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR, |
|
47 | + $ignoredBaseArray = array(PageQueryResult::SCOPE_AUTHOR, |
|
48 | 48 | PageQueryResult::SCOPE_TAG, |
49 | 49 | PageQueryResult::SCOPE_SERIES, |
50 | 50 | PageQueryResult::SCOPE_PUBLISHER, |
@@ -52,49 +52,49 @@ discard block |
||
52 | 52 | "language"); |
53 | 53 | |
54 | 54 | $content = ""; |
55 | - array_push ($this->entryArray, new Entry ("Template", "", |
|
55 | + array_push($this->entryArray, new Entry("Template", "", |
|
56 | 56 | "<span style='cursor: pointer;' onclick='$.cookie(\"template\", \"bootstrap\", { expires: 365 });window.location=$(\".headleft\").attr(\"href\");'>Click to switch to Bootstrap</span>", "text", |
57 | - array ())); |
|
57 | + array())); |
|
58 | 58 | if (!preg_match("/(Kobo|Kindle\/3.0|EBRD1101)/", $_SERVER['HTTP_USER_AGENT'])) { |
59 | 59 | $content .= '<select id="style" onchange="updateCookie (this);">'; |
60 | - foreach ($this-> getStyleList () as $filename) { |
|
61 | - $content .= "<option value='{$filename}' " . $this->isSelected ("style", $filename) . ">{$filename}</option>"; |
|
60 | + foreach ($this-> getStyleList() as $filename) { |
|
61 | + $content .= "<option value='{$filename}' " . $this->isSelected("style", $filename) . ">{$filename}</option>"; |
|
62 | 62 | } |
63 | 63 | $content .= '</select>'; |
64 | 64 | } else { |
65 | - foreach ($this-> getStyleList () as $filename) { |
|
66 | - $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked ("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>"; |
|
65 | + foreach ($this-> getStyleList() as $filename) { |
|
66 | + $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>"; |
|
67 | 67 | } |
68 | 68 | } |
69 | - array_push ($this->entryArray, new Entry (localize ("customize.style"), "", |
|
69 | + array_push($this->entryArray, new Entry(localize("customize.style"), "", |
|
70 | 70 | $content, "text", |
71 | - array ())); |
|
72 | - if (!useServerSideRendering ()) { |
|
73 | - $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked ("use_fancyapps") . ' />'; |
|
74 | - array_push ($this->entryArray, new Entry (localize ("customize.fancybox"), "", |
|
71 | + array())); |
|
72 | + if (!useServerSideRendering()) { |
|
73 | + $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked("use_fancyapps") . ' />'; |
|
74 | + array_push($this->entryArray, new Entry(localize("customize.fancybox"), "", |
|
75 | 75 | $content, "text", |
76 | - array ())); |
|
76 | + array())); |
|
77 | 77 | } |
78 | - $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption ("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />'; |
|
79 | - array_push ($this->entryArray, new Entry (localize ("customize.paging"), "", |
|
78 | + $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />'; |
|
79 | + array_push($this->entryArray, new Entry(localize("customize.paging"), "", |
|
80 | 80 | $content, "text", |
81 | - array ())); |
|
82 | - $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption ("email") . '" />'; |
|
83 | - array_push ($this->entryArray, new Entry (localize ("customize.email"), "", |
|
81 | + array())); |
|
82 | + $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption("email") . '" />'; |
|
83 | + array_push($this->entryArray, new Entry(localize("customize.email"), "", |
|
84 | 84 | $content, "text", |
85 | - array ())); |
|
86 | - $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked ("html_tag_filter") . ' />'; |
|
87 | - array_push ($this->entryArray, new Entry (localize ("customize.filter"), "", |
|
85 | + array())); |
|
86 | + $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked("html_tag_filter") . ' />'; |
|
87 | + array_push($this->entryArray, new Entry(localize("customize.filter"), "", |
|
88 | 88 | $content, "text", |
89 | - array ())); |
|
89 | + array())); |
|
90 | 90 | $content = ""; |
91 | 91 | foreach ($ignoredBaseArray as $key) { |
92 | - $keyPlural = preg_replace ('/(ss)$/', 's', $key . "s"); |
|
93 | - $content .= '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked ("ignored_categories", $key) . ' > ' . localize ("{$keyPlural}.title") . '</input> '; |
|
92 | + $keyPlural = preg_replace('/(ss)$/', 's', $key . "s"); |
|
93 | + $content .= '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked("ignored_categories", $key) . ' > ' . localize("{$keyPlural}.title") . '</input> '; |
|
94 | 94 | } |
95 | 95 | |
96 | - array_push ($this->entryArray, new Entry (localize ("customize.ignored"), "", |
|
96 | + array_push($this->entryArray, new Entry(localize("customize.ignored"), "", |
|
97 | 97 | $content, "text", |
98 | - array ())); |
|
98 | + array())); |
|
99 | 99 | } |
100 | 100 | } |
@@ -38,6 +38,9 @@ |
||
38 | 38 | return self::getEntryArray (self::SQL_ALL_RATINGS, array ()); |
39 | 39 | } |
40 | 40 | |
41 | + /** |
|
42 | + * @param string $query |
|
43 | + */ |
|
41 | 44 | public static function getEntryArray ($query, $params) { |
42 | 45 | list (, $result) = parent::executeQuery ($query, self::RATING_COLUMNS, "", $params, -1); |
43 | 46 | $entryArray = array(); |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | const ALL_RATING_ID = "cops:rating"; |
12 | 12 | |
13 | 13 | const RATING_COLUMNS = "ratings.id as id, ratings.rating as rating, count(*) as count"; |
14 | - const SQL_ALL_RATINGS ="select {0} from ratings, books_ratings_link where books_ratings_link.rating = ratings.id group by ratings.id order by ratings.rating"; |
|
14 | + const SQL_ALL_RATINGS = "select {0} from ratings, books_ratings_link where books_ratings_link.rating = ratings.id group by ratings.id order by ratings.rating"; |
|
15 | 15 | public $id; |
16 | 16 | public $name; |
17 | 17 | |
@@ -20,41 +20,41 @@ discard block |
||
20 | 20 | $this->name = $pname; |
21 | 21 | } |
22 | 22 | |
23 | - public function getUri () { |
|
24 | - return "?page=".parent::PAGE_RATING_DETAIL."&id=$this->id"; |
|
23 | + public function getUri() { |
|
24 | + return "?page=" . parent::PAGE_RATING_DETAIL . "&id=$this->id"; |
|
25 | 25 | } |
26 | 26 | |
27 | - public function getEntryId () { |
|
28 | - return self::ALL_RATING_ID.":".$this->id; |
|
27 | + public function getEntryId() { |
|
28 | + return self::ALL_RATING_ID . ":" . $this->id; |
|
29 | 29 | } |
30 | 30 | |
31 | 31 | public static function getCount() { |
32 | 32 | // str_format (localize("ratings", count(array)) |
33 | - return parent::getCountGeneric ("ratings", self::ALL_RATING_ID, parent::PAGE_ALL_RATINGS, "ratings"); |
|
33 | + return parent::getCountGeneric("ratings", self::ALL_RATING_ID, parent::PAGE_ALL_RATINGS, "ratings"); |
|
34 | 34 | } |
35 | 35 | |
36 | 36 | public static function getAllRatings() { |
37 | - return self::getEntryArray (self::SQL_ALL_RATINGS, array ()); |
|
37 | + return self::getEntryArray(self::SQL_ALL_RATINGS, array()); |
|
38 | 38 | } |
39 | 39 | |
40 | - public static function getEntryArray ($query, $params) { |
|
41 | - list (, $result) = parent::executeQuery ($query, self::RATING_COLUMNS, "", $params, -1); |
|
40 | + public static function getEntryArray($query, $params) { |
|
41 | + list (, $result) = parent::executeQuery($query, self::RATING_COLUMNS, "", $params, -1); |
|
42 | 42 | $entryArray = array(); |
43 | - while ($post = $result->fetchObject ()) |
|
43 | + while ($post = $result->fetchObject()) |
|
44 | 44 | { |
45 | - $ratingObj = new Rating ($post->id, $post->rating); |
|
46 | - $rating=$post->rating/2; |
|
47 | - $rating = str_format (localize("ratingword", $rating), $rating); |
|
48 | - array_push ($entryArray, new Entry ($rating, $ratingObj->getEntryId (), |
|
49 | - str_format (localize("bookword", $post->count), $post->count), "text", |
|
50 | - array ( new LinkNavigation ($ratingObj->getUri ())), "", $post->count)); |
|
45 | + $ratingObj = new Rating($post->id, $post->rating); |
|
46 | + $rating = $post->rating / 2; |
|
47 | + $rating = str_format(localize("ratingword", $rating), $rating); |
|
48 | + array_push($entryArray, new Entry($rating, $ratingObj->getEntryId(), |
|
49 | + str_format(localize("bookword", $post->count), $post->count), "text", |
|
50 | + array(new LinkNavigation($ratingObj->getUri())), "", $post->count)); |
|
51 | 51 | } |
52 | 52 | return $entryArray; |
53 | 53 | } |
54 | 54 | |
55 | - public static function getRatingById ($ratingId) { |
|
56 | - $result = parent::getDb ()->prepare('select rating from ratings where id = ?'); |
|
57 | - $result->execute (array ($ratingId)); |
|
58 | - return new Rating ($ratingId, $result->fetchColumn ()); |
|
55 | + public static function getRatingById($ratingId) { |
|
56 | + $result = parent::getDb()->prepare('select rating from ratings where id = ?'); |
|
57 | + $result->execute(array($ratingId)); |
|
58 | + return new Rating($ratingId, $result->fetchColumn()); |
|
59 | 59 | } |
60 | 60 | } |