seblucas / cops

checkconfig.php

Spacing +2 added lines, -2 removed lines

@@ -201,7 +201,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;
@@ -214,7 +214,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';

fetch.php

Switch Indentation +45 added lines, -45 removed lines

@@ -56,57 +56,57 @@
 
 switch ($type) {
     // -DC- Add png type
-    case 'jpg':
-    case 'png':
-        if ($type == 'jpg') {
-            header('Content-Type: image/jpeg');
-        } else {
-            header('Content-Type: image/png');
-        }
-        //by default, we don't cache
-        $thumbnailCacheFullpath = null;
-        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 : '';
-            //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)) {
-                //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') . '.' . $type;
-                $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
+        case 'jpg':
+        case 'png':
+            if ($type == 'jpg') {
+                header('Content-Type: image/jpeg');
             } else {
-                //error creating the folder, so we don't cache
-                $thumbnailCacheFullpath = null;
+                header('Content-Type: image/png');
+            }
+            //by default, we don't cache
+            $thumbnailCacheFullpath = null;
+            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 : '';
+                //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)) {
+                    //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') . '.' . $type;
+                    $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
+                } else {
+                    //error creating the folder, so we don't cache
+                    $thumbnailCacheFullpath = null;
+                }
             }
-        }
-
-        if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
-            //return the already cached thumbnail
-            readfile($thumbnailCacheFullpath);
-            return;
-        }
 
-        $width = getURLParam('width');
-        $height = getURLParam('height');
-        if ($book->getThumbnail($width, $height, $thumbnailCacheFullpath, $type)) {
-            //if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
-            if ($thumbnailCacheFullpath === null) {
-                // The cover had to be resized
-                return;
-            } else {
-                //return the just cached thumbnail
+            if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
+                //return the already cached thumbnail
                 readfile($thumbnailCacheFullpath);
                 return;
             }
-        }
-        break;
-    default:
-        $data = $book->getDataById($idData);
-        header('Content-Type: ' . $data->getMimeType());
-        break;
+
+            $width = getURLParam('width');
+            $height = getURLParam('height');
+            if ($book->getThumbnail($width, $height, $thumbnailCacheFullpath, $type)) {
+                //if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
+                if ($thumbnailCacheFullpath === null) {
+                    // The cover had to be resized
+                    return;
+                } else {
+                    //return the just cached thumbnail
+                    readfile($thumbnailCacheFullpath);
+                    return;
+                }
+            }
+            break;
+        default:
+            $data = $book->getDataById($idData);
+            header('Content-Type: ' . $data->getMimeType());
+            break;
 }
 
 // absolute path for single DB in PHP app here - cfr. internal dir for X-Accel-Redirect with Nginx

Spacing +3 added lines, -3 removed lines

@@ -26,10 +26,10 @@ 
     ob_end_clean();
 }
 
-$expires = 60*60*24*14;
+$expires = 60 * 60 * 24 * 14;
 header('Pragma: public');
 header('Cache-Control: max-age=' . $expires);
-header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
+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);
@@ -73,7 +73,7 @@ 
         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;

config.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 }
 /** @var array $config */
 
-$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);
 $user_config_file = 'config_local.' . $remote_user . '.php';