mbirth / cops

transliteration.php

Doc Comments +1 added lines, -1 removed lines

@@ -163,7 +163,7 @@
 /**
  * Replaces a Unicode character using the transliteration database.
  *
- * @param $ord
+ * @param integer $ord
  *   An ordinal Unicode character code.
  * @param $unknown
  *   Replacement string for characters that do not have a suitable ASCII

Indentation +80 added lines, -80 removed lines

@@ -26,56 +26,56 @@ 
  *   Transliterated text.
  */
 function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
-  // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
-  // avoid the overhead of initializing the decomposition tables by skipping
-  // out early.
-  if (!preg_match('/[\x80-\xff]/', $string)) {
+    // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
+    // avoid the overhead of initializing the decomposition tables by skipping
+    // out early.
+    if (!preg_match('/[\x80-\xff]/', $string)) {
     return $string;
-  }
+    }
 
-  static $tail_bytes;
+    static $tail_bytes;
 
-  if (!isset($tail_bytes)) {
+    if (!isset($tail_bytes)) {
     // Each UTF-8 head byte is followed by a certain number of tail bytes.
     $tail_bytes = array();
     for ($n = 0; $n < 256; $n++) {
-      if ($n < 0xc0) {
+        if ($n < 0xc0) {
         $remaining = 0;
-      }
-      elseif ($n < 0xe0) {
+        }
+        elseif ($n < 0xe0) {
         $remaining = 1;
-      }
-      elseif ($n < 0xf0) {
+        }
+        elseif ($n < 0xf0) {
         $remaining = 2;
-      }
-      elseif ($n < 0xf8) {
+        }
+        elseif ($n < 0xf8) {
         $remaining = 3;
-      }
-      elseif ($n < 0xfc) {
+        }
+        elseif ($n < 0xfc) {
         $remaining = 4;
-      }
-      elseif ($n < 0xfe) {
+        }
+        elseif ($n < 0xfe) {
         $remaining = 5;
-      }
-      else {
+        }
+        else {
         $remaining = 0;
-      }
-      $tail_bytes[chr($n)] = $remaining;
+        }
+        $tail_bytes[chr($n)] = $remaining;
+    }
     }
-  }
 
-  // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
-  // be handled much more quickly. Don't chop up Unicode areas for punctuation,
-  // though, that wastes energy.
-  preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
+    // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
+    // be handled much more quickly. Don't chop up Unicode areas for punctuation,
+    // though, that wastes energy.
+    preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
 
-  $result = '';
-  foreach ($matches[0] as $str) {
+    $result = '';
+    foreach ($matches[0] as $str) {
     if ($str[0] < "\x80") {
-      // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
-      // skip over it.
-      $result .= $str;
-      continue;
+        // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
+        // skip over it.
+        $result .= $str;
+        continue;
     }
 
     // We'll have to examine the chunk byte by byte to ensure that it consists
@@ -91,73 +91,73 @@ 
     $len = $chunk + 1;
 
     for ($i = -1; --$len; ) {
-      $c = $str[++$i];
-      if ($remaining = $tail_bytes[$c]) {
+        $c = $str[++$i];
+        if ($remaining = $tail_bytes[$c]) {
         // UTF-8 head byte!
         $sequence = $head = $c;
         do {
-          // Look for the defined number of tail bytes...
-          if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
+            // Look for the defined number of tail bytes...
+            if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
             // Legal tail bytes are nice.
             $sequence .= $c;
-          }
-          else {
+            }
+            else {
             if ($len == 0) {
-              // Premature end of string! Drop a replacement character into
-              // output to represent the invalid UTF-8 sequence.
-              $result .= $unknown;
-              break 2;
+                // Premature end of string! Drop a replacement character into
+                // output to represent the invalid UTF-8 sequence.
+                $result .= $unknown;
+                break 2;
             }
             else {
-              // Illegal tail byte; abandon the sequence.
-              $result .= $unknown;
-              // Back up and reprocess this byte; it may itself be a legal
-              // ASCII or UTF-8 sequence head.
-              --$i;
-              ++$len;
-              continue 2;
+                // Illegal tail byte; abandon the sequence.
+                $result .= $unknown;
+                // Back up and reprocess this byte; it may itself be a legal
+                // ASCII or UTF-8 sequence head.
+                --$i;
+                ++$len;
+                continue 2;
+            }
             }
-          }
         } while (--$remaining);
 
         $n = ord($head);
         if ($n <= 0xdf) {
-          $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
+            $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
         }
         elseif ($n <= 0xef) {
-          $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
+            $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
         }
         elseif ($n <= 0xf7) {
-          $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
+            $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
         }
         elseif ($n <= 0xfb) {
-          $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
+            $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
         }
         elseif ($n <= 0xfd) {
-          $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);
+            $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);
         }
         $result .= _transliteration_replace($ord, $unknown, $source_langcode);
         $head = '';
-      }
-      elseif ($c < "\x80") {
+        }
+        elseif ($c < "\x80") {
         // ASCII byte.
         $result .= $c;
         $head = '';
-      }
-      elseif ($c < "\xc0") {
+        }
+        elseif ($c < "\xc0") {
         // Illegal tail bytes.
         if ($head == '') {
-          $result .= $unknown;
+            $result .= $unknown;
+        }
         }
