seblucas / cops

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

transliteration.php

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

lib/PageCustomize.php

Indentation +5 added lines, -5 removed lines

@@ -45,11 +45,11 @@
         $this->entryArray = array ();
 
         $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR,
-                                   PageQueryResult::SCOPE_TAG,
-                                   PageQueryResult::SCOPE_SERIES,
-                                   PageQueryResult::SCOPE_PUBLISHER,
-                                   PageQueryResult::SCOPE_RATING,
-                                   "language");
+                                    PageQueryResult::SCOPE_TAG,
+                                    PageQueryResult::SCOPE_SERIES,
+                                    PageQueryResult::SCOPE_PUBLISHER,
+                                    PageQueryResult::SCOPE_RATING,
+                                    "language");
 
         $content = "";
         array_push ($this->entryArray, new Entry ("Template", "",

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

base.php

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;

lib/JSON_renderer.php

Indentation +48 added lines, -48 removed lines

@@ -24,7 +24,7 @@ 
             if ($data = $book->getDataFormat ($format)) {
                 $i++;
                 array_push ($preferedData, array ("url" => $data->getHtmlLink (),
-                  "viewUrl" => $data->getViewHtmlLink (), "name" => $format));
+                    "viewUrl" => $data->getViewHtmlLink (), "name" => $format));
             }
         }
 
