mbirth / cops

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

config_default.php

Spacing +4 added lines, -4 removed lines

@@ -106,7 +106,7 @@ 
      * The two first will be displayed in book entries
      * The other only appear in book detail
      */
-    $config['cops_prefered_format'] = array ("EPUB", "PDF", "AZW3", "AZW", "MOBI", "CBR", "CBZ");
+    $config['cops_prefered_format'] = array("EPUB", "PDF", "AZW3", "AZW", "MOBI", "CBR", "CBZ");
 
     /*
      * use URL rewriting for downloading of ebook in HTML catalog
@@ -168,7 +168,7 @@ 
      *
      * Example : array ("All" => "", "Unread" => "!Read", "Read" => "Read")
      */
-    $config['cops_books_filter'] = array ();
+    $config['cops_books_filter'] = array();
 
     /*
      * Custom Columns to add  as an array containing the lookup names
@@ -178,7 +178,7 @@ 
      *
      * Note that for now only the first, second and forth type of custom columns are supported
      */
-    $config['cops_calibre_custom_column'] = array ();
+    $config['cops_calibre_custom_column'] = array();
 
     /*
      * Rename .epub to .kepub.epub if downloaded from a Kobo eReader
@@ -256,7 +256,7 @@ 
      * - rating
      * - language
      */
-    $config ['cops_ignored_categories'] = array ();
+    $config ['cops_ignored_categories'] = array();
 
     /*
      * If you use a Sony eReader or Aldiko you can't download ebooks if your catalog

Braces +3 added lines, -2 removed lines

@@ -6,8 +6,9 @@
  * @author     Sébastien Lucas <sebastien@slucas.fr>
  */
 
-    if (!isset($config))
-        $config = array();
+    if (!isset($config)) {
+            $config = array();
+    }
 
     /*
      * The directory containing calibre's metadata.db file, with sub-directories

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 :

checkconfig.php

Spacing +18 added lines, -18 removed lines

@@ -12,10 +12,10 @@ 
     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");
+    $err = getURLParam("err", -1);
+    $full = getURLParam("full");
     $error = NULL;
     switch ($err) {
         case 1 :
@@ -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">
@@ -40,7 +40,7 @@ 
     <div id="content" style="display: none;"></div>
     <section>
         <?php
-        if (!is_null ($error)) {
+        if (!is_null($error)) {
         ?>
         <article class="frontpage">
             <h2>You've been redirected because COPS is not configured properly</h2>
@@ -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";
@@ -163,13 +163,13 @@ 
         </article>
 <?php
 $i = 0;
-foreach (Base::getDbList () as $name => $database) {
+foreach (Base::getDbList() as $name => $database) {
 ?>
         <article class="frontpage">
             <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)";
@@ -181,10 +181,10 @@ 
             <h2>Check if Calibre database file exists and is readable</h2>
             <h4>
             <?php
-            if (is_readable (Base::getDbFileName ($i))) {
+            if (is_readable(Base::getDbFileName($i))) {
                 echo "{$name} OK";
             } else {
-                echo "{$name} File " . Base::getDbFileName ($i) . " not found,
+                echo "{$name} File " . Base::getDbFileName($i) . " not found,
 Please check
 <ul>
 <li>Value of \$config['calibre_directory'] in config_local.php</li>
@@ -196,13 +196,13 @@ 
             ?>
             </h4>
         </article>
-    <?php if (is_readable (Base::getDbFileName ($i))) { ?>
+    <?php if (is_readable(Base::getDbFileName($i))) { ?>
         <article class="frontpage">
             <h2>Check if Calibre database file can be opened with PHP</h2>
             <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";
@@ -234,13 +234,13 @@ 
             <h4>
             <?php
             try {
-                $db = new PDO('sqlite:'. Base::getDbFileName ($i));
+                $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 ())
+                $result->execute();
+                while ($post = $result->fetchObject())
                 {
-                    if (!is_file (Base::getDbDirectory ($i) . $post->fullpath)) {
-                        echo "<p>" . Base::getDbDirectory ($i) . $post->fullpath . "</p>";
+                    if (!is_file(Base::getDbDirectory($i) . $post->fullpath)) {
+                        echo "<p>" . Base::getDbDirectory($i) . $post->fullpath . "</p>";
                     }
                 }
             } catch (Exception $e) {

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

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