-      }
-      else {
+        else {
         // Miscellaneous freaks.
         $result .= $unknown;
         $head = '';
-      }
+        }
     }
-  }
-  return $result;
+    }
+    return $result;
 }
 
 /**
@@ -176,36 +176,36 @@ 
  *   ASCII replacement character.
  */
 function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
-  static $map = array();
+    static $map = array();
 
-  //GL: set language later
-  /*
+    //GL: set language later
+    /*
   if (!isset($langcode)) {
     global $language;
     $langcode = $language->language;
   }
   */
 
-  $bank = $ord >> 8;
+    $bank = $ord >> 8;
 
-  if (!isset($map[$bank][$langcode])) {
+    if (!isset($map[$bank][$langcode])) {
     $file = './resources/transliteration-data/' . sprintf('x%02x', $bank) . '.php';  
     if (file_exists($file)) {
-      include $file;
-      if ($langcode != 'en' && isset($variant[$langcode])) {
+        include $file;
+        if ($langcode != 'en' && isset($variant[$langcode])) {
         // Merge in language specific mappings.
         $map[$bank][$langcode] = $variant[$langcode] + $base;
-      }
-      else {
+        }
+        else {
         $map[$bank][$langcode] = $base;
-      }
+        }
     }
     else {
-      $map[$bank][$langcode] = array();
+        $map[$bank][$langcode] = array();
+    }
     }
-  }
 
-  $ord = $ord & 255;
+    $ord = $ord & 255;
 
-  return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
+    return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
 }

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
     // Counting down is faster. I'm *so* sorry.
     $len = $chunk + 1;
 
