mbirth / cops

base.php

Doc Comments +11 added lines

@@ -60,6 +60,9 @@ 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
+/**
+ * @param string $name
+ */
 function getURLParam ($name, $default = NULL) {
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
         return $_GET[$name];
@@ -95,6 +98,11 @@ 
     return $url . "?v=" . VERSION;
 }
 
+/**
+ * @param string $xml
+ *
+ * @return string
+ */
 function xml2xhtml($xml) {
     return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', create_function('$m', '
         $xhtml_tags = array("br", "hr", "input", "frame", "img", "area", "link", "col", "base", "basefont", "param");
@@ -308,6 +316,9 @@ 
     return $phrase;
 }
 
+/**
+ * @param string $paramName
+ */
 function addURLParameter($urlParams, $paramName, $paramValue) {
     if (empty ($urlParams)) {
         $urlParams = "";

Braces +58 added lines, -32 removed lines

@@ -13,12 +13,14 @@ 
 date_default_timezone_set($config['default_timezone']);
 
 
-function useServerSideRendering () {
+function useServerSideRendering ()
+{
     global $config;
     return preg_match("/" . $config['cops_server_side_render'] . "/", $_SERVER['HTTP_USER_AGENT']);
 }
 
-function serverSideRender ($data) {
+function serverSideRender ($data)
+{
     // Get the templates
     $theme = getCurrentTemplate ();
     $header = file_get_contents('templates/' . $theme . '/header.html');
@@ -46,28 +48,32 @@ 
     return NULL;
 }
 
-function getQueryString () {
+function getQueryString ()
+{
     if ( isset($_SERVER['QUERY_STRING']) ) {
         return $_SERVER['QUERY_STRING'];
     }
     return "";
 }
 
-function notFound () {
+function notFound ()
+{
     header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
     header("Status: 404 Not Found");
 
     $_SERVER['REDIRECT_STATUS'] = 404;
 }
 
-function getURLParam ($name, $default = NULL) {
+function getURLParam ($name, $default = NULL)
+{
     if (!empty ($_GET) && isset($_GET[$name]) && $_GET[$name] != "") {
         return $_GET[$name];
     }
     return $default;
 }
 
-function getCurrentOption ($option) {
+function getCurrentOption ($option)
+{
     global $config;
     if (isset($_COOKIE[$option])) {
         if (isset($config ["cops_" . $option]) && is_array ($config ["cops_" . $option])) {
@@ -83,19 +89,23 @@ 
     return "";
 }
 
-function getCurrentCss () {
+function getCurrentCss ()
+{
     return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
 }
 
-function getCurrentTemplate () {
+function getCurrentTemplate ()
+{
     return getCurrentOption ("template");
 }
 
-function getUrlWithVersion ($url) {
+function getUrlWithVersion ($url)
+{
     return $url . "?v=" . VERSION;
 }
 
-function xml2xhtml($xml) {
+function xml2xhtml($xml)
+{
     return preg_replace_callback('#<(\w+)([^>]*)\s*/>#s', create_function('$m', '
         $xhtml_tags = array("br", "hr", "input", "frame", "img", "area", "link", "col", "base", "basefont", "param");
         return in_array($m[1], $xhtml_tags) ? "<$m[1]$m[2] />" : "<$m[1]$m[2]></$m[1]>";
@@ -135,12 +145,15 @@ 
     $errors = libxml_get_errors();
 
     foreach ($errors as $error) {
-        if ($error->code == 801) return false;
+        if ($error->code == 801) {
+            return false;
+        }
     }
     return true;
 }
 
-function html2xhtml ($html) {
+function html2xhtml ($html)
+{
     $doc = new DOMDocument();
     libxml_use_internal_errors(true);
 
@@ -160,7 +173,9 @@ 
     }
     */
 
-    if (!are_libxml_errors_ok ()) $output = "HTML code not valid.";
+    if (!are_libxml_errors_ok ()) {
+        $output = "HTML code not valid.";
+    }
 
     libxml_use_internal_errors(false);
     return $output;
@@ -170,7 +185,8 @@ 
  * This method is a direct copy-paste from
  * http://tmont.com/blargh/2010/1/string-format-in-php
  */
-function str_format($format) {
+function str_format($format)
+{
     $args = func_get_args();
     $format = array_shift($args);
 
@@ -190,7 +206,8 @@ 
  * languages id are normalized : fr-fr -> fr_FR
  * @return array of languages
  */
-function getAcceptLanguages() {
+function getAcceptLanguages()
+{
     $langs = array();
 
     if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
@@ -218,7 +235,9 @@ 
 
             // set default to 1 for any without q factor
             foreach ($langs as $lang => $val) {
-                if ($val === '') $langs[$lang] = 1;
+                if ($val === '') {
+                    $langs[$lang] = 1;
+                }
             }
 
             // sort list based on value
@@ -233,14 +252,14 @@ 
  * Find the best translation file possible based on the accepted languages
  * @return array of language and language file
  */
-function getLangAndTranslationFile() {
+function getLangAndTranslationFile()
+{
     global $config;
     $langs = array();
     $lang = "en";
     if (!empty($config['cops_language'])) {
         $lang = $config['cops_language'];
-    }
-    elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+    } elseif (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
         $langs = getAcceptLanguages();
     }
     //echo var_dump($langs);
@@ -263,14 +282,18 @@ 
  * This method is based on this page
  * http://www.mind-it.info/2010/02/22/a-simple-approach-to-localization-in-php/
  */
-function localize($phrase, $count=-1, $reset=false) {
+function localize($phrase, $count=-1, $reset=false)
+{
     global $config;
-    if ($count == 0)
-        $phrase .= ".none";
-    if ($count == 1)
-        $phrase .= ".one";
-    if ($count > 1)
-        $phrase .= ".many";
+    if ($count == 0) {
+            $phrase .= ".none";
+    }
+    if ($count == 1) {
+            $phrase .= ".one";
+    }
+    if ($count > 1) {
+            $phrase .= ".many";
+    }
 
     /* Static keyword is used to ensure the file is loaded only once */
     static $translations = NULL;
@@ -295,8 +318,7 @@ 
                 unset ($translations [$key]);
             }
         }
-        if ($lang_file_en)
-        {
+        if ($lang_file_en) {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
             $translations = array_merge ($translations_en, $translations);
@@ -308,7 +330,8 @@ 
     return $phrase;
 }
 
-function addURLParameter($urlParams, $paramName, $paramValue) {
+function addURLParameter($urlParams, $paramName, $paramValue)
+{
     if (empty ($urlParams)) {
         $urlParams = "";
     }
@@ -327,16 +350,19 @@ 
     return $start . http_build_query($params);
 }
 
-function useNormAndUp () {
+function useNormAndUp ()
+{
     global $config;
     return $config ['cops_normalized_search'] == "1";
 }
 
-function normalizeUtf8String( $s) {
+function normalizeUtf8String( $s)
+{
     include_once 'transliteration.php';
     return _transliteration_process($s);
 }
 
-function normAndUp ($s) {
+function normAndUp ($s)
+{
     return mb_strtoupper (normalizeUtf8String($s), 'UTF-8');
 }

lib/Base.php

Doc Comments +18 added lines

@@ -84,6 +84,9 @@ 
         return "";
     }
 
+    /**
+     * @return string
+     */
     public static function getDbDirectory ($database = NULL) {
         global $config;
         if (self::isMultipleDatabaseEnabled ()) {
@@ -143,10 +146,18 @@ 
         self::$db = NULL;
     }
 
+    /**
+     * @param string $query
+     */
     public static function executeQuerySingle ($query, $database = NULL) {
         return self::getDb ($database)->query($query)->fetchColumn();
     }
 
+    /**
+     * @param string $table
+     * @param string $id
+     * @param string $numberOfString
+     */
     public static function getCountGeneric($table, $id, $pageId, $numberOfString = NULL) {
         if (!$numberOfString) {
             $numberOfString = $table . ".alphabetical";
@@ -159,6 +170,10 @@ 
         return $entry;
     }
 
+    /**
+     * @param string $columns
+     * @param string $category
+     */
     public static function getEntryArrayWithBookNumber ($query, $columns, $params, $category) {
         list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
         $entryArray = array();
@@ -177,6 +192,9 @@ 
         return $entryArray;
     }
 
+    /**
+     * @param string $filter
+     */
     public static function executeQuery($query, $columns, $filter, $params, $n, $database = NULL, $numberPerPage = NULL) {
         $totalResult = -1;
 

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/LinkFacet.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 
 class LinkFacet extends Link
 {
+    /**
+     * @param string $phref
+     */
     public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));

Braces +5 added lines, -2 removed lines

@@ -8,9 +8,12 @@
 
 class LinkFacet extends Link
 {
-    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE) {
+    public function __construct($phref, $ptitle = NULL, $pfacetGroup = NULL, $pactiveFacet = FALSE)
+    {
         parent::__construct ($phref, Link::OPDS_PAGING_TYPE, "http://opds-spec.org/facet", $ptitle, $pfacetGroup, $pactiveFacet);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        if (!is_null (GetUrlParam (DB))) {
+            $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        }
         $this->href = parent::getScriptName() . $this->href;
     }
 }

lib/LinkNavigation.php

Doc Comments +3 added lines

@@ -8,6 +8,9 @@
 
 class LinkNavigation extends Link
 {
+    /**
+     * @param string $prel
+     */
     public function __construct($phref, $prel = NULL, $ptitle = NULL) {
         parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
         if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));

Braces +8 added lines, -3 removed lines

@@ -8,10 +8,15 @@
 
 class LinkNavigation extends Link
 {
-    public function __construct($phref, $prel = NULL, $ptitle = NULL) {
+    public function __construct($phref, $prel = NULL, $ptitle = NULL)
+    {
         parent::__construct ($phref, Link::OPDS_NAVIGATION_TYPE, $prel, $ptitle);
-        if (!is_null (GetUrlParam (DB))) $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
-        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) $this->href = "?" . $this->href;
+        if (!is_null (GetUrlParam (DB))) {
+            $this->href = addURLParameter ($this->href, DB, GetUrlParam (DB));
+        }
+        if (!preg_match ("#^\?(.*)#", $this->href) && !empty ($this->href)) {
+            $this->href = "?" . $this->href;
+        }
         if (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) {
             $this->href = "index.php" . $this->href;
         } else {

lib/PageCustomize.php

Doc Comments +6 added lines

@@ -8,6 +8,9 @@ 
 
 class PageCustomize extends Page
 {
+    /**
+     * @param string $key
+     */
     private function isChecked ($key, $testedValue = 1) {
         $value = getCurrentOption ($key);
         if (is_array ($value)) {
@@ -22,6 +25,9 @@ 
         return "";
     }
 
+    /**
+     * @param string $key
+     */
     private function isSelected ($key, $value) {
         if (getCurrentOption ($key) == $value) {
             return "selected='selected'";

Braces +6 added lines, -3 removed lines

@@ -8,7 +8,8 @@ 
 
 class PageCustomize extends Page
 {
-    private function isChecked ($key, $testedValue = 1) {
+    private function isChecked ($key, $testedValue = 1)
+    {
         $value = getCurrentOption ($key);
         if (is_array ($value)) {
             if (in_array ($testedValue, $value)) {
@@ -22,14 +23,16 @@ 
         return "";
     }
 
-    private function isSelected ($key, $value) {
+    private function isSelected ($key, $value)
+    {
         if (getCurrentOption ($key) == $value) {
             return "selected='selected'";
         }
         return "";
     }
 
-    private function getStyleList () {
+    private function getStyleList ()
+    {
         $result = array ();
         foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) {
             if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) {

lib/Language.php

Braces +15 added lines, -9 removed lines

@@ -13,20 +13,24 @@ 
     public $id;
     public $lang_code;
 
-    public function __construct($pid, $plang_code) {
+    public function __construct($pid, $plang_code)
+    {
         $this->id = $pid;
         $this->lang_code = $plang_code;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_LANGUAGE_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_LANGUAGES_ID.":".$this->id;
     }
 
-    public static function getLanguageString ($code) {
+    public static function getLanguageString ($code)
+    {
         $string = localize("languages.".$code);
         if (preg_match ("/^languages/", $string)) {
             return $code;
@@ -34,12 +38,14 @@ 
         return $string;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("languages.alphabetical", count(array))
         return parent::getCountGeneric ("languages", self::ALL_LANGUAGES_ID, parent::PAGE_ALL_LANGUAGES);
     }
 
-    public static function getLanguageById ($languageId) {
+    public static function getLanguageById ($languageId)
+    {
         $result = parent::getDb ()->prepare('select id, lang_code  from languages where id = ?');
         $result->execute (array ($languageId));
         if ($post = $result->fetchObject ()) {
@@ -50,15 +56,15 @@ 
 
 
 
-    public static function getAllLanguages() {
+    public static function getAllLanguages()
+    {
         $result = parent::getDb ()->query('select languages.id as id, languages.lang_code as lang_code, count(*) as count
 from languages, books_languages_link
 where languages.id = books_languages_link.lang_code
 group by languages.id, books_languages_link.lang_code
 order by languages.lang_code');
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $language = new Language ($post->id, $post->lang_code);
             array_push ($entryArray, new Entry (Language::getLanguageString ($language->lang_code), $language->getEntryId (),
                 str_format (localize("bookword", $post->count), $post->count), "text",

lib/PageQueryResult.php

Braces +6 added lines, -3 removed lines

@@ -15,11 +15,13 @@ 
     const SCOPE_BOOK = "book";
     const SCOPE_PUBLISHER = "publisher";
 
-    private function useTypeahead () {
+    private function useTypeahead ()
+    {
         return !is_null (getURLParam ("search"));
     }
 
-    private function searchByScope ($scope, $limit = FALSE) {
+    private function searchByScope ($scope, $limit = FALSE)
+    {
         $n = $this->n;
         $numberPerPage = NULL;
         $queryNormedAndUp = $this->query;
@@ -54,7 +56,8 @@ 
         return $array;
     }
 
-    public function doSearchByCategory () {
+    public function doSearchByCategory ()
+    {
         $database = GetUrlParam (DB);
         $out = array ();
         $pagequery = Base::PAGE_OPENSEARCH_QUERY;

lib/CustomColumn.php

Braces +27 added lines, -15 removed lines

@@ -14,48 +14,58 @@ 
     public $name;
     public $customId;
 
-    public function __construct($pid, $pname, $pcustomId) {
+    public function __construct($pid, $pname, $pcustomId)
+    {
         $this->id = $pid;
         $this->name = $pname;
         $this->customId = $pcustomId;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_CUSTOM_DETAIL."&custom={$this->customId}&id={$this->id}";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_CUSTOMS_ID.":".$this->customId.":".$this->id;
     }
 
-    public static function getTableName ($customId) {
+    public static function getTableName ($customId)
+    {
         return "custom_column_{$customId}";
     }
 
-    public static function getTableLinkName ($customId) {
+    public static function getTableLinkName ($customId)
+    {
         return "books_custom_column_{$customId}_link";
     }
 
-    public static function getTableLinkColumn ($customId) {
+    public static function getTableLinkColumn ($customId)
+    {
         return "value";
     }
 
-    public static function getAllCustomsId ($customId) {
+    public static function getAllCustomsId ($customId)
+    {
         return self::ALL_CUSTOMS_ID . ":" . $customId;
     }
 
-    public static function getUriAllCustoms ($customId) {
+    public static function getUriAllCustoms ($customId)
+    {
         return "?page=" . parent::PAGE_ALL_CUSTOMS . "&custom={$customId}";
     }
 
-    public static function getAllTitle ($customId) {
+    public static function getAllTitle ($customId)
+    {
         $result = parent::getDb ()->prepare('select name from custom_columns where id = ?');
         $result->execute (array ($customId));
         $post = $result->fetchObject ();
         return $post->name;
     }
 
-    public static function getCustomId ($lookup) {
+    public static function getCustomId ($lookup)
+    {
         $result = parent::getDb ()->prepare('select id from custom_columns where label = ?');
         $result->execute (array ($lookup));
         if ($post = $result->fetchObject ()) {
@@ -64,7 +74,8 @@ 
         return NULL;
     }
 
-    public static function getCount($customId) {
+    public static function getCount($customId)
+    {
         $nCustoms = parent::executeQuerySingle ('select count(*) from ' . self::getTableName ($customId));
         $entry = new Entry (self::getAllTitle ($customId), self::getAllCustomsId ($customId),
             str_format (localize("tags.alphabetical", $nCustoms), $nCustoms), "text",
@@ -72,7 +83,8 @@ 
         return $entry;
     }
 
-    public static function getCustomById ($customId, $id) {
+    public static function getCustomById ($customId, $id)
+    {
         $result = parent::getDb ()->prepare('select id, value as name from ' . self::getTableName ($customId) . ' where id = ?');
         $result->execute (array ($id));
         if ($post = $result->fetchObject ()) {
@@ -81,15 +93,15 @@ 
         return NULL;
     }
 
-    public static function getAllCustoms($customId) {
+    public static function getAllCustoms($customId)
+    {
         $result = parent::getDb ()->query(str_format ('select {0}.id as id, {0}.value as name, count(*) as count
 from {0}, {1}
 where {0}.id = {1}.{2}
 group by {0}.id, {0}.value
 order by {0}.value', self::getTableName ($customId), self::getTableLinkName ($customId), self::getTableLinkColumn ($customId)));
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $customColumn = new CustomColumn ($post->id, $post->name, $customId);
             array_push ($entryArray, new Entry ($customColumn->name, $customColumn->getEntryId (),
                 str_format (localize("bookword", $post->count), $post->count), "text",

lib/Page.php

Braces +26 added lines, -9 removed lines

@@ -76,7 +76,8 @@ 
         }
     }
 
-    public function __construct($pid, $pquery, $pn) {
+    public function __construct($pid, $pquery, $pn)
+    {
         global $config;
 
         $this->idGet = $pid;
@@ -109,23 +110,33 @@ 
             }
             if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
                 $series = Serie::getCount();
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
+                if (!is_null ($series)) {
+                    array_push ($this->entryArray, $series);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
                 $publisher = Publisher::getCount();
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
+                if (!is_null ($publisher)) {
+                    array_push ($this->entryArray, $publisher);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
                 $tags = Tag::getCount();
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
+                if (!is_null ($tags)) {
+                    array_push ($this->entryArray, $tags);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
                 $rating = Rating::getCount();
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
+                if (!is_null ($rating)) {
+                    array_push ($this->entryArray, $rating);
+                }
             }
             if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
                 $languages = Language::getCount();
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
+                if (!is_null ($languages)) {
+                    array_push ($this->entryArray, $languages);
+                }
             }
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
                 $customId = CustomColumn::getCustomId ($lookup);
@@ -135,7 +146,9 @@ 
             }
             $this->entryArray = array_merge ($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled ()) {
+                $this->title =  Base::getDbName ();
+            }
         }
     }
 
@@ -171,8 +184,12 @@ 
 
     public function containsBook ()
     {
-        if (count ($this->entryArray) == 0) return false;
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
+        if (count ($this->entryArray) == 0) {
+            return false;
+        }
+        if (get_class ($this->entryArray [0]) == "EntryBook") {
+            return true;
+        }
         return false;
     }
 }