mbirth / cops

lib/Base.php

Braces +43 added lines, -23 removed lines

@@ -37,23 +37,27 @@ 
 
     private static $db = NULL;
 
-    public static function isMultipleDatabaseEnabled () {
+    public static function isMultipleDatabaseEnabled ()
+    {
         global $config;
         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:
     }
 
-    public static function noDatabaseSelected () {
+    public static function noDatabaseSelected ()
+    {
         return self::isMultipleDatabaseEnabled () && is_null (GetUrlParam (DB));
     }
 
-    public static function getDbList () {
+    public static function getDbList ()
+    {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
             return $config['calibre_directory'];
@@ -62,7 +66,8 @@ 
         }
     }
 
-    public static function getDbNameList () {
+    public static function getDbNameList ()
+    {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
             return array_keys ($config['calibre_directory']);
@@ -71,10 +76,13 @@ 
         }
     }
 
-    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 (is_null ($database)) {
+                $database = GetUrlParam (DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 return self::error ($database);
             }
@@ -84,10 +92,13 @@ 
         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 (is_null ($database)) {
+                $database = GetUrlParam (DB, 0);
+            }
             if (!is_null($database) && !preg_match('/^\d+$/', $database)) {
                 return self::error ($database);
             }
@@ -98,18 +109,21 @@ 
     }
 
 
-    public static function getDbFileName ($database = NULL) {
+    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) {
+    public static function getDb ($database = NULL)
+    {
         if (is_null (self::$db)) {
             try {
                 if (is_readable (self::getDbFileName ($database))) {
@@ -127,7 +141,8 @@ 
         return self::$db;
     }
 
-    public static function checkDatabaseAvailability () {
+    public static function checkDatabaseAvailability ()
+    {
         if (self::noDatabaseSelected ()) {
             for ($i = 0; $i < count (self::getDbList ()); $i++) {
                 self::getDb ($i);
@@ -139,31 +154,36 @@ 
         return true;
     }
 
-    public static function clearDb () {
+    public static function clearDb ()
+    {
         self::$db = NULL;
     }
 
-    public static function executeQuerySingle ($query, $database = NULL) {
+    public static function executeQuerySingle ($query, $database = NULL)
+    {
         return self::getDb ($database)->query($query)->fetchColumn();
     }
 
-    public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
+    public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL)
+    {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
         }
         $count = self::executeQuerySingle ('select count(*) from ' . $table);
-        if ($count == 0) return NULL;
+        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);
         return $entry;
     }
 
-    public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
+    public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category)
+    {
         list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $instance = new $category ($post);
             if (property_exists($post, "sort")) {
                 $title = $post->sort;
@@ -177,7 +197,8 @@ 
         return $entryArray;
     }
 
-    public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $totalResult = -1;
 
         if (useNormAndUp ()) {
@@ -189,8 +210,7 @@ 
             $numberPerPage = getCurrentOption ("max_item_per_page");
         }
 
-        if ($numberPerPage != -1 && $n != -1)
-        {
+        if ($numberPerPage != -1 && $n != -1) {
             // First check total number of results
             $result = self::getDb ($database)->prepare (str_format ($query, "count(*)", $filter));
             $result->execute ($params);

lib/Entry.php

Braces +11 added lines, -8 removed lines

@@ -31,7 +31,8 @@ 
         Publisher::ALL_PUBLISHERS_ID => 'images/publisher.png'
     );
 
-    public function getUpdatedTime () {
+    public function getUpdatedTime ()
+    {
         if (!is_null ($this->localUpdated)) {
             return date (DATE_ATOM, $this->localUpdated);
         }
@@ -41,7 +42,8 @@ 
         return date (DATE_ATOM, self::$updated);
     }
 
-    public function getNavLink () {
+    public function getNavLink ()
+    {
         foreach ($this->linkArray as $link) {
             if ($link->type != Link::OPDS_NAVIGATION_TYPE) { continue; }
 
@@ -50,7 +52,8 @@ 
         return "#";
     }
 
-    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pclass = "", $pcount = 0) {
+    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pclass = "", $pcount = 0)
+    {
         global $config;
         $this->title = $ptitle;
         $this->id = $pid;
@@ -60,10 +63,8 @@ 
         $this->className = $pclass;
         $this->numberOfElement = $pcount;
 
-        if ($config['cops_show_icons'] == 1)
-        {
-            foreach (self::$icons as $reg => $image)
-            {
+        if ($config['cops_show_icons'] == 1) {
+            foreach (self::$icons as $reg => $image) {
                 if (preg_match ("/" . $reg . "/", $pid)) {
                     array_push ($this->linkArray, new Link (getUrlWithVersion ($image), "image/png", Link::OPDS_THUMBNAIL_TYPE));
                     break;
@@ -71,6 +72,8 @@ 
             }
         }
 
-        if (!is_null (GetUrlParam (DB))) $this->id = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $this->id);
+        if (!is_null (GetUrlParam (DB))) {
+            $this->id = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $this->id);
+        }
     }
 }

lib/Link.php

Braces +6 added lines, -3 removed lines

@@ -21,7 +21,8 @@ 
     public $facetGroup;
     public $activeFacet;
 
-    public function __construct($phref, $ptype, $prel = NULL, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptype, $prel = NULL, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE)
+    {
         $this->href = $phref;
         $this->type = $ptype;
         $this->rel = $prel;
@@ -30,11 +31,13 @@ 
         $this->activeFacet = $pactiveFacet;
     }
 
-    public function hrefXhtml () {
+    public function hrefXhtml ()
+    {
         return $this->href;
     }
 
-    public function getScriptName() {
+    public function getScriptName()
+    {
         $parts = explode('/', $_SERVER["SCRIPT_NAME"]);
         return $parts[count($parts) - 1];
     }

lib/JSON_renderer.php

Braces +16 added lines, -9 removed lines

@@ -10,12 +10,12 @@ 
 
 class JSONRenderer
 {
-    public static function getBookContentArray ($book) {
+    public static function getBookContentArray ($book)
+    {
         global $config;
         $i = 0;
         $preferedData = array ();
-        foreach ($config['cops_prefered_format'] as $format)
-        {
+        foreach ($config['cops_prefered_format'] as $format) {
             if ($i == 2) { break; }
             if ($data = $book->getDataFormat ($format)) {
                 $i++;
@@ -61,7 +61,8 @@ 
                       "seriesurl" => $su);
     }
 
-    public static function getFullBookContentArray ($book) {
+    public static function getFullBookContentArray ($book)
+    {
         global $config;
         $out = self::getBookContentArray ($book);
         $database = GetUrlParam (DB);
@@ -95,7 +96,8 @@ 
         return $out;
     }
 
-    public static function getContentArray ($entry) {
+    public static function getContentArray ($entry)
+    {
         if ($entry instanceof EntryBook) {
             $out = array ( "title" => $entry->title);
             $out ["book"] = self::getBookContentArray ($entry->book);
@@ -104,7 +106,8 @@ 
         return array ( "title" => $entry->title, "content" => $entry->content, "navlink" => $entry->getNavLink (), "number" => $entry->numberOfElement );
     }
 
-    public static function getContentArrayTypeahead ($page) {
+    public static function getContentArrayTypeahead ($page)
+    {
         $out = array ();
         foreach ($page->entryArray as $entry) {
             if ($entry instanceof EntryBook) {
@@ -120,7 +123,8 @@ 
         return $out;
     }
 
-    public static function addCompleteArray ($in) {
+    public static function addCompleteArray ($in)
+    {
         global $config;
         $out = $in;
 
@@ -167,7 +171,8 @@ 
         return $out;
     }
 
-    public static function getJson ($complete = false) {
+    public static function getJson ($complete = false)
+    {
         global $config;
         $page = getURLParam ("page", Base::PAGE_INDEX);
         $query = getURLParam ("query");
@@ -236,7 +241,9 @@ 
         }
 
         $out ["homeurl"] = "index.php";
-        if ($page != Base::PAGE_INDEX && !is_null ($database)) $out ["homeurl"] = $out ["homeurl"] .  "?" . addURLParameter ("", DB, $database);
+        if ($page != Base::PAGE_INDEX && !is_null ($database)) {
+            $out ["homeurl"] = $out ["homeurl"] .  "?" . addURLParameter ("", DB, $database);
+        }
 
         return $out;
     }

lib/Author.php

Braces +25 added lines, -14 removed lines

@@ -19,37 +19,42 @@ 
     public $name;
     public $sort;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = str_replace("|", ",", $post->name);
         $this->sort = $post->sort;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_AUTHOR_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_AUTHORS_ID.":".$this->id;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
+    public static function getEntryIdByLetter ($startingLetter)
+    {
         return self::ALL_AUTHORS_ID.":letter:".$startingLetter;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("authors.alphabetical", count(array))
         return parent::getCountGeneric ("authors", self::ALL_AUTHORS_ID, parent::PAGE_ALL_AUTHORS);
     }
 
-    public static function getAllAuthorsByFirstLetter() {
+    public static function getAllAuthorsByFirstLetter()
+    {
         list (, $result) = parent::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);
         $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=".parent::PAGE_AUTHORS_FIRST_LETTER."&id=". rawurlencode ($post->title))), "", $post->count));
@@ -57,30 +62,36 @@ 
         return $entryArray;
     }
 
-    public static function getAuthorsByStartingLetter($letter) {
+    public static function getAuthorsByStartingLetter($letter)
+    {
         return self::getEntryArray (self::SQL_AUTHORS_BY_FIRST_LETTER, array ($letter . "%"));
     }
 
-    public static function getAuthorsForSearch($query) {
+    public static function getAuthorsForSearch($query)
+    {
         return self::getEntryArray (self::SQL_AUTHORS_FOR_SEARCH, array ($query . "%", $query . "%"));
     }
 
-    public static function getAllAuthors() {
+    public static function getAllAuthors()
+    {
         return self::getEntryArray (self::SQL_ALL_AUTHORS, array ());
     }
 
-    public static function getEntryArray ($query, $params) {
+    public static function getEntryArray ($query, $params)
+    {
         return Base::getEntryArrayWithBookNumber ($query, self::AUTHOR_COLUMNS, $params, "Author");
     }
 
-    public static function getAuthorById ($authorId) {
+    public static function getAuthorById ($authorId)
+    {
         $result = parent::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) {
+    public static function getAuthorByBookId ($bookId)
+    {
         $result = parent::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 = ?');

lib/Serie.php

Braces +16 added lines, -8 removed lines

@@ -16,25 +16,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_SERIE_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_SERIES_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("series.alphabetical", count(array))
         return parent::getCountGeneric ("series", self::ALL_SERIES_ID, parent::PAGE_ALL_SERIES);
     }
 
-    public static function getSerieByBookId ($bookId) {
+    public static function getSerieByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select  series.id as id, name
 from books_series_link, series
 where series.id = series and book = ?');
@@ -45,7 +50,8 @@ 
         return NULL;
     }
 
-    public static function getSerieById ($serieId) {
+    public static function getSerieById ($serieId)
+    {
         $result = parent::getDb ()->prepare('select id, name  from series where id = ?');
         $result->execute (array ($serieId));
         if ($post = $result->fetchObject ()) {
@@ -54,11 +60,13 @@ 
         return NULL;
     }
 
-    public static function getAllSeries() {
+    public static function getAllSeries()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_SERIES, self::SERIES_COLUMNS, array (), "Serie");
     }
 
-    public static function getAllSeriesByQuery($query) {
+    public static function getAllSeriesByQuery($query)
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_SERIES_FOR_SEARCH, self::SERIES_COLUMNS, array ('%' . $query . '%'), "Serie");
     }
 }

lib/OPDS_renderer.php

Braces +32 added lines, -24 removed lines

@@ -13,14 +13,16 @@ 
     private $xmlStream = NULL;
     private $updated = NULL;
 
-    private function getUpdatedTime () {
+    private function getUpdatedTime ()
+    {
         if (is_null ($this->updated)) {
             $this->updated = time();
         }
         return date (DATE_ATOM, $this->updated);
     }
 
-    private function getXmlStream () {
+    private function getXmlStream ()
+    {
         if (is_null ($this->xmlStream)) {
             $this->xmlStream = new XMLWriter();
             $this->xmlStream->openMemory();
@@ -29,7 +31,8 @@ 
         return $this->xmlStream;
     }
 
-    public function getOpenSearch () {
+    public function getOpenSearch ()
+    {
         global $config;
         $xml = new XMLWriter ();
         $xml->openMemory ();
@@ -58,7 +61,9 @@ 
                 $xml->startElement ("Url");
                     $xml->writeAttribute ("type", 'application/atom+xml');
                     $urlparam = "?query={searchTerms}";
-                    if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+                    if (!is_null (GetUrlParam (DB))) {
+                        $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+                    }
                     $urlparam = str_replace ("%7B", "{", $urlparam);
                     $urlparam = str_replace ("%7D", "}", $urlparam);
                     $xml->writeAttribute ("template", $config['cops_full_url'] . 'feed.php' . $urlparam);
@@ -72,7 +77,8 @@ 
         return $xml->outputMemory(true);
     }
 
-    private function startXmlDocument ($page) {
+    private function startXmlDocument ($page)
+    {
         global $config;
         self::getXmlStream ()->startDocument('1.0','UTF-8');
         self::getXmlStream ()->startElement ("feed");
@@ -84,21 +90,19 @@ 
             self::getXmlStream ()->startElement ("title");
                 self::getXmlStream ()->text ($page->title);
             self::getXmlStream ()->endElement ();
-            if ($page->subtitle != "")
-            {
+            if ($page->subtitle != "") {
                 self::getXmlStream ()->startElement ("subtitle");
                     self::getXmlStream ()->text ($page->subtitle);
                 self::getXmlStream ()->endElement ();
             }
             self::getXmlStream ()->startElement ("id");
-                if ($page->idPage)
-                {
+                if ($page->idPage) {
                     $idPage = $page->idPage;
-                    if (!is_null (GetUrlParam (DB))) $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage);
+                    if (!is_null (GetUrlParam (DB))) {
+                        $idPage = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $idPage);
+                    }
                     self::getXmlStream ()->text ($idPage);
-                }
-                else
-                {
+                } else {
                     self::getXmlStream ()->text ($_SERVER['REQUEST_URI']);
                 }
             self::getXmlStream ()->endElement ();
@@ -124,14 +128,14 @@ 
             $link = new LinkNavigation ("?" . getQueryString (), "self");
             self::renderLink ($link);
             $urlparam = "?";
-            if (!is_null (GetUrlParam (DB))) $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+            if (!is_null (GetUrlParam (DB))) {
+                $urlparam = addURLParameter ($urlparam, DB, GetUrlParam (DB));
+            }
             if ($config['cops_generate_invalid_opds_stream'] == 0 || preg_match("/(MantanoReader|FBReader)/", $_SERVER['HTTP_USER_AGENT'])) {
                 // Good and compliant way of handling search
                 $urlparam = addURLParameter ($urlparam, "page", Base::PAGE_OPENSEARCH);
                 $link = new Link ("feed.php" . $urlparam, "application/opensearchdescription+xml", "search", "Search here");
-            }
-            else
-            {
+            } else {
                 // Bad way, will be removed when OPDS client are fixed
                 $urlparam = addURLParameter ($urlparam, "query", "{searchTerms}");
                 $urlparam = str_replace ("%7B", "{", $urlparam);
@@ -148,13 +152,15 @@ 
             }
     }
 
-    private function endXmlDocument () {
+    private function endXmlDocument ()
+    {
         self::getXmlStream ()->endElement ();
         self::getXmlStream ()->endDocument ();
         return self::getXmlStream ()->outputMemory(true);
     }
 
-    private function renderLink ($link) {
+    private function renderLink ($link)
+    {
         self::getXmlStream ()->startElement ("link");
             self::getXmlStream ()->writeAttribute ("href", $link->href);
             self::getXmlStream ()->writeAttribute ("type", $link->type);
@@ -173,7 +179,8 @@ 
         self::getXmlStream ()->endElement ();
     }
 
-    private function getPublicationDate($book) {
+    private function getPublicationDate($book)
+    {
         $dateYmd = substr($book->pubdate, 0, 10);
         $pubdate = \DateTime::createFromFormat('Y-m-d', $dateYmd);
         if ($pubdate === false ||
@@ -184,7 +191,8 @@ 
         return $pubdate->format("Y-m-d");
     }
 
-    private function renderEntry ($entry) {
+    private function renderEntry ($entry)
+    {
         self::getXmlStream ()->startElement ("title");
             self::getXmlStream ()->text ($entry->title);
         self::getXmlStream ()->endElement ();
@@ -244,11 +252,11 @@ 
 
     }
 
-    public function render ($page) {
+    public function render ($page)
+    {
         global $config;
         self::startXmlDocument ($page);
-        if ($page->isPaginated ())
-        {
+        if ($page->isPaginated ()) {
             self::getXmlStream ()->startElement ("opensearch:totalResults");
                 self::getXmlStream ()->text ($page->totalNumber);
             self::getXmlStream ()->endElement ();

lib/Publisher.php

Braces +16 added lines, -8 removed lines

@@ -17,25 +17,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_PUBLISHER_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_PUBLISHERS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("publishers.alphabetical", count(array))
         return parent::getCountGeneric ("publishers", self::ALL_PUBLISHERS_ID, parent::PAGE_ALL_PUBLISHERS);
     }
 
-    public static function getPublisherByBookId ($bookId) {
+    public static function getPublisherByBookId ($bookId)
+    {
         $result = parent::getDb ()->prepare('select publishers.id as id, name
 from books_publishers_link, publishers
 where publishers.id = publisher and book = ?');
@@ -46,7 +51,8 @@ 
         return NULL;
     }
 
-    public static function getPublisherById ($publisherId) {
+    public static function getPublisherById ($publisherId)
+    {
         $result = parent::getDb ()->prepare('select id, name
 from publishers where id = ?');
         $result->execute (array ($publisherId));
@@ -56,11 +62,13 @@ 
         return NULL;
     }
 
-    public static function getAllPublishers() {
+    public static function getAllPublishers()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_PUBLISHERS, self::PUBLISHERS_COLUMNS, array (), "Publisher");
     }
 
-    public static function getAllPublishersByQuery($query) {
+    public static function getAllPublishersByQuery($query)
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_PUBLISHERS_FOR_SEARCH, self::PUBLISHERS_COLUMNS, array ('%' . $query . '%'), "Publisher");
     }
 }

lib/Tag.php

Braces +15 added lines, -9 removed lines

@@ -15,25 +15,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_TAG_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_TAGS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("tags.alphabetical", count(array))
         return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
+    public static function getTagById ($tagId)
+    {
         $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
         $result->execute (array ($tagId));
         if ($post = $result->fetchObject ()) {
@@ -42,17 +47,18 @@ 
         return NULL;
     }
 
-    public static function getAllTags() {
+    public static function getAllTags()
+    {
         return Base::getEntryArrayWithBookNumber (self::SQL_ALL_TAGS, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    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";
         $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);
         $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",