seblucas / cops

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())

fetch.php

Indentation +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 
     // -DC- Add png type
     if ($book && ($type == 'jpg' || $type == 'png' || empty ($config['calibre_internal_directory']))) {
-    	  if ($type == 'jpg' || $type == 'png') {
+            if ($type == 'jpg' || $type == 'png') {
             $file = $book->getFilePath($type);
         } else {
             $file = $book->getFilePath($type, $idData);
@@ -54,15 +54,15 @@ 
 
     switch ($type)
     {
-    		// -DC- Add png type
+            // -DC- Add png type
         case 'jpg':
         case 'png':
-        		if ($type == 'jpg') {
-          	  header('Content-Type: image/jpeg');
-        		}
-        		else {
-        			header('Content-Type: image/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'] !== '' ) {

lib/Tag.php

Indentation +6 added lines, -6 removed lines

@@ -43,13 +43,13 @@
     }
 
     public static function getAllTags() {
-    	global $config;
+        global $config;
 
-    	$sql = self::SQL_ALL_TAGS;
-    	$sortField = $config['calibre_database_field_sort'];
-    	if (!empty($sortField)) {
-    		$sql = str_replace('tags.name', 'tags.' . $sortField, $sql);
-    	}
+        $sql = self::SQL_ALL_TAGS;
+        $sortField = $config['calibre_database_field_sort'];
+        if (!empty($sortField)) {
+            $sql = str_replace('tags.name', 'tags.' . $sortField, $sql);
+        }
 
         return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
     }