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

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;
 }

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

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,72 +91,72 @@ 
     $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);
         } else {
-          $ord = $n;
+            $ord = $n;
         }
         $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;
 }
 
 /**
@@ -175,38 +175,38 @@ 
  *   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)) {
-      $base = array();
-      $variant = array();
-      include $file;
-      if ($langcode != 'en' && isset($variant[$langcode])) {
+        $base = array();
+        $variant = array();
+        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;
 }

Braces +18 added lines, -30 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,17 +116,13 @@ 
         $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);
         } else {
           $ord = $n;
@@ -174,7 +163,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
@@ -196,12 +186,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();
     }
   }

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; }

config.php

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';

Spacing +4 added lines, -4 removed lines

@@ -12,20 +12,20 @@
     require_once dirname(__FILE__) . '/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 dirname(__FILE__) . '/' . $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"');

config_default.php

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

@@ -210,7 +210,7 @@ 
      *                                           "address.from"  => "cops@slucas.fr"
      *                                           );
      */
-    $config['cops_mail_configuration'] = NULL;
+    $config['cops_mail_configuration'] = null;
 
     /*
      * Use filter in HTML catalog
@@ -282,7 +282,7 @@ 
      * array( "username" => "xxx", "password" => "secret") : Enable PHP password protection
      * NULL : Disable PHP password protection (You can still use htpasswd)
      */
-    $config['cops_basic_authentication'] = NULL;
+    $config['cops_basic_authentication'] = null;
 
     /*
      * Which template is used by default :

Spacing +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
      *
      * Note that the composite custom columns are not supported
      */
-    $config['cops_calibre_custom_column_list'] = array ();
+    $config['cops_calibre_custom_column_list'] = array();
 
     /*
      * Custom Columns for the book preview panel
@@ -199,7 +199,7 @@ 
      *
      * Note that the composite custom columns are not supported
      */
-    $config['cops_calibre_custom_column_preview'] = array ();
+    $config['cops_calibre_custom_column_preview'] = array();
 
     /*
      * Rename .epub to .kepub.epub if downloaded from a Kobo eReader

checkconfig.php

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

@@ -16,7 +16,7 @@
 
     $err = getURLParam ("err", -1);
     $full = getURLParam ("full");
-    $error = NULL;
+    $error = null;
     switch ($err) {
         case 1 :
             $error = "Database error";

Spacing +7 added lines, -7 removed lines

@@ -12,7 +12,7 @@ 
     require_once 'config.php';
     require_once 'base.php';
 
-    header ('Content-Type:text/html; charset=UTF-8');
+    header('Content-Type:text/html; charset=UTF-8');
 
     $err = getURLParam('err', -1);
     $full = getURLParam('full');
@@ -28,7 +28,7 @@ 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>COPS Configuration Check</title>
-    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" />
+    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss()) ?>" media="screen" />
 </head>
 <body>
 <div class="container">
@@ -153,7 +153,7 @@ 
             <h2>Check if the rendering will be done on client side or server side</h2>
             <h4>
             <?php
-            if (useServerSideRendering ()) {
+            if (useServerSideRendering()) {
                 echo 'Server side rendering';
             } else {
                 echo 'Client side rendering';
@@ -169,7 +169,7 @@ 
             <h2>Check if Calibre database path is not an URL</h2>
             <h4>
             <?php
-            if (!preg_match ('#^http#', $database)) {
+            if (!preg_match('#^http#', $database)) {
                 echo 'OK';
             } else {
                 echo 'Calibre path has to be local (no URL allowed)';
@@ -202,7 +202,7 @@ 
             <h4>
             <?php
             try {
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
                 echo $name . ' OK';
             } catch (Exception $e) {
                 echo $name . ' If the file is readable, check your php configuration. Exception detail : ' . $e;
@@ -215,7 +215,7 @@ 
             <h4>
             <?php
             try {
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
                 $count = $db->query('select count(*) FROM sqlite_master WHERE type="table" AND name in ("books", "authors", "tags", "series")')->fetchColumn();
                 if ($count == 4) {
                     echo $name . ' OK';
@@ -239,7 +239,7 @@ 
                 $result->execute();
                 while ($post = $result->fetchObject())
                 {
-                    if (!is_file (Base::getDbDirectory($i) . $post->fullpath)) {
+                    if (!is_file(Base::getDbDirectory($i) . $post->fullpath)) {
                         echo '<p>' . Base::getDbDirectory($i) . $post->fullpath . '</p>';
                     }
                 }

Braces +1 added lines, -2 removed lines

@@ -237,8 +237,7 @@
                 $db = new PDO('sqlite:' . Base::getDbFileName($i));
                 $result = $db->prepare('select books.path || "/" || data.name || "." || lower (format) as fullpath from data join books on data.book = books.id');
                 $result->execute();
-                while ($post = $result->fetchObject())
-                {
+                while ($post = $result->fetchObject()) {
                     if (!is_file (Base::getDbDirectory($i) . $post->fullpath)) {
                         echo '<p>' . Base::getDbDirectory($i) . $post->fullpath . '</p>';
                     }

base.php

Doc Comments +11 added lines

@@ -60,6 +60,9 @@ 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
+/**
+ * @param string $name
+ */
 function getURLParam ($name, $default = NULL) {
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
         return $_GET[$name];
@@ -95,6 +98,11 @@ 
     return $url . "?v=" . VERSION;
 }
 
