mbirth / cops

lib/Author.php

Spacing +29 added lines, -29 removed lines

@@ -25,69 +25,69 @@
         $this->sort = $post->sort;
     }
 
-    public function getUri () {
-        return "?page=".Base::PAGE_AUTHOR_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . Base::PAGE_AUTHOR_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_AUTHORS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_AUTHORS_ID . ":" . $this->id;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
-        return self::ALL_AUTHORS_ID.":letter:".$startingLetter;
+    public static function getEntryIdByLetter($startingLetter) {
+        return self::ALL_AUTHORS_ID . ":letter:" . $startingLetter;
     }
 
     public static function getCount() {
         // str_format (localize("authors.alphabetical", count(array))
-        return Base::getCountGeneric ("authors", self::ALL_AUTHORS_ID, Base::PAGE_ALL_AUTHORS);
+        return Base::getCountGeneric("authors", self::ALL_AUTHORS_ID, Base::PAGE_ALL_AUTHORS);
     }
 
     public static function getAllAuthorsByFirstLetter() {
-        list (, $result) = Base::executeQuery ("select {0}
+        list (, $result) = Base::executeQuery("select {0}
 from authors
 group by substr (upper (sort), 1, 1)
-order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array (), -1);
+order by substr (upper (sort), 1, 1)", "substr (upper (sort), 1, 1) as title, count(*) as count", "", array(), -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            array_push ($entryArray, new Entry ($post->title, Author::getEntryIdByLetter ($post->title),
-                str_format (localize("authorword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ("?page=".Base::PAGE_AUTHORS_FIRST_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
+            array_push($entryArray, new Entry($post->title, Author::getEntryIdByLetter($post->title),
+                str_format(localize("authorword", $post->count), $post->count), "text",
+                array(new LinkNavigation("?page=" . Base::PAGE_AUTHORS_FIRST_LETTER . "&id=" . rawurlencode($post->title))), "", $post->count));
         }
         return $entryArray;
     }
 
     public static function getAuthorsByStartingLetter($letter) {
-        return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%"));
+        return self::getEntryArray(self::SQL_AUTHORS_BY_FIRST_LETTER, array($letter . "%"));
     }
 
     public static function getAuthorsForSearch($query) {
-        return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%"));
+        return self::getEntryArray(self::SQL_AUTHORS_FOR_SEARCH, array($query . "%", $query . "%"));
     }
 
     public static function getAllAuthors() {
-        return self::getEntryArray (self::SQL_ALL_AUTHORS, array ());
+        return self::getEntryArray(self::SQL_ALL_AUTHORS, array());
     }
 
-    public static function getEntryArray ($query, $params) {
-        return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
+    public static function getEntryArray($query, $params) {
+        return Base::getEntryArrayWithBookNumber($query, self::AUTHOR_COLUMNS, $params, "Author");
     }
 
-    public static function getAuthorById ($authorId) {
-        $result = Base::getDb ()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
-        $result->execute (array ($authorId));
-        $post = $result->fetchObject ();
-        return new Author ($post);
+    public static function getAuthorById($authorId) {
+        $result = Base::getDb()->prepare('select ' . self::AUTHOR_COLUMNS . ' from authors where id = ?');
+        $result->execute(array($authorId));
+        $post = $result->fetchObject();
+        return new Author($post);
     }
 
-    public static function getAuthorByBookId ($bookId) {
-        $result = Base::getDb ()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
+    public static function getAuthorByBookId($bookId) {
+        $result = Base::getDb()->prepare('select authors.id as id, authors.name as name, authors.sort as sort from authors, books_authors_link
 where author = authors.id
 and book = ?');
-        $result->execute (array ($bookId));
-        $authorArray = array ();
-        while ($post = $result->fetchObject ()) {
-            array_push ($authorArray, new Author ($post));
+        $result->execute(array($bookId));
+        $authorArray = array();
+        while ($post = $result->fetchObject()) {
+            array_push($authorArray, new Author($post));
         }
         return $authorArray;
     }

lib/Rating.php

Spacing +20 added lines, -20 removed lines

@@ -11,7 +11,7 @@ 
     const ALL_RATING_ID = "cops:rating";
 
     const RATING_COLUMNS = "ratings.id as id, ratings.rating as rating, count(*) as count";
-    const SQL_ALL_RATINGS ="select {0} from ratings, books_ratings_link where books_ratings_link.rating = ratings.id group by ratings.id order by ratings.rating";
+    const SQL_ALL_RATINGS = "select {0} from ratings, books_ratings_link where books_ratings_link.rating = ratings.id group by ratings.id order by ratings.rating";
     public $id;
     public $name;
 
@@ -20,41 +20,41 @@ 
         $this->name = $pname;
     }
 
-    public function getUri () {
-        return "?page=".Base::PAGE_RATING_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . Base::PAGE_RATING_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_RATING_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_RATING_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("ratings", count(array))
-        return Base::getCountGeneric ("ratings", self::ALL_RATING_ID, Base::PAGE_ALL_RATINGS, "ratings");
+        return Base::getCountGeneric("ratings", self::ALL_RATING_ID, Base::PAGE_ALL_RATINGS, "ratings");
     }
 
     public static function getAllRatings() {
-        return self::getEntryArray (self::SQL_ALL_RATINGS, array ());
+        return self::getEntryArray(self::SQL_ALL_RATINGS, array());
     }
 
-    public static function getEntryArray ($query, $params) {
-        list (, $result) = Base::executeQuery ($query, self::RATING_COLUMNS, "", $params, -1);
+    public static function getEntryArray($query, $params) {
+        list (, $result) = Base::executeQuery($query, self::RATING_COLUMNS, "", $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $ratingObj = new Rating ($post->id, $post->rating);
-            $rating=$post->rating/2;
-            $rating = str_format (localize("ratingword", $rating), $rating);
-            array_push ($entryArray, new Entry ($rating, $ratingObj->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($ratingObj->getUri ())), "", $post->count));
+            $ratingObj = new Rating($post->id, $post->rating);
+            $rating = $post->rating / 2;
+            $rating = str_format(localize("ratingword", $rating), $rating);
+            array_push($entryArray, new Entry($rating, $ratingObj->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($ratingObj->getUri())), "", $post->count));
         }
         return $entryArray;
     }
 
-    public static function getRatingById ($ratingId) {
-        $result = Base::getDb ()->prepare('select rating from ratings where id = ?');
-        $result->execute (array ($ratingId));
-        return new Rating ($ratingId, $result->fetchColumn ());
+    public static function getRatingById($ratingId) {
+        $result = Base::getDb()->prepare('select rating from ratings where id = ?');
+        $result->execute(array($ratingId));
+        return new Rating($ratingId, $result->fetchColumn());
     }
 }

epubreader.php

Spacing +2 added lines, -2 removed lines

@@ -15,8 +15,8 @@
 
 $idData = getURLParam('data', NULL);
 $add = 'data=' . $idData . '&';
-if (!is_null (GetUrlParam (DB))) {
-    $add .= DB . '=' . GetUrlParam (DB) . '&';
+if (!is_null(GetUrlParam(DB))) {
+    $add .= DB . '=' . GetUrlParam(DB) . '&';
 }
 $myBook = Book::getBookByDataId($idData);
 

lib/Base.php

Spacing +11 added lines, -11 removed lines

@@ -40,15 +40,15 @@ 
     public static function isMultipleDatabaseEnabled()
     {
         global $config;
-        return is_array ($config['calibre_directory']);
+        return is_array($config['calibre_directory']);
     }
 
     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()
@@ -70,9 +70,9 @@ 
     {
         global $config;
         if (self::isMultipleDatabaseEnabled()) {
-            return array_keys ($config['calibre_directory']);
+            return array_keys($config['calibre_directory']);
         } else {
-            return array ('');
+            return array('');
         }
     }
 
@@ -106,7 +106,7 @@ 
 
     public static function getDbFileName($database = NULL)
     {
-        return self::getDbDirectory($database) .'metadata.db';
+        return self::getDbDirectory($database) . 'metadata.db';
     }
 
     private static function error($database)
@@ -117,12 +117,12 @@ 
         throw new Exception('Database <' . $database . '> not found.');
     }
 
-    public static function getDb ($database = NULL)
+    public static function getDb($database = NULL)
     {
-        if (is_null (self::$db)) {
+        if (is_null(self::$db)) {
             try {
-                if (is_readable(self::getDbFileName ($database))) {
-                    self::$db = new PDO('sqlite:'. self::getDbFileName($database));
+                if (is_readable(self::getDbFileName($database))) {
+                    self::$db = new PDO('sqlite:' . self::getDbFileName($database));
                     if (useNormAndUp()) {
                         self::$db->sqliteCreateFunction('normAndUp', 'normAndUp', 1);
                     }
@@ -170,7 +170,7 @@ 
         }
         $entry = new Entry(localize($table . '.title'), $id,
             str_format(localize($numberOfString, $count), $count), 'text',
-            array(new LinkNavigation('?page='.$pageId)), '', $count);
+            array(new LinkNavigation('?page=' . $pageId)), '', $count);
         return $entry;
     }