Completed
Push — master ( b8091b...3ad122 )
by Markus
04:08
created
fetch.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -19,10 +19,10 @@  discard block
 block discarded – undo
19 19
         }
20 20
     }
21 21
 
22
-    $expires = 60*60*24*14;
22
+    $expires = 60 * 60 * 24 * 14;
23 23
     header('Pragma: public');
24 24
     header('Cache-Control: maxage=' . $expires);
25
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
25
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
26 26
     $bookId = getURLParam('id', NULL);
27 27
     $type   = getURLParam('type', 'jpg');
28 28
     $idData = getURLParam('data', NULL);
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     }
34 34
 
35 35
     if (!$book) {
36
-        notFound ();
36
+        notFound();
37 37
         return;
38 38
     }
39 39
 
@@ -55,15 +55,15 @@  discard block
 block discarded – undo
55 55
             header('Content-Type: image/jpeg');
56 56
             //by default, we don't cache
57 57
             $thumbnailCacheFullpath = null;
58
-            if ( isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '' ) {
58
+            if (isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '') {
59 59
                 $thumbnailCacheFullpath = $config['cops_thumbnail_cache_directory'];
60 60
                 //if multiple databases, add a subfolder with the database ID
61
-                $thumbnailCacheFullpath .= !is_null(GetUrlParam (DB)) ? 'db-' . GetUrlParam (DB) . DIRECTORY_SEPARATOR : '';
61
+                $thumbnailCacheFullpath .= !is_null(GetUrlParam(DB))?'db-' . GetUrlParam(DB) . DIRECTORY_SEPARATOR:'';
62 62
                 //when there are lots of thumbnails, it's better to save files in subfolders, so if the book's uuid is
63 63
                 //"01234567-89ab-cdef-0123-456789abcdef", we will save the thumbnail in .../0/12/34567-89ab-cdef-0123-456789abcdef-...
64 64
                 $thumbnailCacheFullpath .= substr($book->uuid, 0, 1) . DIRECTORY_SEPARATOR . substr($book->uuid, 1, 2) . DIRECTORY_SEPARATOR;
65 65
                 //check if cache folder exists or create it
66
-                if ( file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true) ) {
66
+                if (file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true)) {
67 67
                     //we name the thumbnail from the book's uuid and it's dimensions (width and/or height)
68 68
                     $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam('width') . 'x' . getURLParam('height') . '.jpg';
69 69
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
@@ -73,20 +73,20 @@  discard block
 block discarded – undo
73 73
                 }
74 74
             }
75 75
 
76
-            if ( $thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath) ) {
76
+            if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
77 77
                 //return the already cached thumbnail
78
-                readfile( $thumbnailCacheFullpath );
78
+                readfile($thumbnailCacheFullpath);
79 79
                 return;
80 80
             }
81 81
 
82
-            if ($book->getThumbnail (getURLParam('width'), getURLParam('height'), $thumbnailCacheFullpath)) {
82
+            if ($book->getThumbnail(getURLParam('width'), getURLParam('height'), $thumbnailCacheFullpath)) {
83 83
                 //if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
84
-                if ( $thumbnailCacheFullpath === null ) {
84
+                if ($thumbnailCacheFullpath === null) {
85 85
                     // The cover had to be resized
86 86
                     return;
87 87
                 } else {
88 88
                     //return the just cached thumbnail
89
-                    readfile( $thumbnailCacheFullpath );
89
+                    readfile($thumbnailCacheFullpath);
90 90
                     return;
91 91
                 }
92 92
             }
Please login to merge, or discard this patch.
config.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -12,20 +12,20 @@
 block discarded – undo
12 12
     require_once dirname(__FILE__) . '/config_local.php';
13 13
 }
14 14
 
15
-$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER) ? $_SERVER['PHP_AUTH_USER'] : '';
15
+$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER)?$_SERVER['PHP_AUTH_USER']:'';
16 16
 // Clean username, only allow a-z, A-Z, 0-9, -_ chars
17
-$remote_user = preg_replace( '/[^a-zA-Z0-9_-]/', '', $remote_user);
17
+$remote_user = preg_replace('/[^a-zA-Z0-9_-]/', '', $remote_user);
18 18
 $user_config_file = 'config_local.' . $remote_user . '.php';