+/**
+ * @param string $xml
+ *
+ * @return string
+ */
 function xml2xhtml($xml) {
     return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', create_function('$m', '
         $xhtml_tags = array("br", "hr", "input", "frame", "img", "area", "link", "col", "base", "basefont", "param");
@@ -308,6 +316,9 @@ 
     return $phrase;
 }
 
+/**
+ * @param string $paramName
+ */
 function addURLParameter($urlParams, $paramName, $paramValue) {
     if (empty ($urlParams)) {
         $urlParams = "";

Indentation +6 added lines, -6 removed lines

@@ -32,9 +32,9 @@ 
     // Generate the function for the template
     $template = new doT ();
     $dot = $template->template ($page, array ('bookdetail' => $bookdetail,
-                                              'header' => $header,
-                                              'footer' => $footer,
-                                              'main' => $main));
+                                                'header' => $header,
+                                                'footer' => $footer,
+                                                'main' => $main));
     // If there is a syntax error in the function created
     // $dot will be equal to FALSE
     if (!$dot) {
@@ -125,7 +125,7 @@ 
         case LIBXML_ERR_WARNING:
             $return .= 'Warning ' . $error->code . ': ';
             break;
-         case LIBXML_ERR_ERROR:
+            case LIBXML_ERR_ERROR:
             $return .= 'Error ' . $error->code . ': ';
             break;
         case LIBXML_ERR_FATAL:
@@ -134,8 +134,8 @@ 
     }
 
     $return .= trim($error->message) .
