Completed
Push — master ( 306060...2234f3 )
by Markus
03:46
created
sendtomail.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -78,9 +78,9 @@
 block discarded – undo
78 78
 $mail->AltBody = "Sent by COPS";
79 79
 
80 80
 if (!$mail->Send()) {
81
-   echo localize ("mail.messagenotsent");
82
-   echo 'Mailer Error: ' . $mail->ErrorInfo;
83
-   exit;
81
+    echo localize ("mail.messagenotsent");
82
+    echo 'Mailer Error: ' . $mail->ErrorInfo;
83
+    exit;
84 84
 }
85 85
 
86 86
 echo localize ("mail.messagesent");
Please login to merge, or discard this patch.
transliteration.php 1 patch
Indentation   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -26,56 +26,56 @@  discard block
 block discarded – undo
26 26
  *   Transliterated text.
27 27
  */
28 28
 function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
29
-  // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
30
-  // avoid the overhead of initializing the decomposition tables by skipping
31
-  // out early.
32
-  if (!preg_match('/[\x80-\xff]/', $string)) {
29
+    // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
30
+    // avoid the overhead of initializing the decomposition tables by skipping
31
+    // out early.
32
+    if (!preg_match('/[\x80-\xff]/', $string)) {
33 33
     return $string;
34
-  }
34
+    }
35 35
 
36
-  static $tail_bytes;
36
+    static $tail_bytes;
37 37
 
38
-  if (!isset($tail_bytes)) {
38
+    if (!isset($tail_bytes)) {
39 39
     // Each UTF-8 head byte is followed by a certain number of tail bytes.
40 40
     $tail_bytes = array();
41 41
     for ($n = 0; $n < 256; $n++) {
42
-      if ($n < 0xc0) {
42
+        if ($n < 0xc0) {
43 43
         $remaining = 0;
44
-      }
45
-      elseif ($n < 0xe0) {
44
+        }
45
+        elseif ($n < 0xe0) {
46 46
         $remaining = 1;
47
-      }
48
-      elseif ($n < 0xf0) {
47
+        }
48
+        elseif ($n < 0xf0) {
49 49
         $remaining = 2;
50
-      }
51
-      elseif ($n < 0xf8) {
50
+        }
51
+        elseif ($n < 0xf8) {
52 52
         $remaining = 3;
53
-      }
54
-      elseif ($n < 0xfc) {
53
+        }
54
+        elseif ($n < 0xfc) {
55 55
         $remaining = 4;
56
-      }
57
-      elseif ($n < 0xfe) {
56
+        }
57
+        elseif ($n < 0xfe) {
58 58
         $remaining = 5;
59
-      }
60
-      else {
59
+        }
60
+        else {
61 61
         $remaining = 0;
62
-      }
63
-      $tail_bytes[chr($n)] = $remaining;
62
+        }
63
+        $tail_bytes[chr($n)] = $remaining;
64
+    }
64 65
     }
65
-  }
66 66
 
67
-  // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
68
-  // be handled much more quickly. Don't chop up Unicode areas for punctuation,
69
-  // though, that wastes energy.
70
-  preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
67
+    // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
68
+    // be handled much more quickly. Don't chop up Unicode areas for punctuation,
69
+    // though, that wastes energy.
70
+    preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
71 71
 