19 19
 if (file_exists(dirname(__FILE__) . '/' . $user_config_file) && (php_sapi_name() !== 'cli')) {
20 20
     require_once dirname(__FILE__) . '/' . $user_config_file;
21 21
 }
22 22
 
23
-if(!is_null($config['cops_basic_authentication']) &&
23
+if (!is_null($config['cops_basic_authentication']) &&
24 24
     is_array($config['cops_basic_authentication']))
25 25
 {
26 26
     if (!isset($_SERVER['PHP_AUTH_USER']) ||
27 27
         (isset($_SERVER['PHP_AUTH_USER']) &&
28
-        ($_SERVER['PHP_AUTH_USER']!=$config['cops_basic_authentication']['username'] ||
28
+        ($_SERVER['PHP_AUTH_USER'] != $config['cops_basic_authentication']['username'] ||
29 29
         $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password'])))
30 30
     {
31 31
         header('WWW-Authenticate: Basic realm="COPS Authentication"');
Please login to merge, or discard this patch.
epubfs.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -72,11 +72,11 @@
 block discarded – undo
72 72
 try {
73 73
     $data = getComponentContent($book, $component, $add);
74 74
 
75
-    $expires = 60*60*24*14;
75
+    $expires = 60 * 60 * 24 * 14;
76 76
     header('Pragma: public');
77
-    header('Cache-Control: maxage='.$expires);
78
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
79
-    header ('Content-Type: ' . $book->componentContentType($component));
77
+    header('Cache-Control: maxage=' . $expires);
78
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
79
+    header('Content-Type: ' . $book->componentContentType($component));
80 80
     echo $data;
81 81
 } catch (Exception $e) {
82 82
     error_log($e);
Please login to merge, or discard this patch.
checkconfig.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
     require_once 'config.php';
13 13
     require_once 'base.php';
14 14
 
15
-    header ('Content-Type:text/html; charset=UTF-8');
15
+    header('Content-Type:text/html; charset=UTF-8');
16 16
 
17 17
     $err = getURLParam('err', -1);
18 18
     $full = getURLParam('full');
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
     <meta charset="utf-8">
29 29
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
30 30
     <title>COPS Configuration Check</title>
31
-    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" />
31
+    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss()) ?>" media="screen" />
32 32
 </head>
33 33
 <body>
34 34
 <div class="container">
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
             <h2>Check if the rendering will be done on client side or server side</h2>
154 154
             <h4>
155 155
             <?php
156
-            if (useServerSideRendering ()) {
156
+            if (useServerSideRendering()) {
157 157
                 echo 'Server side rendering';
158 158
             } else {
159 159
                 echo 'Client side rendering';
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
             <h2>Check if Calibre database path is not an URL</h2>
170 170
             <h4>
171 171
             <?php
172
-            if (!preg_match ('#^http#', $database)) {
172
+            if (!preg_match('#^http#', $database)) {
173 173
                 echo 'OK';
174 174
             } else {
175 175
                 echo 'Calibre path has to be local (no URL allowed)';
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
             <h4>
203 203
             <?php
204 204
             try {
205
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
205
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
206 206
                 echo $name . ' OK';
207 207
             } catch (Exception $e) {
208 208
                 echo $name . ' If the file is readable, check your php configuration. Exception detail : ' . $e;
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
             <h4>
216 216
             <?php
217 217
             try {
218
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
218
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
219 219
                 $count = $db->query('select count(*) FROM sqlite_master WHERE type="table" AND name in ("books", "authors", "tags", "series")')->fetchColumn();
220 220
                 if ($count == 4) {
221 221
                     echo $name . ' OK';
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
                 $result->execute();
240 240
                 while ($post = $result->fetchObject())
241 241
                 {
242
-                    if (!is_file (Base::getDbDirectory($i) . $post->fullpath)) {
242
+                    if (!is_file(Base::getDbDirectory($i) . $post->fullpath)) {
243 243
                         echo '<p>' . Base::getDbDirectory($i) . $post->fullpath . '</p>';
244 244
                     }
245 245
                 }
Please login to merge, or discard this patch.
lib/PageAllCustoms.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 PageAllCustoms extends Page
10 10
 {
11
-    public function InitializeContent ()
11
+    public function InitializeContent()
12 12
     {
13
-        $customId = getURLParam ("custom", NULL);
13
+        $customId = getURLParam("custom", NULL);
14 14
         $columnType = CustomColumnType::createByCustomID($customId);
15 15
         
16 16
         $this->title = $columnType->getTitle();
Please login to merge, or discard this patch.
lib/Base.php 1 patch
Spacing   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -37,146 +37,146 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
lib/Page.php 1 patch
Spacing   +66 added lines, -66 removed lines patch added patch discarded remove patch
@@ -24,55 +24,55 @@  discard block
 block discarded – undo
24 24
     /* @var Entry[] */
25 25
     public $entryArray = array();
26 26
 
27
-    public static function getPage ($pageId, $id, $query, $n)
27
+    public static function getPage($pageId, $id, $query, $n)
28 28
     {
29 29
         switch ($pageId) {
30 30
             case Base::PAGE_ALL_AUTHORS :
31
-                return new PageAllAuthors ($id, $query, $n);
31
+                return new PageAllAuthors($id, $query, $n);
32 32
             case Base::PAGE_AUTHORS_FIRST_LETTER :
33
-                return new PageAllAuthorsLetter ($id, $query, $n);
33
+                return new PageAllAuthorsLetter($id, $query, $n);
34 34
             case Base::PAGE_AUTHOR_DETAIL :
35
-                return new PageAuthorDetail ($id, $query, $n);
35
+                return new PageAuthorDetail($id, $query, $n);
36 36
             case Base::PAGE_ALL_TAGS :
37
-                return new PageAllTags ($id, $query, $n);
37
+                return new PageAllTags($id, $query, $n);
38 38
             case Base::PAGE_TAG_DETAIL :
39
-                return new PageTagDetail ($id, $query, $n);
39
+                return new PageTagDetail($id, $query, $n);
40 40
             case Base::PAGE_ALL_LANGUAGES :
41
-                return new PageAllLanguages ($id, $query, $n);
41
+                return new PageAllLanguages($id, $query, $n);
42 42
             case Base::PAGE_LANGUAGE_DETAIL :
43
-                return new PageLanguageDetail ($id, $query, $n);
43
+                return new PageLanguageDetail($id, $query, $n);
44 44
             case Base::PAGE_ALL_CUSTOMS :
45
-                return new PageAllCustoms ($id, $query, $n);
45
+                return new PageAllCustoms($id, $query, $n);
46 46
             case Base::PAGE_CUSTOM_DETAIL :
47
-                return new PageCustomDetail ($id, $query, $n);
47
+                return new PageCustomDetail($id, $query, $n);
48 48
             case Base::PAGE_ALL_RATINGS :
49
-                return new PageAllRating ($id, $query, $n);
49
+                return new PageAllRating($id, $query, $n);
50 50
             case Base::PAGE_RATING_DETAIL :
51
-                return new PageRatingDetail ($id, $query, $n);
51
+                return new PageRatingDetail($id, $query, $n);
52 52
             case Base::PAGE_ALL_SERIES :
53
-                return new PageAllSeries ($id, $query, $n);
53
+                return new PageAllSeries($id, $query, $n);
54 54
             case Base::PAGE_ALL_BOOKS :
55
-                return new PageAllBooks ($id, $query, $n);
55
+                return new PageAllBooks($id, $query, $n);
56 56
             case Base::PAGE_ALL_BOOKS_LETTER:
57
-                return new PageAllBooksLetter ($id, $query, $n);
57
+                return new PageAllBooksLetter($id, $query, $n);
58 58
             case Base::PAGE_ALL_RECENT_BOOKS :
59
-                return new PageRecentBooks ($id, $query, $n);
59
+                return new PageRecentBooks($id, $query, $n);
60 60
             case Base::PAGE_SERIE_DETAIL :
61
-                return new PageSerieDetail ($id, $query, $n);
61
+                return new PageSerieDetail($id, $query, $n);
62 62
             case Base::PAGE_OPENSEARCH_QUERY :
63
-                return new PageQueryResult ($id, $query, $n);
63
+                return new PageQueryResult($id, $query, $n);
64 64
             case Base::PAGE_BOOK_DETAIL :
65
-                return new PageBookDetail ($id, $query, $n);
65
+                return new PageBookDetail($id, $query, $n);
66 66
             case Base::PAGE_ALL_PUBLISHERS:
67
-                return new PageAllPublishers ($id, $query, $n);
67
+                return new PageAllPublishers($id, $query, $n);
68 68
             case Base::PAGE_PUBLISHER_DETAIL :
69
-                return new PagePublisherDetail ($id, $query, $n);
69
+                return new PagePublisherDetail($id, $query, $n);
70 70
             case Base::PAGE_ABOUT :
71
-                return new PageAbout ($id, $query, $n);
71
+                return new PageAbout($id, $query, $n);
72 72
             case Base::PAGE_CUSTOMIZE :
73
-                return new PageCustomize ($id, $query, $n);
73
+                return new PageCustomize($id, $query, $n);
74 74
             default:
75
-                $page = new Page ($id, $query, $n);
75
+                $page = new Page($id, $query, $n);
76 76
                 $page->idPage = "cops:catalog";
77 77
                 return $page;
78 78
         }
@@ -85,96 +85,96 @@  discard block
 block discarded – undo
85 85
         $this->query = $pquery;
86 86
         $this->n = $pn;
87 87
         $this->favicon = $config['cops_icon'];
88
-        $this->authorName = empty($config['cops_author_name']) ? utf8_encode('Sébastien Lucas') : $config['cops_author_name'];
89
-        $this->authorUri = empty($config['cops_author_uri']) ? 'http://blog.slucas.fr' : $config['cops_author_uri'];
90
-        $this->authorEmail = empty($config['cops_author_email']) ? '[email protected]' : $config['cops_author_email'];
88
+        $this->authorName = empty($config['cops_author_name'])?utf8_encode('Sébastien Lucas'):$config['cops_author_name'];
89
+        $this->authorUri = empty($config['cops_author_uri'])?'http://blog.slucas.fr':$config['cops_author_uri'];
90
+        $this->authorEmail = empty($config['cops_author_email'])?'[email protected]':$config['cops_author_email'];
91 91
     }
92 92
 
93
-    public function InitializeContent ()
93
+    public function InitializeContent()
94 94
     {
95 95
         global $config;
96 96
         $this->title = $config['cops_title_default'];
97 97
         $this->subtitle = $config['cops_subtitle_default'];
98
-        if (Base::noDatabaseSelected ()) {
98
+        if (Base::noDatabaseSelected()) {
99 99
             $i = 0;
100
-            foreach (Base::getDbNameList () as $key) {
101
-                $nBooks = Book::getBookCount ($i);
102
-                array_push ($this->entryArray, new Entry ($key, "cops:{$i}:catalog",
103
-                                        str_format (localize ("bookword", $nBooks), $nBooks), "text",
104
-                                        array ( new LinkNavigation ("?" . DB . "={$i}")), "", $nBooks));
100
+            foreach (Base::getDbNameList() as $key) {
101
+                $nBooks = Book::getBookCount($i);
102
+                array_push($this->entryArray, new Entry($key, "cops:{$i}:catalog",
103
+                                        str_format(localize("bookword", $nBooks), $nBooks), "text",
104
+                                        array(new LinkNavigation("?" . DB . "={$i}")), "", $nBooks));
105 105
                 $i++;
106
-                Base::clearDb ();
106
+                Base::clearDb();
107 107
             }
108 108
         } else {
109
-            if (!in_array (PageQueryResult::SCOPE_AUTHOR, getCurrentOption ('ignored_categories'))) {
110
-                array_push ($this->entryArray, Author::getCount());
109
+            if (!in_array(PageQueryResult::SCOPE_AUTHOR, getCurrentOption('ignored_categories'))) {
110
+                array_push($this->entryArray, Author::getCount());
111 111
             }
112
-            if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
112
+            if (!in_array(PageQueryResult::SCOPE_SERIES, getCurrentOption('ignored_categories'))) {
113 113
                 $series = Serie::getCount();
114
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
114
+                if (!is_null($series)) array_push($this->entryArray, $series);
115 115
             }
116
-            if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
116
+            if (!in_array(PageQueryResult::SCOPE_PUBLISHER, getCurrentOption('ignored_categories'))) {
117 117
                 $publisher = Publisher::getCount();
118
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
118
+                if (!is_null($publisher)) array_push($this->entryArray, $publisher);
119 119
             }
120
-            if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
120
+            if (!in_array(PageQueryResult::SCOPE_TAG, getCurrentOption('ignored_categories'))) {
121 121
                 $tags = Tag::getCount();
122
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
122
+                if (!is_null($tags)) array_push($this->entryArray, $tags);
123 123
             }
124
-            if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
124
+            if (!in_array(PageQueryResult::SCOPE_RATING, getCurrentOption('ignored_categories'))) {
125 125
                 $rating = Rating::getCount();
126
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
126
+                if (!is_null($rating)) array_push($this->entryArray, $rating);
127 127
             }
128
-            if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
128
+            if (!in_array("language", getCurrentOption('ignored_categories'))) {
129 129
                 $languages = Language::getCount();
130
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
130
+                if (!is_null($languages)) array_push($this->entryArray, $languages);
131 131
             }
132 132
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
133 133
                 $customColumn = CustomColumnType::createByLookup($lookup);
134
-                if (!is_null ($customColumn) && $customColumn->isSearchable()) {
135
-                    array_push ($this->entryArray, $customColumn->getCount());
134
+                if (!is_null($customColumn) && $customColumn->isSearchable()) {
135
+                    array_push($this->entryArray, $customColumn->getCount());
136 136
                 }
137 137
             }
138
-            $this->entryArray = array_merge ($this->entryArray, Book::getCount());
138
+            $this->entryArray = array_merge($this->entryArray, Book::getCount());
139 139
 
140
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
140
+            if (Base::isMultipleDatabaseEnabled()) $this->title = Base::getDbName();
141 141
         }
142 142
     }
143 143
 
144
-    public function isPaginated ()
144
+    public function isPaginated()
145 145
     {
146
-        return (getCurrentOption ("max_item_per_page") != -1 &&
146
+        return (getCurrentOption("max_item_per_page") != -1 &&
147 147
                 $this->totalNumber != -1 &&
148
-                $this->totalNumber > getCurrentOption ("max_item_per_page"));
148
+                $this->totalNumber > getCurrentOption("max_item_per_page"));
149 149
     }
150 150
 
151
-    public function getNextLink ()
151
+    public function getNextLink()
152 152
     {
153
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
154
-        if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
155
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
153
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
154
+        if (($this->n) * getCurrentOption("max_item_per_page") < $this->totalNumber) {
155
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n + 1), "next", localize("paging.next.alternate"));
156 156
         }
157 157
         return NULL;
158 158
     }
159 159
 
160
-    public function getPrevLink ()
160
+    public function getPrevLink()
161 161
     {
162
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
162
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
163 163
         if ($this->n > 1) {
164
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
164
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n - 1), "previous", localize("paging.previous.alternate"));
165 165
         }
166 166
         return NULL;
167 167
     }
168 168
 
169
-    public function getMaxPage ()
169
+    public function getMaxPage()
170 170
     {
171
-        return ceil ($this->totalNumber / getCurrentOption ("max_item_per_page"));
171
+        return ceil($this->totalNumber / getCurrentOption("max_item_per_page"));
172 172
     }
173 173
 
174
-    public function containsBook ()
174
+    public function containsBook()
175 175
     {
176
-        if (count ($this->entryArray) == 0) return false;
177
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
176
+        if (count($this->entryArray) == 0) return false;
177
+        if (get_class($this->entryArray [0]) == "EntryBook") return true;
178 178
         return false;
179 179
     }
180 180
 }
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::createCustom ($customId, $this->idGet);
15
-        $this->idPage = $custom->getEntryId ();
13
+        $customId = getURLParam("custom", NULL);
14
+        $custom = CustomColumn::createCustom($customId, $this->idGet);
15
+        $this->idPage = $custom->getEntryId();
16 16
         $this->title = $custom->value;
17
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom ($custom, $this->idGet, $this->n);
17
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom($custom, $this->idGet, $this->n);
18 18
     }
19 19
 }
Please login to merge, or discard this patch.
config_default.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -189,7 +189,7 @@  discard block
 block discarded – undo
189 189
      *
190 190
      * Note that the composite custom columns are not supported
191 191
      */
192
-    $config['cops_calibre_custom_column_list'] = array ();
192
+    $config['cops_calibre_custom_column_list'] = array();
193 193
 
194 194
     /*
195 195
      * Custom Columns for the book preview panel
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
      *
200 200
      * Note that the composite custom columns are not supported
201 201
      */
202
-    $config['cops_calibre_custom_column_preview'] = array ();
202
+    $config['cops_calibre_custom_column_preview'] = array();
203 203
 
204 204
     /*
205 205
      * Rename .epub to .kepub.epub if downloaded from a Kobo eReader
Please login to merge, or discard this patch.