-               "\n  Line: " . $error->line .
-               "\n  Column: " . $error->column;
+                "\n  Line: " . $error->line .
+                "\n  Column: " . $error->column;
 
     if ($error->file) {
         $return .= "\n  File: " . $error->file;

Spacing +23 added lines, -23 removed lines

@@ -8,8 +8,8 @@ 
 
 require_once 'config.php';
 
-define ('VERSION', '1.0.0RC4');
-define ('DB', 'db');
+define('VERSION', '1.0.0RC4');
+define('DB', 'db');
 date_default_timezone_set($config['default_timezone']);
 
 
@@ -22,7 +22,7 @@ 
 function serverSideRender($data)
 {
     // Get the templates
-    $theme = getCurrentTemplate ();
+    $theme = getCurrentTemplate();
     $header = file_get_contents('templates/' . $theme . '/header.html');
     $footer = file_get_contents('templates/' . $theme . '/footer.html');
     $main = file_get_contents('templates/' . $theme . '/main.html');
@@ -30,8 +30,8 @@ 
     $page = file_get_contents('templates/' . $theme . '/page.html');
 
     // Generate the function for the template
-    $template = new doT ();
-    $dot = $template->template ($page, array ('bookdetail' => $bookdetail,
+    $template = new doT();
+    $dot = $template->template($page, array('bookdetail' => $bookdetail,
                                               'header' => $header,
                                               'footer' => $footer,
                                               'main' => $main));
@@ -42,7 +42,7 @@ 
     }
     // Execute the template
     if (!empty ($data)) {
-        return $dot ($data);
+        return $dot($data);
     }
 
     return NULL;
@@ -58,7 +58,7 @@ 
 
 function notFound()
 {
-    header($_SERVER['SERVER_PROTOCOL'].' 404 Not Found');
+    header($_SERVER['SERVER_PROTOCOL'] . ' 404 Not Found');
     header('Status: 404 Not Found');
 
     $_SERVER['REDIRECT_STATUS'] = 404;
@@ -76,8 +76,8 @@ 
 {
     global $config;
     if (isset($_COOKIE[$option])) {
-        if (isset($config ['cops_' . $option]) && is_array ($config ['cops_' . $option])) {
-            return explode (',', $_COOKIE[$option]);
+        if (isset($config ['cops_' . $option]) && is_array($config ['cops_' . $option])) {
+            return explode(',', $_COOKIE[$option]);
         } else {
             return $_COOKIE[$option];
         }
@@ -91,12 +91,12 @@ 
 
 function getCurrentCss()
 {
-    return 'templates/' . getCurrentTemplate () . '/styles/style-' . getCurrentOption('style') . '.css';
+    return 'templates/' . getCurrentTemplate() . '/styles/style-' . getCurrentOption('style') . '.css';
 }
 
 function getCurrentTemplate()
 {
-    return getCurrentOption ('template');
+    return getCurrentOption('template');
 }
 
 function getUrlWithVersion($url)
@@ -160,10 +160,10 @@ 
     libxml_use_internal_errors(true);
 
     $doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
-                        $html  . '</body></html>'); // Load the HTML
+                        $html . '</body></html>'); // Load the HTML
     $output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
     $output = xml2xhtml($output);
-    if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
+    if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
         $output = $matches [1]; // Remove <html><body>
     }
     /*
@@ -175,7 +175,7 @@ 
     }
     */
 
-    if (!are_libxml_errors_ok ()) $output = 'HTML code not valid.';
+    if (!are_libxml_errors_ok()) $output = 'HTML code not valid.';
 
     libxml_use_internal_errors(false);
     return $output;
@@ -264,7 +264,7 @@ 
     //echo var_dump($langs);
     $lang_file = NULL;
     foreach ($langs as $language => $val) {
-        $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
+        $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
             $lang = $language;
             $lang_file = $temp_file;
@@ -272,7 +272,7 @@ 
         }
     }
     if (empty ($lang_file)) {
-        $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
+        $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
     }
     return array($lang, $lang_file);
 }
@@ -281,7 +281,7 @@ 
  * This method is based on this page
  * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
  */
-function localize($phrase, $count=-1, $reset=false)
+function localize($phrase, $count = -1, $reset = false)
 {
     global $config;
     if ($count == 0)
@@ -301,7 +301,7 @@ 
         $lang_file_en = NULL;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != 'en') {
-            $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
+            $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
         }
 
         $lang_file_content = file_get_contents($lang_file);
@@ -309,8 +309,8 @@ 
         $translations = json_decode($lang_file_content, true);
 
         /* Clean the array of all unfinished translations */
-        foreach (array_keys ($translations) as $key) {
-            if (preg_match ('/^##TODO##/', $key)) {
+        foreach (array_keys($translations) as $key) {
+            if (preg_match('/^##TODO##/', $key)) {
                 unset ($translations [$key]);
             }
         }
@@ -318,10 +318,10 @@ 
         {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
-            $translations = array_merge ($translations_en, $translations);
+            $translations = array_merge($translations_en, $translations);
         }
     }
-    if (array_key_exists ($phrase, $translations)) {
+    if (array_key_exists($phrase, $translations)) {
         return $translations[$phrase];
     }
     return $phrase;
@@ -333,7 +333,7 @@ 
         $urlParams = '';
     }
     $start = '';
-    if (preg_match ('#^\?(.*)#', $urlParams, $matches)) {
+    if (preg_match('#^\?(.*)#', $urlParams, $matches)) {
         $start = '?';
         $urlParams = $matches[1];
     }

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

@@ -38,14 +38,14 @@ 
     // If there is a syntax error in the function created
     // $dot will be equal to FALSE
     if (!$dot) {
-        return FALSE;
+        return false;
     }
     // Execute the template
     if (!empty ($data)) {
         return $dot ($data);
     }
 
-    return NULL;
+    return null;
 }
 
 function getQueryString()
@@ -64,7 +64,7 @@ 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
-function getURLParam($name, $default = NULL)
+function getURLParam($name, $default = null)
 {
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != '') {
         return $_GET[$name];
@@ -262,7 +262,7 @@ 
         $langs = getAcceptLanguages();
     }
     //echo var_dump($langs);
-    $lang_file = NULL;
+    $lang_file = null;
     foreach ($langs as $language => $val) {
         $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
@@ -292,13 +292,13 @@ 
         $phrase .= '.many';
 
     /* Static keyword is used to ensure the file is loaded only once */
-    static $translations = NULL;
+    static $translations = null;
     if ($reset) {
-        $translations = NULL;
+        $translations = null;
     }
     /* If no instance of $translations has occured load the language file */
     if (is_null($translations)) {
-        $lang_file_en = NULL;
+        $lang_file_en = null;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != 'en') {
             $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';

Braces +19 added lines, -11 removed lines

@@ -149,7 +149,9 @@ 
     $errors = libxml_get_errors();
 
     foreach ($errors as $error) {
-        if ($error->code == 801) return false;
+        if ($error->code == 801) {
+            return false;
+        }
     }
     return true;
 }
@@ -175,7 +177,9 @@ 
     }
     */
 
-    if (!are_libxml_errors_ok ()) $output = 'HTML code not valid.';
+    if (!are_libxml_errors_ok ()) {
+        $output = 'HTML code not valid.';
+    }
 
     libxml_use_internal_errors(false);
     return $output;
@@ -235,7 +239,9 @@ 
 
             // set default to 1 for any without q factor
             foreach ($langs as $lang => $val) {
-                if ($val === '') $langs[$lang] = 1;
+                if ($val === '') {
+                    $langs[$lang] = 1;
+                }
             }
 
             // sort list based on value
@@ -257,8 +263,7 @@ 
     $lang = 'en';
     if (!empty($config['cops_language'])) {
         $lang = $config['cops_language'];
-    }
-    elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+    } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
         $langs = getAcceptLanguages();
     }
     //echo var_dump($langs);
@@ -284,12 +289,15 @@ 
 function localize($phrase, $count=-1, $reset=false)
 {
     global $config;
-    if ($count == 0)
-        $phrase .= '.none';
-    if ($count == 1)
-        $phrase .= '.one';
-    if ($count > 1)
-        $phrase .= '.many';
+    if ($count == 0) {
+            $phrase .= '.none';
+    }
+    if ($count == 1) {
+            $phrase .= '.one';
+    }
+    if ($count > 1) {
+            $phrase .= '.many';
+    }
 
     /* Static keyword is used to ensure the file is loaded only once */
     static $translations = NULL;

lib/Base.php

Doc Comments +18 added lines

@@ -84,6 +84,9 @@ 
         return "";
     }
 
+    /**
+     * @return string
+     */
     public static function getDbDirectory ($database = NULL) {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
@@ -143,10 +146,18 @@ 
         self::$db = NULL;
     }
 
+    /**
+     * @param string $query
+     */
     public static function executeQuerySingle ($query, $database = NULL) {
         return self::getDb ($database)->query($query)->fetchColumn();
     }
 
+    /**
+     * @param string $table
+     * @param string $id
+     * @param string $numberOfString
+     */
     public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
@@ -159,6 +170,10 @@ 
         return $entry;
     }
 