72
-  $result = '';
73
-  foreach ($matches[0] as $str) {
72
+    $result = '';
73
+    foreach ($matches[0] as $str) {
74 74
     if ($str[0] < "\x80") {
75
-      // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
76
-      // skip over it.
77
-      $result .= $str;
78
-      continue;
75
+        // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
76
+        // skip over it.
77
+        $result .= $str;
78
+        continue;
79 79
     }
80 80
 
81 81
     // We'll have to examine the chunk byte by byte to ensure that it consists
@@ -91,73 +91,73 @@  discard block
 block discarded – undo
91 91
     $len = $chunk + 1;
92 92
 
93 93
     for ($i = -1; --$len; ) {
94
-      $c = $str[++$i];
95
-      if ($remaining = $tail_bytes[$c]) {
94
+        $c = $str[++$i];
95
+        if ($remaining = $tail_bytes[$c]) {
96 96
         // UTF-8 head byte!
97 97
         $sequence = $head = $c;
98 98
         do {
99
-          // Look for the defined number of tail bytes...
100
-          if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
99
+            // Look for the defined number of tail bytes...
100
+            if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
101 101
             // Legal tail bytes are nice.
102 102
             $sequence .= $c;
103
-          }
104
-          else {
103
+            }
104
+            else {
105 105
             if ($len == 0) {
106
-              // Premature end of string! Drop a replacement character into
107
-              // output to represent the invalid UTF-8 sequence.
108
-              $result .= $unknown;
109
-              break 2;
106
+                // Premature end of string! Drop a replacement character into
107
+                // output to represent the invalid UTF-8 sequence.
108
+                $result .= $unknown;
109
+                break 2;
110 110
             }
111 111
             else {
112
-              // Illegal tail byte; abandon the sequence.
113
-              $result .= $unknown;
114
-              // Back up and reprocess this byte; it may itself be a legal
115
-              // ASCII or UTF-8 sequence head.
116
-              --$i;
117
-              ++$len;
118
-              continue 2;
112
+                // Illegal tail byte; abandon the sequence.
113
+                $result .= $unknown;
114
+                // Back up and reprocess this byte; it may itself be a legal
115
+                // ASCII or UTF-8 sequence head.
116
+                --$i;
117
+                ++$len;
118
+                continue 2;
119
+            }
119 120
             }
120
-          }
121 121
         } while (--$remaining);
122 122
 
123 123
         $n = ord($head);
124 124
         if ($n <= 0xdf) {
125
-          $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
125
+            $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
126 126
         }
127 127
         elseif ($n <= 0xef) {
128
-          $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
128
+            $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
129 129
         }
130 130
         elseif ($n <= 0xf7) {
131
-          $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
131
+            $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
132 132
         }
133 133
         elseif ($n <= 0xfb) {
134
-          $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
134
+            $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
135 135
         }
136 136
         elseif ($n <= 0xfd) {
137
-          $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128);
137
+            $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128);
138 138
         }
139 139
         $result .= _transliteration_replace($ord, $unknown, $source_langcode);
140 140
         $head = '';
141
-      }
142
-      elseif ($c < "\x80") {
141
+        }
142
+        elseif ($c < "\x80") {
143 143
         // ASCII byte.
144 144
         $result .= $c;
145 145
         $head = '';
146
-      }
147
-      elseif ($c < "\xc0") {
146
+        }
147
+        elseif ($c < "\xc0") {
148 148
         // Illegal tail bytes.
149 149
         if ($head == '') {
150
-          $result .= $unknown;
150
+            $result .= $unknown;
151
+        }
151 152
         }
152
-      }
153
-      else {
153
+        else {
154 154
         // Miscellaneous freaks.
155 155
         $result .= $unknown;
156 156
         $head = '';
157
-      }
157
+        }
158 158
     }
159
-  }
160
-  return $result;
159
+    }
160
+    return $result;
161 161
 }
162 162
 
163 163
 /**
@@ -176,36 +176,36 @@  discard block
 block discarded – undo
176 176
  *   ASCII replacement character.
177 177
  */
178 178
 function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
179
-  static $map = array();
179
+    static $map = array();
180 180
 
181
-  //GL: set language later
182
-  /*
181
+    //GL: set language later
182
+    /*
183 183
   if (!isset($langcode)) {
184 184
     global $language;
185 185
     $langcode = $language->language;
186 186
   }
187 187
   */
188 188
 
189
-  $bank = $ord >> 8;
189
+    $bank = $ord >> 8;
190 190
 
191
-  if (!isset($map[$bank][$langcode])) {
191
+    if (!isset($map[$bank][$langcode])) {
192 192
     $file = './resources/transliteration-data/' . sprintf('x%02x', $bank) . '.php';  
193 193
     if (file_exists($file)) {
194
-      include $file;
195
-      if ($langcode != 'en' && isset($variant[$langcode])) {
194
+        include $file;
195
+        if ($langcode != 'en' && isset($variant[$langcode])) {
196 196
         // Merge in language specific mappings.
197 197
         $map[$bank][$langcode] = $variant[$langcode] + $base;
198
-      }
199
-      else {
198
+        }
199
+        else {
200 200
         $map[$bank][$langcode] = $base;
201
-      }
201
+        }
202 202
     }
203 203
     else {
204
-      $map[$bank][$langcode] = array();
204
+        $map[$bank][$langcode] = array();
205
+    }
205 206
     }
206
-  }
207 207
 
