mbirth / cops

fetch.php

Spacing +11 added lines, -11 removed lines

@@ -19,10 +19,10 @@ 
         }
     }
 
-    $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('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
     $bookId = getURLParam('id', NULL);
     $type   = getURLParam('type', 'jpg');
     $idData = getURLParam('data', NULL);
@@ -33,7 +33,7 @@ 
     }
 
     if (!$book) {
-        notFound ();
+        notFound();
         return;
     }
 
@@ -55,15 +55,15 @@ 
             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';
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
@@ -73,20 +73,20 @@ 
                 }
             }
 
-            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;
                 }
             }

Braces +1 added lines, -2 removed lines

@@ -49,8 +49,7 @@
         }
     }
 
-    switch ($type)
-    {
+    switch ($type) {
         case 'jpg':
             header('Content-Type: image/jpeg');
             //by default, we don't cache

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

@@ -23,9 +23,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);
     } else {

base.php

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;