+    /**
+     * @param string $columns
+     * @param string $category
+     */
     public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
         list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
         $entryArray = array();
@@ -177,6 +192,9 @@ 
         return $entryArray;
     }
 
+    /**
+     * @param string $filter
+     */
     public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
         $totalResult = -1;
 

Spacing +11 added lines, -11 removed lines

@@ -40,15 +40,15 @@ 
     public static function isMultipleDatabaseEnabled()
     {
         global $config;
-        return is_array ($config['calibre_directory']);
+        return is_array($config['calibre_directory']);
     }
 
     public static function useAbsolutePath()
     {
         global $config;
         $path = self::getDbDirectory();
-        return preg_match ('/^\//', $path) || // Linux /
-               preg_match ('/^\w\:/', $path); // Windows X:
+        return preg_match('/^\//', $path) || // Linux /
+               preg_match('/^\w\:/', $path); // Windows X:
     }
 
     public static function noDatabaseSelected()
@@ -70,9 +70,9 @@ 
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
-            return array_keys ($config['calibre_directory']);
+            return array_keys($config['calibre_directory']);
         } else {
-            return array ('');
+            return array('');
         }
     }
 
@@ -106,7 +106,7 @@ 
 
     public static function getDbFileName($database = NULL)
     {
-        return self::getDbDirectory($database) .'metadata.db';
+        return self::getDbDirectory($database) . 'metadata.db';
     }
 
     private static function error($database)