208
-  $ord = $ord & 255;
208
+    $ord = $ord & 255;
209 209
 
210
-  return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
210
+    return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
211 211
 }
Please login to merge, or discard this patch.
lib/Book.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -428,15 +428,15 @@
 block discarded – undo
428 428
         $nBooks = parent::executeQuerySingle ('select count(*) from books');
429 429
         $result = array();
430 430
         $entry = new Entry (localize ("allbooks.title"),
431
-                          self::ALL_BOOKS_ID,
432
-                          str_format (localize ("allbooks.alphabetical", $nBooks), $nBooks), "text",
433
-                          array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS)), "", $nBooks);
431
+                            self::ALL_BOOKS_ID,
432
+                            str_format (localize ("allbooks.alphabetical", $nBooks), $nBooks), "text",
433
+                            array ( new LinkNavigation ("?page=".parent::PAGE_ALL_BOOKS)), "", $nBooks);
434 434
         array_push ($result, $entry);
435 435
         if ($config['cops_recentbooks_limit'] > 0) {
436 436
             $entry = new Entry (localize ("recent.title"),
437
-                              self::ALL_RECENT_BOOKS_ID,
438
-                              str_format (localize ("recent.list"), $config['cops_recentbooks_limit']), "text",
439
-                              array ( new LinkNavigation ("?page=".parent::PAGE_ALL_RECENT_BOOKS)), "", $config['cops_recentbooks_limit']);
437
+                                self::ALL_RECENT_BOOKS_ID,
438
+                                str_format (localize ("recent.list"), $config['cops_recentbooks_limit']), "text",
439
+                                array ( new LinkNavigation ("?page=".parent::PAGE_ALL_RECENT_BOOKS)), "", $config['cops_recentbooks_limit']);
440 440
             array_push ($result, $entry);
441 441
         }
442 442
         return $result;
Please login to merge, or discard this patch.
lib/JSON_renderer.php 1 patch
Indentation   +46 added lines, -46 removed lines patch added patch discarded remove patch
@@ -46,19 +46,19 @@  discard block
 block discarded – undo
46 46
         }
47 47
 
48 48
         return array ("id" => $book->id,
49
-                      "hasCover" => $book->hasCover,
50
-                      "preferedData" => $preferedData,
51
-                      "rating" => $book->getRating (),
52
-                      "publisherName" => $pn,
53
-                      "publisherurl" => $pu,
54
-                      "pubDate" => $book->getPubDate (),
55
-                      "languagesName" => $book->getLanguages (),
56
-                      "authorsName" => $book->getAuthorsName (),
57
-                      "tagsName" => $book->getTagsName (),
58
-                      "seriesName" => $sn,
59
-                      "seriesIndex" => $book->seriesIndex,
60
-                      "seriesCompleteName" => $scn,
61
-                      "seriesurl" => $su);
49
+                        "hasCover" => $book->hasCover,
50
+                        "preferedData" => $preferedData,
51
+                        "rating" => $book->getRating (),
52
+                        "publisherName" => $pn,
53
+                        "publisherurl" => $pu,
54
+                        "pubDate" => $book->getPubDate (),
55
+                        "languagesName" => $book->getLanguages (),
56
+                        "authorsName" => $book->getAuthorsName (),
57
+                        "tagsName" => $book->getTagsName (),
58
+                        "seriesName" => $sn,
59
+                        "seriesIndex" => $book->seriesIndex,
60
+                        "seriesCompleteName" => $scn,
61
+                        "seriesurl" => $su);
62 62
     }
63 63
 
