seblucas / cops

lib/Base.php

Spacing +69 added lines, -69 removed lines

@@ -37,156 +37,156 @@ 
 
     private static $db = NULL;
 
-    public static function isMultipleDatabaseEnabled () {
+    public static function isMultipleDatabaseEnabled() {
         global $config;
-        return is_array ($config['calibre_directory']);
+        return is_array($config['calibre_directory']);
     }
 
-    public static function useAbsolutePath () {
+    public static function useAbsolutePath() {
         global $config;
         $path = self::getDbDirectory();
-        return preg_match ('/^\//', $path) || // Linux /
-               preg_match ('/^\w\:/', $path); // Windows X:
+        return preg_match('/^\//', $path) || // Linux /
+               preg_match('/^\w\:/', $path); // Windows X:
     }
 
-    public static function noDatabaseSelected () {
-        return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB));
+    public static function noDatabaseSelected() {
+        return self::isMultipleDatabaseEnabled() && is_null(GetUrlParam(DB));
     }
 
-    public static function getDbList () {
+    public static function getDbList() {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
+        if (self::isMultipleDatabaseEnabled()) {
             return $config['calibre_directory'];
         } else {
-            return array ("" => $config['calibre_directory']);
+            return array("" => $config['calibre_directory']);
         }
     }
 
-    public static function getDbNameList () {
+    public static function getDbNameList() {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
-            return array_keys ($config['calibre_directory']);
+        if (self::isMultipleDatabaseEnabled()) {
+            return array_keys($config['calibre_directory']);
         } else {
-            return array ("");
+            return array("");
         }
     }
 
-    public static function getDbName ($database = NULL) {
+    public static function getDbName($database = NULL) {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
-            if (is_null ($database)) $database = GetUrlParam (DB, 0);
+        if (self::isMultipleDatabaseEnabled()) {
+            if (is_null($database)) $database = GetUrlParam(DB, 0);
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
-                self::error ($database);
+                self::error($database);
             }
-            $array = array_keys ($config['calibre_directory']);
+            $array = array_keys($config['calibre_directory']);
             return  $array[$database];
         }
         return "";
     }
 
-    public static function getDbDirectory ($database = NULL) {
+    public static function getDbDirectory($database = NULL) {
         global $config;
-        if (self::isMultipleDatabaseEnabled ()) {
-            if (is_null ($database)) $database = GetUrlParam (DB, 0);
+        if (self::isMultipleDatabaseEnabled()) {
+            if (is_null($database)) $database = GetUrlParam(DB, 0);
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
-                self::error ($database);
+                self::error($database);
             }
-            $array = array_values ($config['calibre_directory']);
+            $array = array_values($config['calibre_directory']);
             return  $array[$database];
         }
         return $config['calibre_directory'];
     }
 
     // -DC- Add image directory
-    public static function getImgDirectory ($database = NULL) {
+    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']);
+    	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) {
-        return self::getDbDirectory ($database) .'metadata.db';
+    public static function getDbFileName($database = NULL) {
+        return self::getDbDirectory($database) . 'metadata.db';
     }
 
-    private static function error ($database) {
+    private static function error($database) {
         if (php_sapi_name() != "cli") {
             header("location: checkconfig.php?err=1");
         }
         throw new Exception("Database <{$database}> not found.");
     }
 
-    public static function getDb ($database = NULL) {
-        if (is_null (self::$db)) {
+    public static function getDb($database = NULL) {
+        if (is_null(self::$db)) {
             try {
-                if (is_readable (self::getDbFileName ($database))) {
-                    self::$db = new PDO('sqlite:'. self::getDbFileName ($database));
-                    if (useNormAndUp ()) {
-                        self::$db->sqliteCreateFunction ('normAndUp', 'normAndUp', 1);
+                if (is_readable(self::getDbFileName($database))) {
+                    self::$db = new PDO('sqlite:' . self::getDbFileName($database));
+                    if (useNormAndUp()) {
+                        self::$db->sqliteCreateFunction('normAndUp', 'normAndUp', 1);
                     }
                 } else {
-                    self::error ($database);
+                    self::error($database);
                 }
             } catch (Exception $e) {
-                self::error ($database);
+                self::error($database);
             }
         }
         return self::$db;
     }
 
-    public static function checkDatabaseAvailability () {
-        if (self::noDatabaseSelected ()) {
-            for ($i = 0; $i < count (self::getDbList ()); $i++) {
-                self::getDb ($i);
-                self::clearDb ();
+    public static function checkDatabaseAvailability() {
+        if (self::noDatabaseSelected()) {
+            for ($i = 0; $i < count(self::getDbList()); $i++) {
+                self::getDb($i);
+                self::clearDb();
             }
         } else {
-            self::getDb ();
+            self::getDb();
         }
         return true;
     }
 
-    public static function clearDb () {
+    public static function clearDb() {
         self::$db = NULL;
     }
 
-    public static function executeQuerySingle ($query, $database = NULL) {
-        return self::getDb ($database)->query($query)->fetchColumn();
+    public static function executeQuerySingle($query, $database = NULL) {
+        return self::getDb($database)->query($query)->fetchColumn();
     }
 
     public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
         }
-        $count = self::executeQuerySingle ('select count(*) from ' . $table);
+        $count = self::executeQuerySingle('select count(*) from ' . $table);
         if ($count == 0) return NULL;
-        $entry = new Entry (localize($table . ".title"), $id,
-            str_format (localize($numberOfString, $count), $count), "text",
-            array ( new LinkNavigation ("?page=".$pageId)), "", $count);
+        $entry = new Entry(localize($table . ".title"), $id,
+            str_format(localize($numberOfString, $count), $count), "text",
+            array(new LinkNavigation("?page=" . $pageId)), "", $count);
         return $entry;
     }
 
-    public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
+    public static function getEntryArrayWithBookNumber($query, $columns, $params, $category) {
         /* @var $result PDOStatement */
 
-        list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
+        list (, $result) = self::executeQuery($query, $columns, "", $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
             /* @var $instance Author|Tag|Serie|Publisher */
 
-            $instance = new $category ($post);
+            $instance = new $category($post);
             if (property_exists($post, "sort")) {
                 $title = $post->sort;
             } else {
                 $title = $post->name;
             }
-            array_push ($entryArray, new Entry ($title, $instance->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($instance->getUri ())), "", $post->count));
+            array_push($entryArray, new Entry($title, $instance->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($instance->getUri())), "", $post->count));
         }
         return $entryArray;
     }
@@ -194,30 +194,30 @@ 
     public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
         $totalResult = -1;
 
-        if (useNormAndUp ()) {
+        if (useNormAndUp()) {
             $query = preg_replace("/upper/", "normAndUp", $query);
             $columns = preg_replace("/upper/", "normAndUp", $columns);
         }
 
-        if (is_null ($numberPerPage)) {
-            $numberPerPage = getCurrentOption ("max_item_per_page");
+        if (is_null($numberPerPage)) {
+            $numberPerPage = getCurrentOption("max_item_per_page");
         }
 
         if ($numberPerPage != -1 && $n != -1)
         {
             // First check total number of results
-            $result = self::getDb ($database)->prepare (str_format ($query, "count(*)", $filter));
-            $result->execute ($params);
-            $totalResult = $result->fetchColumn ();
+            $result = self::getDb($database)->prepare(str_format($query, "count(*)", $filter));
+            $result->execute($params);
+            $totalResult = $result->fetchColumn();
 
             // Next modify the query and params
             $query .= " limit ?, ?";
-            array_push ($params, ($n - 1) * $numberPerPage, $numberPerPage);
+            array_push($params, ($n - 1) * $numberPerPage, $numberPerPage);
         }
 
-        $result = self::getDb ($database)->prepare(str_format ($query, $columns, $filter));
-        $result->execute ($params);
-        return array ($totalResult, $result);
+        $result = self::getDb($database)->prepare(str_format($query, $columns, $filter));
+        $result->execute($params);
+        return array($totalResult, $result);
     }
 
 }

lib/Book.php

Spacing +56 added lines, -56 removed lines

@@ -7,55 +7,55 @@ 
  */
 
 // Silly thing because PHP forbid string concatenation in class const
-define ('SQL_BOOKS_LEFT_JOIN', 'left outer join comments on comments.book = books.id
+define('SQL_BOOKS_LEFT_JOIN', 'left outer join comments on comments.book = books.id
                                 left outer join books_ratings_link on books_ratings_link.book = books.id
                                 left outer join ratings on books_ratings_link.rating = ratings.id ');
-define ('SQL_BOOKS_ALL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' order by books.sort ');
-define ('SQL_BOOKS_BY_PUBLISHER', 'select {0} from books_publishers_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_ALL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' order by books.sort ');
+define('SQL_BOOKS_BY_PUBLISHER', 'select {0} from books_publishers_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_publishers_link.book = books.id and publisher = ? {1} order by publisher');
-define ('SQL_BOOKS_BY_FIRST_LETTER', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_FIRST_LETTER', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where upper (books.sort) like ? order by books.sort');
-define ('SQL_BOOKS_BY_AUTHOR', 'select {0} from books_authors_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_AUTHOR', 'select {0} from books_authors_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     left outer join books_series_link on books_series_link.book = books.id
                                                     where books_authors_link.book = books.id and author = ? {1} order by series desc, series_index asc, pubdate asc');
-define ('SQL_BOOKS_BY_SERIE', 'select {0} from books_series_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_SERIE', 'select {0} from books_series_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_series_link.book = books.id and series = ? {1} order by series_index');
-define ('SQL_BOOKS_BY_TAG', 'select {0} from books_tags_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_TAG', 'select {0} from books_tags_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_tags_link.book = books.id and tag = ? {1} order by sort');
-define ('SQL_BOOKS_BY_LANGUAGE', 'select {0} from books_languages_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_LANGUAGE', 'select {0} from books_languages_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_languages_link.book = books.id and lang_code = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.{3} = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = 1 {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = 0 {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books.id not in (select book from {2}) {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     left join {2} on {2}.book = books.id
                                                     left join {3} on {3}.id = {2}.{4}
                                                     where {3}.value = ?  order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
 								                    left join {2} on {2}.book = books.id
 								                    left join {3} on {3}.id = {2}.{4}
                                                     where ((books.id not in (select {2}.book from {2})) or ({3}.value = 0)) {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and date({2}.value) = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.id = ? {1} order by sort');
-define ('SQL_BOOKS_QUERY', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_QUERY', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where (
                                                     exists (select null from authors, books_authors_link where book = books.id and author = authors.id and authors.name like ?) or
                                                     exists (select null from tags, books_tags_link where book = books.id and tag = tags.id and tags.name like ?) or
                                                     exists (select null from series, books_series_link on book = books.id and books_series_link.series = series.id and series.name like ?) or
                                                     exists (select null from publishers, books_publishers_link where book = books.id and books_publishers_link.publisher = publishers.id and publishers.name like ?) or
                                                     title like ?) {1} order by books.sort');
-define ('SQL_BOOKS_RECENT', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_RECENT', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where 1=1 {1} order by timestamp desc limit ');
-define ('SQL_BOOKS_BY_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_ratings_link.book = books.id and ratings.id = ? {1} order by sort');
 
 class Book extends Base
@@ -105,7 +105,7 @@ 
     public $serie = NULL;
     public $tags = NULL;
     public $languages = NULL;
-    public $format = array ();
+    public $format = array();
     private $coverFileName = NULL;
 
     public function __construct($line) {
@@ -191,24 +191,24 @@ 
     }
 
     public function getEntryId() {
-        return self::ALL_BOOKS_UUID.':'.$this->uuid;
+        return self::ALL_BOOKS_UUID . ':' . $this->uuid;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
-        return self::ALL_BOOKS_ID.':letter:'.$startingLetter;
+    public static function getEntryIdByLetter($startingLetter) {
+        return self::ALL_BOOKS_ID . ':letter:' . $startingLetter;
     }
 
-    public function getUri () {
-        return '?page='.parent::PAGE_BOOK_DETAIL.'&id=' . $this->id;
+    public function getUri() {
+        return '?page=' . parent::PAGE_BOOK_DETAIL . '&id=' . $this->id;
     }
 
-    public function getDetailUrl () {
+    public function getDetailUrl() {
         $urlParam = $this->getUri();
-        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB));
+        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam(DB));
         return 'index.php' . $urlParam;
     }
 
-    public function getTitle () {
+    public function getTitle() {
         return $this->title;
     }
 
@@ -217,22 +217,22 @@ 
     /**
      * @return Author[]
      */
-    public function getAuthors () {
+    public function getAuthors() {
         if (is_null($this->authors)) {
             $this->authors = Author::getAuthorByBookId($this->id);
         }
         return $this->authors;
     }
 
-    public function getAuthorsName () {
-        return implode(', ', array_map(function ($author) { return $author->name; }, $this->getAuthors()));
+    public function getAuthorsName() {
+        return implode(', ', array_map(function($author) { return $author->name; }, $this->getAuthors()));
     }
 
-    public function getAuthorsSort () {
-        return implode(', ', array_map(function ($author) { return $author->sort; }, $this->getAuthors()));
+    public function getAuthorsSort() {
+        return implode(', ', array_map(function($author) { return $author->sort; }, $this->getAuthors()));
     }
 
-    public function getPublisher () {
+    public function getPublisher() {
         if (is_null($this->publisher)) {
             $this->publisher = Publisher::getPublisherByBookId($this->id);
         }
@@ -271,7 +271,7 @@ 
      * @return Tag[]
      */
     public function getTags() {
-        if (is_null ($this->tags)) {
+        if (is_null($this->tags)) {
             $this->tags = array();
 
             $result = parent::getDb()->prepare('select tags.id as id, name
@@ -289,7 +289,7 @@ 
     }
 
     public function getTagsName() {
-        return implode(', ', array_map(function ($tag) { return $tag->name; }, $this->getTags()));
+        return implode(', ', array_map(function($tag) { return $tag->name; }, $this->getTags()));
     }
 
     /**
@@ -341,7 +341,7 @@ 
 
     public function getDataById($idData)
     {
-        $reduced = array_filter($this->getDatas(), function ($data) use ($idData) {
+        $reduced = array_filter($this->getDatas(), function($data) use ($idData) {
             return $data->id == $idData;
         });
         return reset($reduced);
@@ -365,7 +365,7 @@ 
         if (empty ($this->pubdate)) {
             return '';
         }
-        $dateY = (int) substr($this->pubdate, 0, 4);
+        $dateY = (int)substr($this->pubdate, 0, 4);
         if ($dateY > 102) {
             return str_pad($dateY, 4, '0', STR_PAD_LEFT);
         }
@@ -374,8 +374,8 @@ 
 
     public function getComment($withSerie = true) {
         $addition = '';
-        $se = $this->getSerie ();
-        if (!is_null ($se) && $withSerie) {
+        $se = $this->getSerie();
+        if (!is_null($se) && $withSerie) {
             $addition = $addition . '<strong>' . localize('content.series') . '</strong>' . str_format(localize('content.series.data'), $this->seriesIndex, htmlspecialchars($se->name)) . "<br />\n";
         }
         if (preg_match('/<\/(div|p|a|span)>/', $this->comment))
@@ -389,7 +389,7 @@ 
     }
 
     public function getDataFormat($format) {
-        $reduced = array_filter($this->getDatas(), function ($data) use ($format) {
+        $reduced = array_filter($this->getDatas(), function($data) use ($format) {
             return $data->format == $format;
         });
         return reset($reduced);
@@ -454,7 +454,7 @@ 
             }
             $epub->Authors($authorArray);
             $epub->Language($this->getLanguages());
-            $epub->Description ($this->getComment(false));
+            $epub->Description($this->getComment(false));
             $epub->Subjects($this->getTagsName());
             // -DC- Use cover file name
             // $epub->Cover2($this->getFilePath('jpg'), 'image/jpeg');
@@ -466,7 +466,7 @@ 
                 $epub->SerieIndex($this->seriesIndex);
             }
             $filename = $data->getUpdatedFilenameEpub();
-            if ($config['cops_provide_kepub'] == '1'  && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
+            if ($config['cops_provide_kepub'] == '1' && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
                 $epub->updateForKepub();
                 $filename = $data->getUpdatedFilenameKepub();
             }
@@ -494,11 +494,11 @@ 
             if (!is_null($width)) {
                 $nw = $width;
                 if ($nw >= $w) { return false; }
-                $nh = ($nw*$h)/$w;
+                $nh = ($nw * $h) / $w;
             } else {
                 $nh = $height;
                 if ($nh >= $h) { return false; }
-                $nw = ($nh*$w)/$h;
+                $nw = ($nh * $w) / $h;
             }
         } else {
             return false;
@@ -506,16 +506,16 @@ 
 
         //draw the image
         $src_img = imagecreatefromjpeg($file);
-        $dst_img = imagecreatetruecolor($nw,$nh);
-        imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h);//resizing the image
-        imagejpeg($dst_img,$outputfile,80);
+        $dst_img = imagecreatetruecolor($nw, $nh);
+        imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h); //resizing the image
+        imagejpeg($dst_img, $outputfile, 80);
         imagedestroy($src_img);
         imagedestroy($dst_img);
 
         return true;
     }
 
-    public function getLinkArray ()
+    public function getLinkArray()
     {
         $linkArray = array();
 
@@ -548,7 +548,7 @@ 
         }
 
         $serie = $this->getSerie();
-        if (!is_null ($serie)) {
+        if (!is_null($serie)) {
             array_push($linkArray, new LinkNavigation($serie->getUri(), 'related', str_format(localize('content.series.data'), $this->seriesIndex, $serie->name)));
         }
 
@@ -573,13 +573,13 @@ 
         $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);
+                          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']);
+                              array(new LinkNavigation('?page=' . parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
             array_push($result, $entry);
         }
         return $result;
@@ -675,7 +675,7 @@ 
     }
 
     public static function getBooks($n) {
-        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL , array (), $n);
+        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL, array(), $n);
         return array($entryArray, $totalNumber);
     }
 
@@ -692,7 +692,7 @@ 
         {
             array_push($entryArray, new Entry($post->title, Book::getEntryIdByLetter($post->title),
                 str_format(localize('bookword', $post->count), $post->count), 'text',
-                array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS_LETTER.'&id='. rawurlencode($post->title))), '', $post->count));
+                array(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS_LETTER . '&id=' . rawurlencode($post->title))), '', $post->count));
         }
         return $entryArray;
     }
@@ -717,7 +717,7 @@ 
 
     public static function getAllRecentBooks() {
         global $config;
-        list ($entryArray, ) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
+        list ($entryArray,) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
         return $entryArray;
     }
 

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: 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);
@@ -35,7 +35,7 @@ 
     }
 
     if (!$book) {
-        notFound ();
+        notFound();
         return;
     }
 
@@ -65,15 +65,15 @@ 
         		}
             //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') . '.' . $type;
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
@@ -83,20 +83,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;
                 }
             }

lib/Tag.php

Spacing +19 added lines, -19 removed lines

@@ -20,24 +20,24 @@ 
         $this->name = $post->name;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_TAG_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_TAG_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_TAGS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_TAGS_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("tags.alphabetical", count(array))
-        return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
+        return parent::getCountGeneric("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
-        $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
-        $result->execute (array ($tagId));
-        if ($post = $result->fetchObject ()) {
-            return new Tag ($post);
+    public static function getTagById($tagId) {
+        $result = parent::getDb()->prepare('select id, name  from tags where id = ?');
+        $result->execute(array($tagId));
+        if ($post = $result->fetchObject()) {
+            return new Tag($post);
         }
         return NULL;
     }
@@ -51,21 +51,21 @@ 
     		$sql = str_replace('tags.name', 'tags.' . $sortField, $sql);
     	}
 
-        return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
+        return Base::getEntryArrayWithBookNumber($sql, self::TAG_COLUMNS, array(), "Tag");
     }
 
     public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
-        $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
+        $columns = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
-        list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);
+        list ($totalNumber, $result) = parent::executeQuery($sql, $columns, "", array('%' . $query . '%'), $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $tag = new Tag ($post);
-            array_push ($entryArray, new Entry ($tag->name, $tag->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($tag->getUri ()))));
+            $tag = new Tag($post);
+            array_push($entryArray, new Entry($tag->name, $tag->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($tag->getUri()))));
         }
-        return array ($entryArray, $totalNumber);
+        return array($entryArray, $totalNumber);
     }
 }