@@ -52,20 +52,20 @@ 
         $cc = $book->getCustomColumnValues($config['cops_calibre_custom_column_list'], true);
 
         return array ("id" => $book->id,
-                      "hasCover" => $book->hasCover,
-                      "preferedData" => $preferedData,
-                      "rating" => $book->getRating (),
-                      "publisherName" => $pn,
-                      "publisherurl" => $pu,
-                      "pubDate" => $book->getPubDate (),
-                      "languagesName" => $book->getLanguages (),
-                      "authorsName" => $book->getAuthorsName (),
-                      "tagsName" => $book->getTagsName (),
-                      "seriesName" => $sn,
-                      "seriesIndex" => $book->seriesIndex,
-                      "seriesCompleteName" => $scn,
-                      "seriesurl" => $su,
-                      "customcolumns_list" => $cc);
+                        "hasCover" => $book->hasCover,
+                        "preferedData" => $preferedData,
+                        "rating" => $book->getRating (),
+                        "publisherName" => $pn,
+                        "publisherurl" => $pu,
+                        "pubDate" => $book->getPubDate (),
+                        "languagesName" => $book->getLanguages (),
+                        "authorsName" => $book->getAuthorsName (),
+                        "tagsName" => $book->getTagsName (),
+                        "seriesName" => $sn,
+                        "seriesIndex" => $book->seriesIndex,
+                        "seriesCompleteName" => $scn,
+                        "seriesurl" => $su,
+                        "customcolumns_list" => $cc);
     }
 
     /**
@@ -137,44 +137,44 @@ 
         $out = $in;
 
         $out ["c"] = array ("version" => VERSION, "i18n" => array (
-                           "coverAlt" => localize("i18n.coversection"),
-                           "authorsTitle" => localize("authors.title"),
-                           "bookwordTitle" => localize("bookword.title"),
-                           "tagsTitle" => localize("tags.title"),
-                           "seriesTitle" => localize("series.title"),
-                           "customizeTitle" => localize ("customize.title"),
-                           "aboutTitle" => localize ("about.title"),
-                           "previousAlt" => localize ("paging.previous.alternate"),
-                           "nextAlt" => localize ("paging.next.alternate"),
-                           "searchAlt" => localize ("search.alternate"),
-                           "sortAlt" => localize ("sort.alternate"),
-                           "homeAlt" => localize ("home.alternate"),
-                           "cogAlt" => localize ("cog.alternate"),
-                           "permalinkAlt" => localize ("permalink.alternate"),
-                           "publisherName" => localize("publisher.name"),
-                           "pubdateTitle" => localize("pubdate.title"),
-                           "languagesTitle" => localize("language.title"),
-                           "contentTitle" => localize("content.summary"),
-                           "sortorderAsc" => localize("search.sortorder.asc"),
-                           "sortorderDesc" => localize("search.sortorder.desc"),
-                           "customizeEmail" => localize("customize.email")),
-                       "url" => array (
-                           "detailUrl" => "index.php?page=13&id={0}&db={1}",
-                           "coverUrl" => "fetch.php?id={0}&db={1}",
-                           "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
-                       "config" => array (
-                           "use_fancyapps" => $config ["cops_use_fancyapps"],
-                           "max_item_per_page" => $config['cops_max_item_per_page'],
-                           "kindleHack"        => "",
-                           "server_side_rendering" => useServerSideRendering (),
-                           "html_tag_filter" => $config['cops_html_tag_filter']));
+                            "coverAlt" => localize("i18n.coversection"),
+                            "authorsTitle" => localize("authors.title"),
+                            "bookwordTitle" => localize("bookword.title"),
+                            "tagsTitle" => localize("tags.title"),
+                            "seriesTitle" => localize("series.title"),
+                            "customizeTitle" => localize ("customize.title"),
+                            "aboutTitle" => localize ("about.title"),
+                            "previousAlt" => localize ("paging.previous.alternate"),
+                            "nextAlt" => localize ("paging.next.alternate"),
+                            "searchAlt" => localize ("search.alternate"),
+                            "sortAlt" => localize ("sort.alternate"),
+                            "homeAlt" => localize ("home.alternate"),
+                            "cogAlt" => localize ("cog.alternate"),
+                            "permalinkAlt" => localize ("permalink.alternate"),
+                            "publisherName" => localize("publisher.name"),
+                            "pubdateTitle" => localize("pubdate.title"),
+                            "languagesTitle" => localize("language.title"),
+                            "contentTitle" => localize("content.summary"),
+                            "sortorderAsc" => localize("search.sortorder.asc"),
+                            "sortorderDesc" => localize("search.sortorder.desc"),
+                            "customizeEmail" => localize("customize.email")),
+                        "url" => array (
+                            "detailUrl" => "index.php?page=13&id={0}&db={1}",
+                            "coverUrl" => "fetch.php?id={0}&db={1}",
+                            "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
+                        "config" => array (
+                            "use_fancyapps" => $config ["cops_use_fancyapps"],
+                            "max_item_per_page" => $config['cops_max_item_per_page'],
+                            "kindleHack"        => "",
+                            "server_side_rendering" => useServerSideRendering (),
+                            "html_tag_filter" => $config['cops_html_tag_filter']));
         if ($config['cops_thumbnail_handling'] == "1") {
             $out ["c"]["url"]["thumbnailUrl"] = $out ["c"]["url"]["coverUrl"];
         } else if (!empty ($config['cops_thumbnail_handling'])) {
             $out ["c"]["url"]["thumbnailUrl"] = $config['cops_thumbnail_handling'];
         }
         if (preg_match("/./", $_SERVER['HTTP_USER_AGENT'])) {
-          $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
+            $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
         }
         return $out;
     }
@@ -233,7 +233,7 @@ 
         }
         if (!is_null (getURLParam ("complete")) || $complete) {
             $out = self::addCompleteArray ($out);
-       }
+        }
 
         $out ["containsBook"] = 0;
         if ($currentPage->containsBook ()) {

lib/Data.php

Indentation +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     public function getUpdatedFilenameKepub () {
         $str = $this->getUpdatedFilename () . ".kepub.epub";
         return str_replace(array(':', '#', '&'),
-                           array('-', '-', ' '), $str );
+                            array('-', '-', ' '), $str );
     }
 
     public function getDataLink ($rel, $title = NULL, $view = false) {

lib/Base.php

Indentation +7 added lines, -7 removed lines

@@ -99,13 +99,13 @@
 
     // -DC- Add image directory
     public static function getImgDirectory ($database = NULL) {
-    	global $config;
-    	if (self::isMultipleDatabaseEnabled ()) {
-    		if (is_null ($database)) $database = GetUrlParam (DB, 0);
-    		$array = array_values ($config['image_directory']);
-    		return  $array[$database];
-    	}
-    	return $config['image_directory'];
+        global $config;
+        if (self::isMultipleDatabaseEnabled ()) {
+            if (is_null ($database)) $database = GetUrlParam (DB, 0);
+            $array = array_values ($config['image_directory']);
+            return  $array[$database];
+        }
+        return $config['image_directory'];
     }
 
     public static function getDbFileName ($database = NULL) {

lib/Book.php

Indentation +94 added lines, -94 removed lines

@@ -109,7 +109,7 @@ 
     private $coverFileName = NULL;
 
     public function __construct($line) {
-    	global $config;
+        global $config;
 
         $this->id = $line->id;
         $this->title = $line->title;
@@ -120,7 +120,7 @@ 
         // -DC- Init relative or full path
         $this->path = $line->path;
         if (!is_dir($this->path)) {
-        	$this->path = Base::getDbDirectory() . $line->path;
+            $this->path = Base::getDbDirectory() . $line->path;
         }
         $this->seriesIndex = $line->series_index;
         $this->comment = $line->comment;
@@ -132,47 +132,47 @@ 
         //    $this->hasCover = 0;
         //}
         if ($this->hasCover) {
-        	if (!empty($config['calibre_database_field_cover'])) {
-        		$imgDirectory = Base::getImgDirectory();
-        		$this->coverFileName = $line->cover;
-        		if (!file_exists($this->coverFileName)) {
-        			$this->coverFileName = NULL;
-        		}
-        		if (empty($this->coverFileName)) {
-        			$this->coverFileName = sprintf('%s%s', $imgDirectory, $line->cover);
-        			if (!file_exists($this->coverFileName)) {
-        				$this->coverFileName = NULL;
-        			}
-        		}
-        		if (empty($this->coverFileName)) {
-        			$data = $this->getDataById($this->id);
-        			if ($data) {
-        				$this->coverFileName = sprintf('%s%s/%s', $imgDirectory, $data->name, $line->cover);
-        				if (!file_exists($this->coverFileName)) {
-        					$this->coverFileName = NULL;
-        				}
-        				if (empty($this->coverFileName)) {
-        					$this->coverFileName = sprintf('%s%s.jpg', $imgDirectory, $data->name);
-        					if (!file_exists($this->coverFileName)) {
-        						$this->coverFileName = NULL;
-        					}
-        				}
-        			}
-        		}
-        	}
-        	// Else try with default cover file name
-        	if (empty($this->coverFileName)) {
-        		$cover = $this->getFilePath("jpg");
-        		if ($cover === false || !file_exists($cover)) {
-        			$cover = $this->getFilePath("png");
-        		}
-        		if ($cover === false || !file_exists($cover)) {
-        			$this->hasCover = 0;
-        		}
-        		else {
-        			$this->coverFileName = $cover;
-        		}
-        	}
+            if (!empty($config['calibre_database_field_cover'])) {
+                $imgDirectory = Base::getImgDirectory();
+                $this->coverFileName = $line->cover;
+                if (!file_exists($this->coverFileName)) {
+                    $this->coverFileName = NULL;
+                }
+                if (empty($this->coverFileName)) {
+                    $this->coverFileName = sprintf('%s%s', $imgDirectory, $line->cover);
+                    if (!file_exists($this->coverFileName)) {
+                        $this->coverFileName = NULL;
+                    }
+                }
+                if (empty($this->coverFileName)) {
+                    $data = $this->getDataById($this->id);
+                    if ($data) {
+                        $this->coverFileName = sprintf('%s%s/%s', $imgDirectory, $data->name, $line->cover);
+                        if (!file_exists($this->coverFileName)) {
+                            $this->coverFileName = NULL;
+                        }
+                        if (empty($this->coverFileName)) {
+                            $this->coverFileName = sprintf('%s%s.jpg', $imgDirectory, $data->name);
+                            if (!file_exists($this->coverFileName)) {
+                                $this->coverFileName = NULL;
+                            }
+                        }
+                    }
+                }
+            }
+            // Else try with default cover file name
+            if (empty($this->coverFileName)) {
+                $cover = $this->getFilePath("jpg");
+                if ($cover === false || !file_exists($cover)) {
+                    $cover = $this->getFilePath("png");
+                }
+                if ($cover === false || !file_exists($cover)) {
+                    $this->hasCover = 0;
+                }
+                else {
+                    $this->coverFileName = $cover;
+                }
+            }
         }
         $this->rating = $line->rating;
     }
@@ -180,14 +180,14 @@ 
     // -DC- Get customisable book columns
     private static function getBookColumns()
     {
-    	global $config;
+        global $config;
 
-    	$res = self::BOOK_COLUMNS;
-    	if (!empty($config['calibre_database_field_cover'])) {
-    		$res = str_replace('has_cover,', 'has_cover, ' . $config['calibre_database_field_cover'] . ',', $res);
-    	}
+        $res = self::BOOK_COLUMNS;
+        if (!empty($config['calibre_database_field_cover'])) {
+            $res = str_replace('has_cover,', 'has_cover, ' . $config['calibre_database_field_cover'] . ',', $res);
+        }
 
-    	return $res;
+        return $res;
     }
 
     public function getEntryId() {
@@ -416,26 +416,26 @@ 
         {
             return $this->path.'/'.$file;
         }*/