64 64
     public static function getFullBookContentArray ($book) {
@@ -125,44 +125,44 @@  discard block
 block discarded – undo
125 125
         $out = $in;
126 126
 
127 127
         $out ["c"] = array ("version" => VERSION, "i18n" => array (
128
-                           "coverAlt" => localize("i18n.coversection"),
129
-                           "authorsTitle" => localize("authors.title"),
130
-                           "bookwordTitle" => localize("bookword.title"),
131
-                           "tagsTitle" => localize("tags.title"),
132
-                           "seriesTitle" => localize("series.title"),
133
-                           "customizeTitle" => localize ("customize.title"),
134
-                           "aboutTitle" => localize ("about.title"),
135
-                           "previousAlt" => localize ("paging.previous.alternate"),
136
-                           "nextAlt" => localize ("paging.next.alternate"),
137
-                           "searchAlt" => localize ("search.alternate"),
138
-                           "sortAlt" => localize ("sort.alternate"),
139
-                           "homeAlt" => localize ("home.alternate"),
140
-                           "cogAlt" => localize ("cog.alternate"),
141
-                           "permalinkAlt" => localize ("permalink.alternate"),
142
-                           "publisherName" => localize("publisher.name"),
143
-                           "pubdateTitle" => localize("pubdate.title"),
144
-                           "languagesTitle" => localize("language.title"),
145
-                           "contentTitle" => localize("content.summary"),
146
-                           "sortorderAsc" => localize("search.sortorder.asc"),
147
-                           "sortorderDesc" => localize("search.sortorder.desc"),
148
-                           "customizeEmail" => localize("customize.email")),
149
-                       "url" => array (
150
-                           "detailUrl" => "index.php?page=13&id={0}&db={1}",
151
-                           "coverUrl" => "fetch.php?id={0}&db={1}",
152
-                           "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
153
-                       "config" => array (
154
-                           "use_fancyapps" => $config ["cops_use_fancyapps"],
155
-                           "max_item_per_page" => $config['cops_max_item_per_page'],
156
-                           "kindleHack"        => "",
157
-                           "server_side_rendering" => useServerSideRendering (),
158
-                           "html_tag_filter" => $config['cops_html_tag_filter']));
128
+                            "coverAlt" => localize("i18n.coversection"),
129
+                            "authorsTitle" => localize("authors.title"),
130
+                            "bookwordTitle" => localize("bookword.title"),
131
+                            "tagsTitle" => localize("tags.title"),
132
+                            "seriesTitle" => localize("series.title"),
133
+                            "customizeTitle" => localize ("customize.title"),
134
+                            "aboutTitle" => localize ("about.title"),
135
+                            "previousAlt" => localize ("paging.previous.alternate"),
136
+                            "nextAlt" => localize ("paging.next.alternate"),
137
+                            "searchAlt" => localize ("search.alternate"),
138
+                            "sortAlt" => localize ("sort.alternate"),
139
+                            "homeAlt" => localize ("home.alternate"),
140
+                            "cogAlt" => localize ("cog.alternate"),
141
+                            "permalinkAlt" => localize ("permalink.alternate"),
142
+                            "publisherName" => localize("publisher.name"),
143
+                            "pubdateTitle" => localize("pubdate.title"),
144
+                            "languagesTitle" => localize("language.title"),
145
+                            "contentTitle" => localize("content.summary"),
146
+                            "sortorderAsc" => localize("search.sortorder.asc"),
147
+                            "sortorderDesc" => localize("search.sortorder.desc"),
148
+                            "customizeEmail" => localize("customize.email")),
149
+                        "url" => array (
150
+                            "detailUrl" => "index.php?page=13&id={0}&db={1}",
151
+                            "coverUrl" => "fetch.php?id={0}&db={1}",
152
+                            "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
153
+                        "config" => array (
154
+                            "use_fancyapps" => $config ["cops_use_fancyapps"],
155
+                            "max_item_per_page" => $config['cops_max_item_per_page'],
156
+                            "kindleHack"        => "",
157
+                            "server_side_rendering" => useServerSideRendering (),
158
+                            "html_tag_filter" => $config['cops_html_tag_filter']));
159 159
         if ($config['cops_thumbnail_handling'] == "1") {
160 160
             $out ["c"]["url"]["thumbnailUrl"] = $out ["c"]["url"]["coverUrl"];
161 161
         } else if (!empty ($config['cops_thumbnail_handling'])) {
162 162
             $out ["c"]["url"]["thumbnailUrl"] = $config['cops_thumbnail_handling'];
163 163
         }
164 164
         if (preg_match("/./", $_SERVER['HTTP_USER_AGENT'])) {
165
-          $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
165
+            $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
166 166
         }
167 167
         return $out;
168 168
     }
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
         }