@@ -117,12 +117,12 @@ 
         throw new Exception('Database <' . $database . '> not found.');
     }
 
-    public static function getDb ($database = NULL)
+    public static function getDb($database = NULL)
     {
-        if (is_null (self::$db)) {
+        if (is_null(self::$db)) {
             try {
-                if (is_readable(self::getDbFileName ($database))) {
-                    self::$db = new PDO('sqlite:'. self::getDbFileName($database));
+                if (is_readable(self::getDbFileName($database))) {
+                    self::$db = new PDO('sqlite:' . self::getDbFileName($database));
                     if (useNormAndUp()) {
                         self::$db->sqliteCreateFunction('normAndUp', 'normAndUp', 1);
                     }
@@ -170,7 +170,7 @@ 
         }
         $entry = new Entry(localize($table . '.title'), $id,
             str_format(localize($numberOfString, $count), $count), 'text',
-            array(new LinkNavigation('?page='.$pageId)), '', $count);
+            array(new LinkNavigation('?page=' . $pageId)), '', $count);
         return $entry;
     }
 

Braces +7 added lines, -4 removed lines

@@ -80,7 +80,9 @@ 
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
-            if (is_null($database)) $database = GetUrlParam(DB, 0);
+            if (is_null($database)) {
+                $database = GetUrlParam(DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 self::error($database);
             }
@@ -94,7 +96,9 @@ 
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
-            if (is_null($database)) $database = GetUrlParam(DB, 0);
+            if (is_null($database)) {
+                $database = GetUrlParam(DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 self::error($database);
             }
@@ -180,8 +184,7 @@ 
 
         list (, $result) = self::executeQuery($query, $columns, '', $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             /* @var $instance Author|Tag|Serie|Publisher */
 
             $instance = new $category($post);

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

@@ -35,7 +35,7 @@ 
 
     const COMPATIBILITY_XML_ALDIKO = 'aldiko';
 
-    private static $db = NULL;
+    private static $db = null;
 
     public static function isMultipleDatabaseEnabled()
     {
@@ -76,7 +76,7 @@ 
         }
     }
 
-    public static function getDbName($database = NULL)
+    public static function getDbName($database = null)
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
@@ -90,7 +90,7 @@ 
         return '';
     }
 
-    public static function getDbDirectory($database = NULL)
+    public static function getDbDirectory($database = null)
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
@@ -104,7 +104,7 @@ 
         return $config['calibre_directory'];
     }
 
-    public static function getDbFileName($database = NULL)
+    public static function getDbFileName($database = null)
     {
         return self::getDbDirectory($database) .'metadata.db';
     }
@@ -117,7 +117,7 @@ 
         throw new Exception('Database <' . $database . '> not found.');
     }
 
-    public static function getDb ($database = NULL)
+    public static function getDb ($database = null)
     {
         if (is_null (self::$db)) {
             try {
@@ -151,22 +151,22 @@ 
 
     public static function clearDb()
     {
-        self::$db = NULL;
+        self::$db = null;
     }
 
-    public static function executeQuerySingle($query, $database = NULL)
+    public static function executeQuerySingle($query, $database = null)
     {
         return self::getDb($database)->query($query)->fetchColumn();
     }
 
-    public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL)
+    public static function getCountGeneric($table, $id, $pageId, $numberOfString = null)
     {
         if (!$numberOfString) {
             $numberOfString = $table . '.alphabetical';
         }
         $count = self::executeQuerySingle('select count(*) from ' . $table);
         if ($count == 0) {
-            return NULL;
+            return null;
         }
         $entry = new Entry(localize($table . '.title'), $id,
             str_format(localize($numberOfString, $count), $count), 'text',
@@ -197,7 +197,7 @@ 
         return $entryArray;
     }
 
-    public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL)
+    public static function executeQuery($query, $columns, $filter, $params, $n, $database = null, $numberPerPage = null)
     {
         $totalResult = -1;
 

lib/LinkFacet.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 
 class LinkFacet extends Link
 {
+    /**
+     * @param string $phref
+     */
     public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 class LinkFacet extends Link
 {
     public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
-        parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        parent::__construct($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
+        if (!is_null(GetUrlParam(DB))) $this->href = addURLParameter($this->href, DB, GetUrlParam(DB));
         $this->href = parent::getScriptName() . $this->href;
     }
 }

Braces +5 added lines, -2 removed lines

@@ -8,9 +8,12 @@
 
 class LinkFacet extends Link
 {
-    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE)
+    {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        if (!is_null (GetUrlParam (DB))) {
+            $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        }
         $this->href = parent::getScriptName() . $this->href;
     }
 }

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

@@ -8,7 +8,7 @@
 
 class LinkFacet extends Link
 {
-    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptitle = null, $pfacetGroup = null, $pactiveFacet = false) {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
         $this->href = parent::getScriptName() . $this->href;

lib/LinkNavigation.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 
 class LinkNavigation extends Link
 {
+    /**
+     * @param string $prel
+     */
     public function __construct($phref, $prel = NULL, $ptitle = NULL) {
         parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));

Spacing +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@
 class LinkNavigation extends Link
 {
     public function __construct($phref, $prel = NULL, $ptitle = NULL) {
-        parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
-        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
-        if (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) {
+        parent::__construct($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
+        if (!is_null(GetUrlParam(DB))) $this->href = addURLParameter($this->href, DB, GetUrlParam(DB));
+        if (!preg_match("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
+        if (preg_match("/(bookdetail|getJSON).php/", parent::getScriptName())) {
             $this->href = "index.php" . $this->href;
         } else {
             $this->href = parent::getScriptName() . $this->href;

Braces +8 added lines, -3 removed lines

@@ -8,10 +8,15 @@
 
 class LinkNavigation extends Link
 {
-    public function __construct($phref, $prel = NULL, $ptitle = NULL) {
+    public function __construct($phref, $prel = NULL, $ptitle = NULL)
+    {
         parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
-        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
+        if (!is_null (GetUrlParam (DB))) {
+            $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        }
+        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) {
+            $this->href = "?" . $this->href;
+        }
         if (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) {
             $this->href = "index.php" . $this->href;
         } else {

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

@@ -8,7 +8,7 @@
 
 class LinkNavigation extends Link
 {
-    public function __construct($phref, $prel = NULL, $ptitle = NULL) {
+    public function __construct($phref, $prel = null, $ptitle = null) {
         parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
         if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;