Completed
Push — master ( fb8b2d...704d46 )
by Sébastien
01:57
created
lib/PageAllSeries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 
9 9
 class PageAllLanguages extends Page
10 10
 {
11
-    public function InitializeContent ()
11
+    public function InitializeContent()
12 12
     {
13 13
         $this->title = localize("languages.title");
14 14
         $this->entryArray = Language::getAllLanguages();
Please login to merge, or discard this patch.
lib/Book.php 1 patch
Spacing   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -7,55 +7,55 @@  discard block
 block discarded – undo
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
 class Book extends Base
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
     public $serie = NULL;
106 106
     public $tags = NULL;
107 107
     public $languages = NULL;
108
-    public $format = array ();
108
+    public $format = array();
109 109
 
110 110
 
111 111
     public function __construct($line) {
@@ -127,24 +127,24 @@  discard block
 block discarded – undo
127 127
     }
128 128
 
129 129
     public function getEntryId() {
130
-        return self::ALL_BOOKS_UUID.':'.$this->uuid;
130
+        return self::ALL_BOOKS_UUID . ':' . $this->uuid;
131 131
     }
132 132
 
133
-    public static function getEntryIdByLetter ($startingLetter) {
134
-        return self::ALL_BOOKS_ID.':letter:'.$startingLetter;
133
+    public static function getEntryIdByLetter($startingLetter) {
134
+        return self::ALL_BOOKS_ID . ':letter:' . $startingLetter;
135 135
     }
136 136
 
137
-    public function getUri () {
138
-        return '?page='.parent::PAGE_BOOK_DETAIL.'&id=' . $this->id;
137
+    public function getUri() {
138
+        return '?page=' . parent::PAGE_BOOK_DETAIL . '&id=' . $this->id;
139 139
     }
140 140
 
141
-    public function getDetailUrl () {
141
+    public function getDetailUrl() {
142 142
         $urlParam = $this->getUri();
143
-        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB));
143
+        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam(DB));
144 144
         return 'index.php' . $urlParam;
145 145
     }
146 146
 
147
-    public function getTitle () {
147
+    public function getTitle() {
148 148
         return $this->title;
149 149
     }
150 150
 
@@ -153,22 +153,22 @@  discard block
 block discarded – undo
153 153
     /**
154 154
      * @return Author[]
155 155
      */
156
-    public function getAuthors () {
156
+    public function getAuthors() {
157 157
         if (is_null($this->authors)) {
158 158
             $this->authors = Author::getAuthorByBookId($this->id);
159 159
         }
160 160
         return $this->authors;
161 161
     }
162 162
 
163
-    public function getAuthorsName () {
164
-        return implode(', ', array_map(function ($author) { return $author->name; }, $this->getAuthors()));
163
+    public function getAuthorsName() {
164
+        return implode(', ', array_map(function($author) { return $author->name; }, $this->getAuthors()));
165 165
     }
166 166
 
167
-    public function getAuthorsSort () {
168
-        return implode(', ', array_map(function ($author) { return $author->sort; }, $this->getAuthors()));
167
+    public function getAuthorsSort() {
168
+        return implode(', ', array_map(function($author) { return $author->sort; }, $this->getAuthors()));
169 169
     }
170 170
 
171
-    public function getPublisher () {
171
+    public function getPublisher() {
172 172
         if (is_null($this->publisher)) {
173 173
             $this->publisher = Publisher::getPublisherByBookId($this->id);
174 174
         }
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
207 207
      * @return Tag[]
208 208
      */
209 209
     public function getTags() {
210
-        if (is_null ($this->tags)) {
210
+        if (is_null($this->tags)) {
211 211
             $this->tags = array();
212 212
 
213 213
             $result = parent::getDb()->prepare('select tags.id as id, name
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
     }
226 226
 
227 227
     public function getTagsName() {
228
-        return implode(', ', array_map(function ($tag) { return $tag->name; }, $this->getTags()));
228
+        return implode(', ', array_map(function($tag) { return $tag->name; }, $this->getTags()));
229 229
     }
230 230
 
231 231
     /**
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 
278 278
     public function getDataById($idData)
279 279
     {
280
-        $reduced = array_filter($this->getDatas(), function ($data) use ($idData) {
280
+        $reduced = array_filter($this->getDatas(), function($data) use ($idData) {
281 281
             return $data->id == $idData;
282 282
         });
283 283
         return reset($reduced);
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
         if (empty ($this->pubdate)) {
302 302
             return '';
303 303
         }
304
-        $dateY = (int) substr($this->pubdate, 0, 4);
304
+        $dateY = (int)substr($this->pubdate, 0, 4);
305 305
         if ($dateY > 102) {
306 306
             return str_pad($dateY, 4, '0', STR_PAD_LEFT);
307 307
         }
@@ -310,8 +310,8 @@  discard block
 block discarded – undo
310 310
 
311 311
     public function getComment($withSerie = true) {
312 312
         $addition = '';
313
-        $se = $this->getSerie ();
314
-        if (!is_null ($se) && $withSerie) {
313
+        $se = $this->getSerie();
314
+        if (!is_null($se) && $withSerie) {
315 315
             $addition = $addition . '<strong>' . localize('content.series') . '</strong>' . str_format(localize('content.series.data'), $this->seriesIndex, htmlspecialchars($se->name)) . "<br />\n";
316 316
         }
317 317
         if (preg_match('/<\/(div|p|a|span)>/', $this->comment))
@@ -325,7 +325,7 @@  discard block
 block discarded – undo
325 325
     }
326 326
 
327 327
     public function getDataFormat($format) {
328
-        $reduced = array_filter($this->getDatas(), function ($data) use ($format) {
328
+        $reduced = array_filter($this->getDatas(), function($data) use ($format) {
329 329
             return $data->format == $format;
330 330
         });
331 331
         return reset($reduced);
@@ -346,11 +346,11 @@  discard block
 block discarded – undo
346 346
 
347 347
         if ($relative)
348 348
         {
349
-            return $this->relativePath.'/'.$file;
349
+            return $this->relativePath . '/' . $file;
350 350
         }
351 351
         else
352 352
         {
353
-            return $this->path.'/'.$file;
353
+            return $this->path . '/' . $file;
354 354
         }
355 355
     }
356 356
 
@@ -370,7 +370,7 @@  discard block
 block discarded – undo
370 370
             }
371 371
             $epub->Authors($authorArray);
372 372
             $epub->Language($this->getLanguages());
373
-            $epub->Description ($this->getComment(false));
373
+            $epub->Description($this->getComment(false));
374 374
             $epub->Subjects($this->getTagsName());
375 375
             $epub->Cover2($this->getFilePath('jpg'), 'image/jpeg');
376 376
             $epub->Calibre($this->uuid);
@@ -379,7 +379,7 @@  discard block
 block discarded – undo
379 379
                 $epub->Serie($se->name);
380 380
                 $epub->SerieIndex($this->seriesIndex);
381 381
             }
382
-            if ($config['cops_provide_kepub'] == '1'  && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
382
+            if ($config['cops_provide_kepub'] == '1' && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
383 383
                 $epub->updateForKepub();
384 384
             }
385 385
             $epub->download($data->getUpdatedFilenameEpub());
@@ -404,11 +404,11 @@  discard block
 block discarded – undo
404 404
             if (!is_null($width)) {
405 405
                 $nw = $width;
406 406
                 if ($nw >= $w) { return false; }
407
-                $nh = ($nw*$h)/$w;
407
+                $nh = ($nw * $h) / $w;
408 408
             } else {
409 409
                 $nh = $height;
410 410
                 if ($nh >= $h) { return false; }
411
-                $nw = ($nh*$w)/$h;
411
+                $nw = ($nh * $w) / $h;
412 412
             }
413 413
         } else {
414 414
             return false;
@@ -416,16 +416,16 @@  discard block
 block discarded – undo
416 416
 
417 417
         //draw the image
418 418
         $src_img = imagecreatefromjpeg($file);
419
-        $dst_img = imagecreatetruecolor($nw,$nh);
420
-        imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h);//resizing the image
421
-        imagejpeg($dst_img,$outputfile,80);
419
+        $dst_img = imagecreatetruecolor($nw, $nh);
420
+        imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h); //resizing the image
421
+        imagejpeg($dst_img, $outputfile, 80);
422 422
         imagedestroy($src_img);
423 423
         imagedestroy($dst_img);
424 424
 
425 425
         return true;
426 426
     }
427 427
 
428
-    public function getLinkArray ()
428
+    public function getLinkArray()
429 429
     {
430 430
         $linkArray = array();
431 431
 
@@ -450,7 +450,7 @@  discard block
 block discarded – undo
450 450
         }
451 451
 
452 452
         $serie = $this->getSerie();
453
-        if (!is_null ($serie)) {
453
+        if (!is_null($serie)) {
454 454
             array_push($linkArray, new LinkNavigation($serie->getUri(), 'related', str_format(localize('content.series.data'), $this->seriesIndex, $serie->name)));
455 455
         }
456 456
 
@@ -475,13 +475,13 @@  discard block
 block discarded – undo
475 475
         $entry = new Entry(localize('allbooks.title'),
476 476
                           self::ALL_BOOKS_ID,
477 477
                           str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text',
478
-                          array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks);
478
+                          array(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS)), '', $nBooks);
479 479
         array_push($result, $entry);
480 480
         if ($config['cops_recentbooks_limit'] > 0) {
481 481
             $entry = new Entry(localize('recent.title'),
482 482
                               self::ALL_RECENT_BOOKS_ID,
483 483
                               str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text',
484
-                              array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
484
+                              array(new LinkNavigation('?page=' . parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
485 485
             array_push($result, $entry);
486 486
         }
487 487
         return $result;
@@ -577,7 +577,7 @@  discard block
 block discarded – undo
577 577
     }
578 578
 
579 579
     public static function getBooks($n) {
580
-        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL , array (), $n);
580
+        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL, array(), $n);
581 581
         return array($entryArray, $totalNumber);
582 582
     }
583 583
 
@@ -594,7 +594,7 @@  discard block
 block discarded – undo
594 594
         {
595 595
             array_push($entryArray, new Entry($post->title, Book::getEntryIdByLetter($post->title),
596 596
                 str_format(localize('bookword', $post->count), $post->count), 'text',
597
-                array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS_LETTER.'&id='. rawurlencode($post->title))), '', $post->count));
597
+                array(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS_LETTER . '&id=' . rawurlencode($post->title))), '', $post->count));
598 598
         }
599 599
         return $entryArray;
600 600
     }
@@ -619,7 +619,7 @@  discard block
 block discarded – undo
619 619
 
620 620
     public static function getAllRecentBooks() {
621 621
         global $config;
622
-        list ($entryArray, ) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
622
+        list ($entryArray,) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
623 623
         return $entryArray;
624 624
     }
625 625
 
Please login to merge, or discard this patch.
checkconfig.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     <meta charset="utf-8">
27 27
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
28 28
     <title>COPS Configuration Check</title>
29
-    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" />
29
+    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss()) ?>" media="screen" />
30 30
 </head>
31 31
 <body>
32 32
 <div class="container">
@@ -151,7 +151,7 @@  discard block
 block discarded – undo
151 151
             <h2>Check if the rendering will be done on client side or server side</h2>
152 152
             <h4>
153 153
             <?php
154
-            if (useServerSideRendering ()) {
154
+            if (useServerSideRendering()) {
155 155
                 echo 'Server side rendering';
156 156
             } else {
157 157
                 echo 'Client side rendering';
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
             <h2>Check if Calibre database path is not an URL</h2>
168 168
             <h4>
169 169
             <?php
170
-            if (!preg_match ('#^http#', $database)) {
170
+            if (!preg_match('#^http#', $database)) {
171 171
                 echo $name . ' OK';
172 172
             } else {
173 173
                 echo $name . 'Calibre path has to be local (no URL allowed)';
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
200 200
             <h4>
201 201
             <?php
202 202
             try {
203
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
203
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
204 204
                 echo $name . ' OK';
205 205
             } catch (Exception $e) {
206 206
                 echo $name . ' If the file is readable, check your php configuration. Exception detail : ' . $e;
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
             <h4>
214 214
             <?php
215 215
             try {
216
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
216
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
217 217
                 $count = $db->query('select count(*) FROM sqlite_master WHERE type="table" AND name in ("books", "authors", "tags", "series")')->fetchColumn();
218 218
                 if ($count == 4) {
219 219
                     echo $name . ' OK';
@@ -237,7 +237,7 @@  discard block
 block discarded – undo
237 237
                 $result->execute();
238 238
                 while ($post = $result->fetchObject())
239 239
                 {
240
-                    if (!is_file (Base::getDbDirectory($i) . $post->fullpath)) {
240
+                    if (!is_file(Base::getDbDirectory($i) . $post->fullpath)) {
241 241
                         echo '<p>' . Base::getDbDirectory($i) . $post->fullpath . '</p>';
242 242
                     }
243 243
                 }
Please login to merge, or discard this patch.
base.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -8,8 +8,8 @@  discard block
 block discarded – undo
8 8
 
9 9
 require_once 'config.php';
10 10
 
11
-define ('VERSION', '1.0.2');
12
-define ('DB', 'db');
11
+define('VERSION', '1.0.2');
12
+define('DB', 'db');
13 13
 date_default_timezone_set($config['default_timezone']);
14 14
 
15 15
 
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
 block discarded – undo
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
     }
Please login to merge, or discard this patch.