222 222
         if (!is_null (getURLParam ("complete")) || $complete) {
223 223
             $out = self::addCompleteArray ($out);
224
-       }
224
+        }
225 225
 
226 226
         $out ["containsBook"] = 0;
227 227
         if ($currentPage->containsBook ()) {
Please login to merge, or discard this patch.
lib/PageCustomize.php 1 patch
Indentation   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -45,11 +45,11 @@
 block discarded – undo
45 45
         $this->entryArray = array ();
46 46
 
47 47
         $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR,
48
-                                   PageQueryResult::SCOPE_TAG,
49
-                                   PageQueryResult::SCOPE_SERIES,
50
-                                   PageQueryResult::SCOPE_PUBLISHER,
51
-                                   PageQueryResult::SCOPE_RATING,
52
-                                   "language");
48
+                                    PageQueryResult::SCOPE_TAG,
49
+                                    PageQueryResult::SCOPE_SERIES,
50
+                                    PageQueryResult::SCOPE_PUBLISHER,
51
+                                    PageQueryResult::SCOPE_RATING,
52
+                                    "language");
53 53
 
54 54
         $content = "";
55 55
         array_push ($this->entryArray, new Entry ("Template", "",
Please login to merge, or discard this patch.
base.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -32,9 +32,9 @@  discard block
 block discarded – undo
32 32
     // Generate the function for the template
33 33
     $template = new doT ();
34 34
     $dot = $template->template ($page, array ('bookdetail' => $bookdetail,
35
-                                              'header' => $header,
36
-                                              'footer' => $footer,
37
-                                              'main' => $main));
35
+                                                'header' => $header,
36
+                                                'footer' => $footer,
37
+                                                'main' => $main));
38 38
     // If there is a syntax error in the function created
39 39
     // $dot will be equal to FALSE
40 40
     if (!$dot) {
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
         case LIBXML_ERR_WARNING:
126 126
             $return .= 'Warning ' . $error->code . ': ';
127 127
             break;
128
-         case LIBXML_ERR_ERROR:
128
+            case LIBXML_ERR_ERROR:
129 129
             $return .= 'Error ' . $error->code . ': ';
130 130
             break;
131 131
         case LIBXML_ERR_FATAL:
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
     }
135 135
 
136 136
     $return .= trim($error->message) .
137
-               "\n  Line: " . $error->line .
138
-               "\n  Column: " . $error->column;
137
+                "\n  Line: " . $error->line .
138
+                "\n  Column: " . $error->column;
139 139
 
140 140
     if ($error->file) {
141 141
         $return .= "\n  File: " . $error->file;
Please login to merge, or discard this patch.
index.php 1 patch
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -37,14 +37,14 @@
 block discarded – undo
37 37
     header('Content-Type:text/html;charset=utf-8');
38 38
 
39 39
     $data = array('title'                 => $config['cops_title_default'],
40
-                  'version'               => VERSION,
41
-                  'opds_url'              => $config['cops_full_url'] . 'feed.php',
42
-                  'customHeader'          => '',
43
-                  'template'              => getCurrentTemplate(),
44
-                  'server_side_rendering' => useServerSideRendering(),
45
-                  'current_css'           => getCurrentCss(),
46
-                  'favico'                => $config['cops_icon'],
47
-                  'getjson_url'           => 'getJSON.php?' . addURLParameter(getQueryString(), 'complete', 1));
40
+                    'version'               => VERSION,
41
+                    'opds_url'              => $config['cops_full_url'] . 'feed.php',
42
+                    'customHeader'          => '',
43
+                    'template'              => getCurrentTemplate(),
44
+                    'server_side_rendering' => useServerSideRendering(),
45
+                    'current_css'           => getCurrentCss(),
46
+                    'favico'                => $config['cops_icon'],
47
+                    'getjson_url'           => 'getJSON.php?' . addURLParameter(getQueryString(), 'complete', 1));
48 48
     if (preg_match('/Kindle/', $_SERVER['HTTP_USER_AGENT'])) {
49 49
         $data['customHeader'] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>';
50 50
     }
Please login to merge, or discard this patch.