-    for ($i = -1; --$len; ) {
+    for ($i = -1; --$len;) {
       $c = $str[++$i];
       if ($remaining = $tail_bytes[$c]) {
         // UTF-8 head byte!
@@ -207,5 +207,5 @@ 
 
   $ord = $ord & 255;
 
-  return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
+  return isset($map[$bank][$langcode][$ord])?$map[$bank][$langcode][$ord]:$unknown;
 }

Braces +21 added lines, -36 removed lines

@@ -25,7 +25,8 @@ 
  * @return
  *   Transliterated text.
  */
-function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
+function _transliteration_process($string, $unknown = '?', $source_langcode = NULL)
+{
   // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
   // avoid the overhead of initializing the decomposition tables by skipping
   // out early.
@@ -41,23 +42,17 @@ 
     for ($n = 0; $n < 256; $n++) {
       if ($n < 0xc0) {
         $remaining = 0;
-      }
-      elseif ($n < 0xe0) {
+      } elseif ($n < 0xe0) {
         $remaining = 1;
-      }
-      elseif ($n < 0xf0) {
+      } elseif ($n < 0xf0) {
         $remaining = 2;
-      }
-      elseif ($n < 0xf8) {
+      } elseif ($n < 0xf8) {
         $remaining = 3;
-      }
-      elseif ($n < 0xfc) {
+      } elseif ($n < 0xfc) {
         $remaining = 4;
-      }
-      elseif ($n < 0xfe) {
+      } elseif ($n < 0xfe) {
         $remaining = 5;
-      }
-      else {
+      } else {
         $remaining = 0;
       }
       $tail_bytes[chr($n)] = $remaining;
@@ -100,15 +95,13 @@ 
           if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
             // Legal tail bytes are nice.
             $sequence .= $c;
-          }
-          else {
+          } else {
             if ($len == 0) {
               // Premature end of string! Drop a replacement character into
               // output to represent the invalid UTF-8 sequence.
               $result .= $unknown;
               break 2;
-            }
-            else {
+            } else {
               // Illegal tail byte; abandon the sequence.
               $result .= $unknown;
               // Back up and reprocess this byte; it may itself be a legal
@@ -123,34 +116,27 @@ 
         $n = ord($head);
         if ($n <= 0xdf) {
           $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
-        }
-        elseif ($n <= 0xef) {
+        } elseif ($n <= 0xef) {
           $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
-        }
-        elseif ($n <= 0xf7) {
+        } elseif ($n <= 0xf7) {
           $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
-        }
-        elseif ($n <= 0xfb) {
+        } elseif ($n <= 0xfb) {
           $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
-        }
-        elseif ($n <= 0xfd) {
+        } elseif ($n <= 0xfd) {
           $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);
         }
         $result .= _transliteration_replace($ord, $unknown, $source_langcode);
         $head = '';
-      }
-      elseif ($c < "\x80") {
+      } elseif ($c < "\x80") {
         // ASCII byte.
         $result .= $c;
         $head = '';
-      }
-      elseif ($c < "\xc0") {
+      } elseif ($c < "\xc0") {
         // Illegal tail bytes.
         if ($head == '') {
           $result .= $unknown;
         }
-      }
-      else {
+      } else {
         // Miscellaneous freaks.
         $result .= $unknown;
         $head = '';
@@ -175,7 +161,8 @@ 
  * @return
  *   ASCII replacement character.
  */
-function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
+function _transliteration_replace($ord, $unknown = '?', $langcode = NULL)
+{
   static $map = array();
 
   //GL: set language later
@@ -195,12 +182,10 @@ 
       if ($langcode != 'en' && isset($variant[$langcode])) {
         // Merge in language specific mappings.
         $map[$bank][$langcode] = $variant[$langcode] + $base;
-      }
-      else {
+      } else {
         $map[$bank][$langcode] = $base;
       }
-    }
-    else {
+    } else {
       $map[$bank][$langcode] = array();
     }
   }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
  * @return
  *   Transliterated text.
  */
-function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
+function _transliteration_process($string, $unknown = '?', $source_langcode = null) {
   // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
   // avoid the overhead of initializing the decomposition tables by skipping
   // out early.
@@ -175,7 +175,7 @@ 
  * @return
  *   ASCII replacement character.
  */
-function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
+function _transliteration_replace($ord, $unknown = '?', $langcode = null) {
   static $map = array();
 
   //GL: set language later

fetch.php

Spacing +30 added lines, -30 removed lines

@@ -13,19 +13,19 @@ 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
         if (!isset($_SESSION['connected'])) {
-            notFound ();
+            notFound();
             return;
         }
     }
 
-    $expires = 60*60*24*14;
+    $expires = 60 * 60 * 24 * 14;
     header("Pragma: public");
-    header("Cache-Control: maxage=".$expires);
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    $bookId = getURLParam ("id", NULL);
-    $type = getURLParam ("type", "jpg");
-    $idData = getURLParam ("data", NULL);
-    if (is_null ($bookId))
+    header("Cache-Control: maxage=" . $expires);
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
+    $bookId = getURLParam("id", NULL);
+    $type = getURLParam("type", "jpg");
+    $idData = getURLParam("data", NULL);
+    if (is_null($bookId))
     {
         $book = Book::getBookByDataId($idData);
     }
@@ -35,18 +35,18 @@ 
     }
 
     if (!$book) {
-        notFound ();
+        notFound();
         return;
     }
 
     if ($book && ($type == "jpg" || empty ($config['calibre_internal_directory']))) {
         if ($type == "jpg") {
-            $file = $book->getFilePath ($type);
+            $file = $book->getFilePath($type);
         } else {
-            $file = $book->getFilePath ($type, $idData);
+            $file = $book->getFilePath($type, $idData);
         }
-        if (!$file || !file_exists ($file)) {
-            notFound ();
+        if (!$file || !file_exists($file)) {
+            notFound();
             return;
         }
     }
@@ -57,17 +57,17 @@ 
             header("Content-Type: image/jpeg");
             //by default, we don't cache
             $thumbnailCacheFullpath = null;
-            if ( isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '' ) {
+            if (isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '') {
                 $thumbnailCacheFullpath = $config['cops_thumbnail_cache_directory'];
                 //if multiple databases, add a subfolder with the database ID
-                $thumbnailCacheFullpath .= !is_null (GetUrlParam (DB)) ? 'db-' . GetUrlParam (DB) . DIRECTORY_SEPARATOR : '';
+                $thumbnailCacheFullpath .= !is_null(GetUrlParam(DB))?'db-' . GetUrlParam(DB) . DIRECTORY_SEPARATOR:'';
                 //when there are lots of thumbnails, it's better to save files in subfolders, so if the book's uuid is
                 //"01234567-89ab-cdef-0123-456789abcdef", we will save the thumbnail in .../0/12/34567-89ab-cdef-0123-456789abcdef-...
                 $thumbnailCacheFullpath .= substr($book->uuid, 0, 1) . DIRECTORY_SEPARATOR . substr($book->uuid, 1, 2) . DIRECTORY_SEPARATOR;
                 //check if cache folder exists or create it
-                if ( file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true) ) {
+                if (file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true)) {
                     //we name the thumbnail from the book's uuid and it's dimensions (width and/or height)
-                    $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam ("width") . 'x' . getURLParam ("height") . '.jpg';
+                    $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam("width") . 'x' . getURLParam("height") . '.jpg';
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
                 }
                 else {
@@ -76,45 +76,45 @@ 
                 }
             }
 
-            if ( $thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath) ) {
+            if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
                 //return the already cached thumbnail
-                readfile( $thumbnailCacheFullpath );
+                readfile($thumbnailCacheFullpath);
                 return;
             }
 
-            if ($book->getThumbnail (getURLParam ("width"), getURLParam ("height"), $thumbnailCacheFullpath)) {
+            if ($book->getThumbnail(getURLParam("width"), getURLParam("height"), $thumbnailCacheFullpath)) {
                 //if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
-                if ( $thumbnailCacheFullpath === null ) {
+                if ($thumbnailCacheFullpath === null) {
                     // The cover had to be resized
                     return;
                 }
                 else {
                     //return the just cached thumbnail
-                    readfile( $thumbnailCacheFullpath );
+                    readfile($thumbnailCacheFullpath);
                     return;
                 }
             }
             break;
         default:
-            $data = $book->getDataById ($idData);
-            header("Content-Type: " . $data->getMimeType ());
+            $data = $book->getDataById($idData);
+            header("Content-Type: " . $data->getMimeType());
             break;
     }
-    $file = $book->getFilePath ($type, $idData, true);
+    $file = $book->getFilePath($type, $idData, true);
     if ($type == "epub" && $config['cops_update_epub-metadata'])
     {
-        $book->getUpdatedEpub ($idData);
+        $book->getUpdatedEpub($idData);
         return;
     }
     if ($type == "jpg") {
-        header('Content-Disposition: filename="' . basename ($file) . '"');
+        header('Content-Disposition: filename="' . basename($file) . '"');
     } else {
-        header('Content-Disposition: attachment; filename="' . basename ($file) . '"');
+        header('Content-Disposition: attachment; filename="' . basename($file) . '"');
     }
 
     $dir = $config['calibre_internal_directory'];
     if (empty ($config['calibre_internal_directory'])) {
-        $dir = Base::getDbDirectory ();
+        $dir = Base::getDbDirectory();
     }
 
     if (empty ($config['cops_x_accel_redirect'])) {
@@ -124,5 +124,5 @@ 
         fpassthru($fp);
     }
     else {
-        header ($config['cops_x_accel_redirect'] . ": " . $dir . $file);
+        header($config['cops_x_accel_redirect'] . ": " . $dir . $file);
     }

Braces +7 added lines, -15 removed lines

@@ -25,12 +25,9 @@ 
     $bookId = getURLParam ("id", NULL);
     $type = getURLParam ("type", "jpg");
     $idData = getURLParam ("data", NULL);
-    if (is_null ($bookId))
-    {
+    if (is_null ($bookId)) {
         $book = Book::getBookByDataId($idData);
-    }
-    else
-    {
+    } else {
         $book = Book::getBookById($bookId);
     }
 
@@ -51,8 +48,7 @@ 
         }
     }
 
-    switch ($type)
-    {
+    switch ($type) {
         case "jpg":
             header("Content-Type: image/jpeg");
             //by default, we don't cache
@@ -69,8 +65,7 @@ 
                     //we name the thumbnail from the book's uuid and it's dimensions (width and/or height)
                     $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam ("width") . 'x' . getURLParam ("height") . '.jpg';
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
-                }
-                else {
+                } else {
                     //error creating the folder, so we don't cache
                     $thumbnailCacheFullpath = null;
                 }
@@ -87,8 +82,7 @@ 
                 if ( $thumbnailCacheFullpath === null ) {
                     // The cover had to be resized
                     return;
-                }
-                else {
+                } else {
                     //return the just cached thumbnail
                     readfile( $thumbnailCacheFullpath );
                     return;
@@ -101,8 +95,7 @@ 
             break;
     }
     $file = $book->getFilePath ($type, $idData, true);
-    if ($type == "epub" && $config['cops_update_epub-metadata'])
-    {
+    if ($type == "epub" && $config['cops_update_epub-metadata']) {
         $book->getUpdatedEpub ($idData);
         return;
     }
@@ -122,7 +115,6 @@ 
         $fp = fopen($filename, 'rb');
         header("Content-Length: " . filesize($filename));
         fpassthru($fp);
-    }
-    else {
+    } else {
         header ($config['cops_x_accel_redirect'] . ": " . $dir . $file);
     }

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -22,9 +22,9 @@
     header("Pragma: public");
     header("Cache-Control: maxage=".$expires);
     header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    $bookId = getURLParam ("id", NULL);
+    $bookId = getURLParam ("id", null);
     $type = getURLParam ("type", "jpg");
-    $idData = getURLParam ("data", NULL);
+    $idData = getURLParam ("data", null);
     if (is_null ($bookId))
     {
         $book = Book::getBookByDataId($idData);

sendtomail.php

Indentation +3 added lines, -3 removed lines

@@ -78,9 +78,9 @@
 $mail->AltBody = "Sent by COPS";
 
 if (!$mail->Send()) {
-   echo localize ("mail.messagenotsent");
-   echo 'Mailer Error: ' . $mail->ErrorInfo;
-   exit;
+    echo localize ("mail.messagenotsent");
+    echo 'Mailer Error: ' . $mail->ErrorInfo;
+    exit;
 }
 
 echo localize ("mail.messagesent");

Spacing +14 added lines, -14 removed lines

@@ -2,11 +2,11 @@ 
 
 require_once ("config.php");
 
-function checkConfiguration () {
+function checkConfiguration() {
     global $config;
 
-    if (is_null ($config['cops_mail_configuration']) ||
-        !is_array ($config['cops_mail_configuration']) ||
+    if (is_null($config['cops_mail_configuration']) ||
+        !is_array($config['cops_mail_configuration']) ||
         empty ($config['cops_mail_configuration']["smtp.host"]) ||
         empty ($config['cops_mail_configuration']["address.from"])) {
         return "NOK. bad configuration.";
@@ -14,7 +14,7 @@ 
     return False;
 }
 
-function checkRequest ($idData, $emailDest) {
+function checkRequest($idData, $emailDest) {
     if (empty ($idData)) {
         return 'No data sent.';
     }
@@ -28,22 +28,22 @@ 
 
 global $config;
 
-if ($error = checkConfiguration ()) {
+if ($error = checkConfiguration()) {
     echo $error;
     exit;
 }
 
 $idData = $_REQUEST["data"];
 $emailDest = $_REQUEST["email"];
-if ($error = checkRequest ($idData, $emailDest)) {
+if ($error = checkRequest($idData, $emailDest)) {
     echo $error;
     exit;
 }
 
 $book = Book::getBookByDataId($idData);
-$data = $book->getDataById ($idData);
+$data = $book->getDataById($idData);
 
-if (filesize ($data->getLocalPath ()) > 10 * 1024 * 1024) {
+if (filesize($data->getLocalPath()) > 10 * 1024 * 1024) {
     echo 'Attachment too big';
     exit;
 }
@@ -65,23 +65,23 @@ 
 $mail->From = $config['cops_mail_configuration']["address.from"];
 $mail->FromName = $config['cops_title_default'];
 
-foreach (explode (";", $emailDest) as $emailAddress) {
+foreach (explode(";", $emailDest) as $emailAddress) {
     if (empty ($emailAddress)) { continue; }
     $mail->AddAddress($emailAddress);
 }
 
-$mail->AddAttachment($data->getLocalPath ());
+$mail->AddAttachment($data->getLocalPath());
 
 $mail->IsHTML(true);
-$mail->Subject = 'Sent by COPS : ' . $data->getUpdatedFilename ();
-$mail->Body    = "<h1>" . $book->title . "</h1><h2>" . $book->getAuthorsName () . "</h2>" . $book->getComment ();
+$mail->Subject = 'Sent by COPS : ' . $data->getUpdatedFilename();
+$mail->Body    = "<h1>" . $book->title . "</h1><h2>" . $book->getAuthorsName() . "</h2>" . $book->getComment();
 $mail->AltBody = "Sent by COPS";
 
 if (!$mail->Send()) {
-   echo localize ("mail.messagenotsent");
+   echo localize("mail.messagenotsent");
    echo 'Mailer Error: ' . $mail->ErrorInfo;
    exit;
 }
 
-echo localize ("mail.messagesent");
+echo localize("mail.messagesent");
 

Braces +13 added lines, -5 removed lines

@@ -2,7 +2,8 @@ 
 
 require_once ("config.php");
 
-function checkConfiguration () {
+function checkConfiguration ()
+{
     global $config;
 
     if (is_null ($config['cops_mail_configuration']) ||
@@ -14,7 +15,8 @@ 
     return False;
 }
 
-function checkRequest ($idData, $emailDest) {
+function checkRequest ($idData, $emailDest)
+{
     if (empty ($idData)) {
         return 'No data sent.';
     }
@@ -58,9 +60,15 @@ 
     $mail->Port = 465;
 }
 $mail->SMTPAuth = !empty ($config['cops_mail_configuration']["smtp.username"]);
-if (!empty ($config['cops_mail_configuration']["smtp.username"])) $mail->Username = $config['cops_mail_configuration']["smtp.username"];
-if (!empty ($config['cops_mail_configuration']["smtp.password"])) $mail->Password = $config['cops_mail_configuration']["smtp.password"];
-if (!empty ($config['cops_mail_configuration']["smtp.secure"])) $mail->SMTPSecure = $config['cops_mail_configuration']["smtp.secure"];
+if (!empty ($config['cops_mail_configuration']["smtp.username"])) {
+    $mail->Username = $config['cops_mail_configuration']["smtp.username"];
+}
+if (!empty ($config['cops_mail_configuration']["smtp.password"])) {
+    $mail->Password = $config['cops_mail_configuration']["smtp.password"];
+}
+if (!empty ($config['cops_mail_configuration']["smtp.secure"])) {
+    $mail->SMTPSecure = $config['cops_mail_configuration']["smtp.secure"];
+}
 
 $mail->From = $config['cops_mail_configuration']["address.from"];
 $mail->FromName = $config['cops_title_default'];

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
         empty ($config['cops_mail_configuration']["address.from"])) {
         return "NOK. bad configuration.";
     }
-    return False;
+    return false;
 }
 
 function checkRequest ($idData, $emailDest) {
@@ -21,7 +21,7 @@ 
     if (empty ($emailDest)) {
         return 'No email sent.';
     }
-    return False;
+    return false;
 }
 
 if (php_sapi_name() === 'cli') { return; }

epubfs.php

Spacing +24 added lines, -24 removed lines

@@ -9,70 +9,70 @@
 require_once ("config.php");
 require_once ("base.php");
 
-function getComponentContent ($book, $component, $add) {
-    $data = $book->component ($component);
+function getComponentContent($book, $component, $add) {
+    $data = $book->component($component);
 
-    $callback = function ($m) use ($book, $component, $add) {
+    $callback = function($m) use ($book, $component, $add) {
         $method = $m[1];
         $path = $m[2];
         $end = "";
-        if (preg_match ("/^src\s*:/", $method)) {
+        if (preg_match("/^src\s*:/", $method)) {
             $end = ")";
         }
-        if (preg_match ("/^#/", $path)) {
+        if (preg_match("/^#/", $path)) {
             return "{$method}'{$path}'{$end}";
         }
         $hash = "";
-        if (preg_match ("/^(.+)#(.+)$/", $path, $matches)) {
+        if (preg_match("/^(.+)#(.+)$/", $path, $matches)) {
             $path = $matches [1];
             $hash = "#" . $matches [2];
         }
-        $comp = $book->getComponentName ($component, $path);
+        $comp = $book->getComponentName($component, $path);
         if (!$comp) return "{$method}'#'{$end}";
         $out = "{$method}'epubfs.php?{$add}comp={$comp}{$hash}'{$end}";
         if ($end) {
             return $out;
         }
-        return str_replace ("&", "&", $out);
+        return str_replace("&", "&", $out);
     };
 
-    $data = preg_replace_callback ("/(src=)[\"']([^:]*?)[\"']/", $callback, $data);
-    $data = preg_replace_callback ("/(href=)[\"']([^:]*?)[\"']/", $callback, $data);
-    $data = preg_replace_callback ("/(\@import\s+)[\"'](.*?)[\"'];/", $callback, $data);
-    $data = preg_replace_callback ("/(src\s*:\s*url\()(.*?)\)/", $callback, $data);
+    $data = preg_replace_callback("/(src=)[\"']([^:]*?)[\"']/", $callback, $data);
+    $data = preg_replace_callback("/(href=)[\"']([^:]*?)[\"']/", $callback, $data);
+    $data = preg_replace_callback("/(\@import\s+)[\"'](.*?)[\"'];/", $callback, $data);
+    $data = preg_replace_callback("/(src\s*:\s*url\()(.*?)\)/", $callback, $data);
 
     return $data;
 }
 
 if (php_sapi_name() === 'cli') { return; }
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null(GetUrlParam(DB))) $add .= DB . "=" . GetUrlParam(DB) . "&";
 $myBook = Book::getBookByDataId($idData);
 
-$book = new EPub ($myBook->getFilePath ("EPUB", $idData));
+$book = new EPub($myBook->getFilePath("EPUB", $idData));
 
-$book->initSpineComponent ();
+$book->initSpineComponent();
 
 if (!isset ($_GET["comp"])) {
-    notFound ();
+    notFound();
     return;
 }
 
 $component = $_GET["comp"];
 
 try {
-    $data = getComponentContent ($book, $component, $add);
+    $data = getComponentContent($book, $component, $add);
 
-    $expires = 60*60*24*14;
+    $expires = 60 * 60 * 24 * 14;
     header("Pragma: public");
-    header("Cache-Control: maxage=".$expires);
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    header ("Content-Type: " . $book->componentContentType($component));
+    header("Cache-Control: maxage=" . $expires);
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
+    header("Content-Type: " . $book->componentContentType($component));
     echo $data;
 }
 catch (Exception $e) {
-    error_log ($e);
-    notFound ();
+    error_log($e);
+    notFound();
 }
\ No newline at end of file

Braces +9 added lines, -5 removed lines

@@ -9,7 +9,8 @@ 
 require_once ("config.php");
 require_once ("base.php");
 
-function getComponentContent ($book, $component, $add) {
+function getComponentContent ($book, $component, $add)
+{
     $data = $book->component ($component);
 
     $callback = function ($m) use ($book, $component, $add) {
@@ -28,7 +29,9 @@ 
             $hash = "#" . $matches [2];
         }
         $comp = $book->getComponentName ($component, $path);
-        if (!$comp) return "{$method}'#'{$end}";
+        if (!$comp) {
+            return "{$method}'#'{$end}";
+        }
         $out = "{$method}'epubfs.php?{$add}comp={$comp}{$hash}'{$end}";
         if ($end) {
             return $out;
@@ -48,7 +51,9 @@ 
 
 $idData = getURLParam ("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null (GetUrlParam (DB))) {
+    $add .= DB . "=" . GetUrlParam (DB) . "&";
+}
 $myBook = Book::getBookByDataId($idData);
 
 $book = new EPub ($myBook->getFilePath ("EPUB", $idData));
@@ -71,8 +76,7 @@ 
     header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
     header ("Content-Type: " . $book->componentContentType($component));
     echo $data;
-}
-catch (Exception $e) {
+} catch (Exception $e) {
     error_log ($e);
     notFound ();
 }
\ No newline at end of file

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 header ("Content-Type: text/html;charset=utf-8");
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam ("data", null);
 $add = "data=$idData&";
 if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
 $myBook = Book::getBookByDataId($idData);

epubreader.php

Spacing +7 added lines, -7 removed lines

@@ -11,15 +11,15 @@ 
 require_once ("config.php");
 require_once ("base.php");
 
-header ("Content-Type: text/html;charset=utf-8");
+header("Content-Type: text/html;charset=utf-8");
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null(GetUrlParam(DB))) $add .= DB . "=" . GetUrlParam(DB) . "&";
 $myBook = Book::getBookByDataId($idData);
 
-$book = new EPub ($myBook->getFilePath ("EPUB", $idData));
-$book->initSpineComponent ();
+$book = new EPub($myBook->getFilePath("EPUB", $idData));
+$book->initSpineComponent();
 
 ?>
 <head>
@@ -35,10 +35,10 @@ 
         Monocle.DEBUG = true;
         var bookData = {
           getComponents: function () {
-            <?php echo "return [" . implode (", ", array_map (function ($comp) { return "'" . $comp . "'"; }, $book->components ())) . "];"; ?>
+            <?php echo "return [" . implode(", ", array_map(function($comp) { return "'" . $comp . "'"; }, $book->components())) . "];"; ?>
           },
           getContents: function () {
-            <?php echo "return [" . implode (", ", array_map (function ($content) { return "{title: '" . addslashes($content["title"]) . "', src: '". $content["src"] . "'}"; }, $book->contents ())) . "];"; ?>
+            <?php echo "return [" . implode(", ", array_map(function($content) { return "{title: '" . addslashes($content["title"]) . "', src: '" . $content["src"] . "'}"; }, $book->contents())) . "];"; ?>
           },
           getComponent: function (componentId) {
             return { url: "epubfs.php?<?php echo $add ?>comp="  + componentId };

Braces +3 added lines, -1 removed lines

@@ -15,7 +15,9 @@
 
 $idData = getURLParam ("data", NULL);
 $add = "data=$idData&";
-if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
+if (!is_null (GetUrlParam (DB))) {
+    $add .= DB . "=" . GetUrlParam (DB) . "&";
+}
 $myBook = Book::getBookByDataId($idData);
 
 $book = new EPub ($myBook->getFilePath ("EPUB", $idData));

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 
 header ("Content-Type: text/html;charset=utf-8");
 
-$idData = getURLParam ("data", NULL);
+$idData = getURLParam ("data", null);
 $add = "data=$idData&";
 if (!is_null (GetUrlParam (DB))) $add .= DB . "=" . GetUrlParam (DB) . "&";
 $myBook = Book::getBookByDataId($idData);

feed.php

Spacing +10 added lines, -10 removed lines

@@ -10,13 +10,13 @@ 
     require_once ("config.php");
     require_once ("base.php");
 
-    header ("Content-Type:application/xml");
-    $page = getURLParam ("page", Base::PAGE_INDEX);
-    $query = getURLParam ("query");
-    $n = getURLParam ("n", "1");
+    header("Content-Type:application/xml");
+    $page = getURLParam("page", Base::PAGE_INDEX);
+    $query = getURLParam("query");
+    $n = getURLParam("n", "1");
     if ($query)
         $page = Base::PAGE_OPENSEARCH_QUERY;
-    $qid = getURLParam ("id");
+    $qid = getURLParam("id");
 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
@@ -25,15 +25,15 @@ 
         }
     }
 
-    $OPDSRender = new OPDSRenderer ();
+    $OPDSRender = new OPDSRenderer();
 
     switch ($page) {
         case Base::PAGE_OPENSEARCH :
-            echo $OPDSRender->getOpenSearch ();
+            echo $OPDSRender->getOpenSearch();
             return;
         default:
-            $currentPage = Page::getPage ($page, $qid, $query, $n);
-            $currentPage->InitializeContent ();
-            echo $OPDSRender->render ($currentPage);
+            $currentPage = Page::getPage($page, $qid, $query, $n);
+            $currentPage->InitializeContent();
+            echo $OPDSRender->render($currentPage);
             return;
     }

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
     $page = getURLParam ("page", Base::PAGE_INDEX);
     $query = getURLParam ("query");
     $n = getURLParam ("n", "1");
-    if ($query)
-        $page = Base::PAGE_OPENSEARCH_QUERY;
+    if ($query) {
+            $page = Base::PAGE_OPENSEARCH_QUERY;
+    }
     $qid = getURLParam ("id");
 
     if ($config ['cops_fetch_protect'] == "1") {

index.php

Indentation +8 added lines, -8 removed lines

@@ -37,14 +37,14 @@
     header ("Content-Type:text/html;charset=utf-8");
 
     $data = array("title"                 => $config['cops_title_default'],
-                  "version"               => VERSION,
-                  "opds_url"              => $config['cops_full_url'] . "feed.php",
-                  "customHeader"          => "",
-                  "template"              => getCurrentTemplate (),
-                  "server_side_rendering" => useServerSideRendering (),
-                  "current_css"           => getCurrentCss (),
-                  "favico"                => $config['cops_icon'],
-                  "getjson_url"           => "getJSON.php?" . addURLParameter (getQueryString (), "complete", 1));
+                    "version"               => VERSION,
+                    "opds_url"              => $config['cops_full_url'] . "feed.php",
+                    "customHeader"          => "",
+                    "template"              => getCurrentTemplate (),
+                    "server_side_rendering" => useServerSideRendering (),
+                    "current_css"           => getCurrentCss (),
+                    "favico"                => $config['cops_icon'],
+                    "getjson_url"           => "getJSON.php?" . addURLParameter (getQueryString (), "complete", 1));
     if (preg_match("/Kindle/", $_SERVER['HTTP_USER_AGENT'])) {
         $data ["customHeader"] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>';
     }

Spacing +18 added lines, -18 removed lines

@@ -16,16 +16,16 @@ 
         exit ();
     }
 
-    $page = getURLParam ("page", Base::PAGE_INDEX);
-    $query = getURLParam ("query");
-    $qid = getURLParam ("id");
-    $n = getURLParam ("n", "1");
-    $database = GetUrlParam (DB);
+    $page = getURLParam("page", Base::PAGE_INDEX);
+    $query = getURLParam("query");
+    $qid = getURLParam("id");
+    $n = getURLParam("n", "1");
+    $database = GetUrlParam(DB);
 
 
     // Access the database ASAP to be sure it's readable, redirect if that's not the case.
     // It has to be done before any header is sent.
-    Base::checkDatabaseAvailability ();
+    Base::checkDatabaseAvailability();
 
     if ($config ['cops_fetch_protect'] == "1") {
         session_start();
@@ -34,32 +34,32 @@ 
         }
     }
 
-    header ("Content-Type:text/html;charset=utf-8");
+    header("Content-Type:text/html;charset=utf-8");
 
     $data = array("title"                 => $config['cops_title_default'],
                   "version"               => VERSION,
                   "opds_url"              => $config['cops_full_url'] . "feed.php",
                   "customHeader"          => "",
-                  "template"              => getCurrentTemplate (),
-                  "server_side_rendering" => useServerSideRendering (),
-                  "current_css"           => getCurrentCss (),
+                  "template"              => getCurrentTemplate(),
+                  "server_side_rendering" => useServerSideRendering(),
+                  "current_css"           => getCurrentCss(),
                   "favico"                => $config['cops_icon'],
-                  "getjson_url"           => "getJSON.php?" . addURLParameter (getQueryString (), "complete", 1));
+                  "getjson_url"           => "getJSON.php?" . addURLParameter(getQueryString(), "complete", 1));
     if (preg_match("/Kindle/", $_SERVER['HTTP_USER_AGENT'])) {
         $data ["customHeader"] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>';
     }
-    $headcontent = file_get_contents('templates/' . getCurrentTemplate () . '/file.html');
-    $template = new doT ();
-    $dot = $template->template ($headcontent, NULL);
-    echo ($dot ($data));
+    $headcontent = file_get_contents('templates/' . getCurrentTemplate() . '/file.html');
+    $template = new doT();
+    $dot = $template->template($headcontent, NULL);
+    echo ($dot($data));
 ?><body>
 <?php
-if (useServerSideRendering ()) {
+if (useServerSideRendering()) {
     // Get the data
     require_once ("JSON_renderer.php");
-    $data = JSONRenderer::getJson (true);
+    $data = JSONRenderer::getJson(true);
 
-    echo serverSideRender ($data);
+    echo serverSideRender($data);
 }
 ?>
 </body>

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     }
     $headcontent = file_get_contents('templates/' . getCurrentTemplate () . '/file.html');
     $template = new doT ();
-    $dot = $template->template ($headcontent, NULL);
+    $dot = $template->template ($headcontent, null);
     echo ($dot ($data));
 ?><body>
 <?php

getJSON.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 
     require_once ("config.php");
 
-    header ("Content-Type:application/json;charset=utf-8");
+    header("Content-Type:application/json;charset=utf-8");
 
 
-    echo json_encode (JSONRenderer::getJson ());
+    echo json_encode(JSONRenderer::getJson());
 

config.php

Spacing +4 added lines, -4 removed lines

@@ -12,20 +12,20 @@
     require_once 'config_local.php';
 }
 
-$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER) ? $_SERVER['PHP_AUTH_USER'] : '';
+$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER)?$_SERVER['PHP_AUTH_USER']:'';
 // Clean username, only allow a-z, A-Z, 0-9, -_ chars
-$remote_user = preg_replace( "/[^a-zA-Z0-9_-]/", "", $remote_user);
+$remote_user = preg_replace("/[^a-zA-Z0-9_-]/", "", $remote_user);
 $user_config_file = 'config_local.' . $remote_user . '.php';
 if (file_exists(dirname(__FILE__) . '/' . $user_config_file) && (php_sapi_name() !== 'cli')) {
     require_once $user_config_file;
 }
 
-if(!is_null($config['cops_basic_authentication']) &&
+if (!is_null($config['cops_basic_authentication']) &&
     is_array($config['cops_basic_authentication']))
 {
     if (!isset($_SERVER['PHP_AUTH_USER']) ||
         (isset($_SERVER['PHP_AUTH_USER']) &&
-        ($_SERVER['PHP_AUTH_USER']!=$config['cops_basic_authentication']['username'] ||
+        ($_SERVER['PHP_AUTH_USER'] != $config['cops_basic_authentication']['username'] ||
         $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password'])))
     {
         header('WWW-Authenticate: Basic realm="COPS Authentication"');

Braces +2 added lines, -4 removed lines

@@ -21,13 +21,11 @@
 }
 
 if(!is_null($config['cops_basic_authentication']) &&
-    is_array($config['cops_basic_authentication']))
-{
+    is_array($config['cops_basic_authentication'])) {
     if (!isset($_SERVER['PHP_AUTH_USER']) ||
         (isset($_SERVER['PHP_AUTH_USER']) &&
         ($_SERVER['PHP_AUTH_USER']!=$config['cops_basic_authentication']['username'] ||
-        $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password'])))
-    {
+        $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password']))) {
         header('WWW-Authenticate: Basic realm="COPS Authentication"');
         header('HTTP/1.0 401 Unauthorized');
         echo 'This site is password protected';