-    	if ($extension == "jpg" || $extension == "png") {
-    		if (empty($this->coverFileName)) {
-    			return $this->path . '/cover.' . $extension;
-    		}
-    		else {
-    			$ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
-    			if ($ext == $extension) {
-    				return $this->coverFileName;
-    			}
-    		}
-    		return false;
-    	}
-    	else {
-    		$data = $this->getDataById($idData);
-    		if (!$data) {
-    			return NULL;
-    		}
-    		$file = $data->name . "." . strtolower($data->format);
-    		return $this->path . '/' . $file;
-    	}
+        if ($extension == "jpg" || $extension == "png") {
+            if (empty($this->coverFileName)) {
+                return $this->path . '/cover.' . $extension;
+            }
+            else {
+                $ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
+                if ($ext == $extension) {
+                    return $this->coverFileName;
+                }
+            }
+            return false;
+        }
+        else {
+            $data = $this->getDataById($idData);
+            if (!$data) {
+                return NULL;
+            }
+            $file = $data->name . "." . strtolower($data->format);
+            return $this->path . '/' . $file;
+        }
     }
 
     public function getUpdatedEpub($idData)
@@ -520,18 +520,18 @@ 
         $linkArray = array();
 
         if ($this->hasCover) {
-        	// -DC- Use cover file name
-        	//array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
-        	//array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
-        	$ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
-        	if ($ext == 'png') {
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", NULL));
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", NULL));
-        	}
-        	else {
-        		array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
-        		array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
-        	}
+            // -DC- Use cover file name
+            //array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
+            //array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
+            $ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
+            if ($ext == 'png') {
+                array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", NULL));
+                array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", NULL));
+            }
+            else {
+                array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
+                array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
+            }
         }
 
         foreach ($this->getDatas() as $data)
@@ -571,15 +571,15 @@ 
         $nBooks = parent::executeQuerySingle('select count(*) from books');
         $result = array();
         $entry = new Entry(localize('allbooks.title'),
-                          self::ALL_BOOKS_ID,
-                          str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text',
-                          array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks);
+                            self::ALL_BOOKS_ID,
+                            str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text',
+                            array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks);
         array_push($result, $entry);
         if ($config['cops_recentbooks_limit'] > 0) {
             $entry = new Entry(localize('recent.title'),
-                              self::ALL_RECENT_BOOKS_ID,
-                              str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text',
-                              array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
+                                self::ALL_RECENT_BOOKS_ID,
+                                str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text',
+                                array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
             array_push($result, $entry);
         }
         return $result;
@@ -622,7 +622,7 @@ 
     }
 
     public static function getBookById($bookId) {
-    	$result = parent::getDb()->prepare('select ' . self::getBookColumns() . '
+        $result = parent::getDb()->prepare('select ' . self::getBookColumns() . '
 from books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where books.id = ?');
         $result->execute(array($bookId));
@@ -635,7 +635,7 @@ 
     }
 
     public static function getBookByDataId($dataId) {
-    	$result = parent::getDb()->prepare('select ' . self::getBookColumns() . ', data.name, data.format
+        $result = parent::getDb()->prepare('select ' . self::getBookColumns() . ', data.name, data.format
 from data, books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where data.book = books.id and data.id = ?');
         $result->execute(array($dataId));
@@ -654,10 +654,10 @@ 
         $i = 0;
         $critArray = array();
         foreach (array(PageQueryResult::SCOPE_AUTHOR,
-                       PageQueryResult::SCOPE_TAG,
-                       PageQueryResult::SCOPE_SERIES,
-                       PageQueryResult::SCOPE_PUBLISHER,
-                       PageQueryResult::SCOPE_BOOK) as $key) {
+                        PageQueryResult::SCOPE_TAG,
+                        PageQueryResult::SCOPE_SERIES,
+                        PageQueryResult::SCOPE_PUBLISHER,
+                        PageQueryResult::SCOPE_BOOK) as $key) {
             if (in_array($key, getCurrentOption('ignored_categories')) ||
                 (!array_key_exists($key, $query) && !array_key_exists('all', $query))) {
                 $critArray[$i] = self::BAD_SEARCH;
@@ -704,7 +704,7 @@ 
     public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
         /* @var $totalNumber integer */
         /* @var $result PDOStatement */
-    	list($totalNumber, $result) = parent::executeQuery($query, self::getBookColumns(), self::getFilterString(), $params, $n, $database, $numberPerPage);
+        list($totalNumber, $result) = parent::executeQuery($query, self::getBookColumns(), self::getFilterString(), $params, $n, $database, $numberPerPage);
 
         $entryArray = array();
         while ($post = $result->fetchObject())