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 = "";

Spacing +39 added lines, -39 removed lines

@@ -8,19 +8,19 @@ 
 
 require_once 'config.php';
 
-define ("VERSION", "1.0.0RC4");
-define ("DB", "db");
+define("VERSION", "1.0.0RC4");
+define("DB", "db");
 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 ();
+    $theme = getCurrentTemplate();
     $header = file_get_contents('templates/' . $theme . '/header.html');
     $footer = file_get_contents('templates/' . $theme . '/footer.html');
     $main = file_get_contents('templates/' . $theme . '/main.html');
@@ -28,8 +28,8 @@ 
     $page = file_get_contents('templates/' . $theme . '/page.html');
 
     // Generate the function for the template
-    $template = new doT ();
-    $dot = $template->template ($page, array ("bookdetail" => $bookdetail,
+    $template = new doT();
+    $dot = $template->template($page, array("bookdetail" => $bookdetail,
                                               "header" => $header,
                                               "footer" => $footer,
                                               "main" => $main));
@@ -40,38 +40,38 @@ 
     }
     // Execute the template
     if (!empty ($data)) {
-        return $dot ($data);
+        return $dot($data);
     }
 
     return NULL;
 }
 
-function getQueryString () {
-    if ( isset($_SERVER['QUERY_STRING']) ) {
+function getQueryString() {
+    if (isset($_SERVER['QUERY_STRING'])) {
         return $_SERVER['QUERY_STRING'];
     }
     return "";
 }
 
-function notFound () {
-    header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
+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])) {
-            return explode (",", $_COOKIE[$option]);
+        if (isset($config ["cops_" . $option]) && is_array($config ["cops_" . $option])) {
+            return explode(",", $_COOKIE[$option]);
         } else {
             return $_COOKIE[$option];
         }
@@ -83,15 +83,15 @@ 
     return "";
 }
 
-function getCurrentCss () {
-    return "templates/" . getCurrentTemplate () . "/styles/style-" . getCurrentOption ("style") . ".css";
+function getCurrentCss() {
+    return "templates/" . getCurrentTemplate() . "/styles/style-" . getCurrentOption("style") . ".css";
 }
 
-function getCurrentTemplate () {
-    return getCurrentOption ("template");
+function getCurrentTemplate() {
+    return getCurrentOption("template");
 }
 
-function getUrlWithVersion ($url) {
+function getUrlWithVersion($url) {
     return $url . "?v=" . VERSION;
 }
 
@@ -130,7 +130,7 @@ 
     return "$return\n\n--------------------------------------------\n\n";
 }
 
-function are_libxml_errors_ok ()
+function are_libxml_errors_ok()
 {
     $errors = libxml_get_errors();
 
@@ -140,15 +140,15 @@ 
     return true;
 }
 
-function html2xhtml ($html) {
+function html2xhtml($html) {
     $doc = new DOMDocument();
     libxml_use_internal_errors(true);
 
     $doc->loadHTML('<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body>' .
-                        $html  . '</body></html>'); // Load the HTML
+                        $html . '</body></html>'); // Load the HTML
     $output = $doc->saveXML($doc->documentElement); // Transform to an Ansi xml stream
     $output = xml2xhtml($output);
-    if (preg_match ('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
+    if (preg_match('#<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></meta></head><body>(.*)</body></html>#ms', $output, $matches)) {
         $output = $matches [1]; // Remove <html><body>
     }
     /*
@@ -160,7 +160,7 @@ 
     }
     */
 
-    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;
@@ -246,7 +246,7 @@ 
     //echo var_dump($langs);
     $lang_file = NULL;
     foreach ($langs as $language => $val) {
-        $temp_file = dirname(__FILE__). '/lang/Localization_' . $language . '.json';
+        $temp_file = dirname(__FILE__) . '/lang/Localization_' . $language . '.json';
         if (file_exists($temp_file)) {
             $lang = $language;
             $lang_file = $temp_file;
@@ -254,7 +254,7 @@ 
         }
     }
     if (empty ($lang_file)) {
-        $lang_file = dirname(__FILE__). '/lang/Localization_' . $lang . '.json';
+        $lang_file = dirname(__FILE__) . '/lang/Localization_' . $lang . '.json';
     }
     return array($lang, $lang_file);
 }
@@ -263,7 +263,7 @@ 
  * 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";
@@ -282,7 +282,7 @@ 
         $lang_file_en = NULL;
         list ($lang, $lang_file) = getLangAndTranslationFile();
         if ($lang != "en") {
-            $lang_file_en = dirname(__FILE__). '/lang/' . 'Localization_en.json';
+            $lang_file_en = dirname(__FILE__) . '/lang/' . 'Localization_en.json';
         }
 
         $lang_file_content = file_get_contents($lang_file);
@@ -290,8 +290,8 @@ 
         $translations = json_decode($lang_file_content, true);
 
         /* Clean the array of all unfinished translations */
-        foreach (array_keys ($translations) as $key) {
-            if (preg_match ("/^##TODO##/", $key)) {
+        foreach (array_keys($translations) as $key) {
+            if (preg_match("/^##TODO##/", $key)) {
                 unset ($translations [$key]);
             }
         }
@@ -299,10 +299,10 @@ 
         {
             $lang_file_content = file_get_contents($lang_file_en);
             $translations_en = json_decode($lang_file_content, true);
-            $translations = array_merge ($translations_en, $translations);
+            $translations = array_merge($translations_en, $translations);
         }
     }
-    if (array_key_exists ($phrase, $translations)) {
+    if (array_key_exists($phrase, $translations)) {
         return $translations[$phrase];
     }
     return $phrase;
@@ -313,7 +313,7 @@ 
         $urlParams = "";
     }
     $start = "";
-    if (preg_match ("#^\?(.*)#", $urlParams, $matches)) {
+    if (preg_match("#^\?(.*)#", $urlParams, $matches)) {
         $start = "?";
         $urlParams = $matches[1];
     }
@@ -327,16 +327,16 @@ 
     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) {
-    return mb_strtoupper (normalizeUtf8String($s), 'UTF-8');
+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;
 

Spacing +65 added lines, -65 removed lines

@@ -37,142 +37,142 @@ 
 
     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)) {
-                return self::error ($database);
+                return 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)) {
-                return self::error ($database);
+                return self::error($database);
             }
-            $array = array_values ($config['calibre_directory']);
+            $array = array_values($config['calibre_directory']);
             return  $array[$database];
         }
         return $config['calibre_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) {
-        list (, $result) = self::executeQuery ($query, $columns, "", $params, -1);
+    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);
+            $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;
     }
@@ -180,30 +180,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/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));

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
 class LinkFacet extends Link
 {
     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));
+        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));
         $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));

Spacing +4 added lines, -4 removed lines

@@ -9,10 +9,10 @@
 class LinkNavigation extends Link
 {
     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 (preg_match ("/(bookdetail|getJSON).php/", parent::getScriptName())) {
+        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 (preg_match("/(bookdetail|getJSON).php/", parent::getScriptName())) {
             $this->href = "index.php" . $this->href;
         } else {
             $this->href = parent::getScriptName() . $this->href;

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'";

Spacing +40 added lines, -40 removed lines

@@ -8,10 +8,10 @@ 
 
 class PageCustomize extends Page
 {
-    private function isChecked ($key, $testedValue = 1) {
-        $value = getCurrentOption ($key);
-        if (is_array ($value)) {
-            if (in_array ($testedValue, $value)) {
+    private function isChecked($key, $testedValue = 1) {
+        $value = getCurrentOption($key);
+        if (is_array($value)) {
+            if (in_array($testedValue, $value)) {
                 return "checked='checked'";
             }
         } else {
@@ -22,29 +22,29 @@ 
         return "";
     }
 
-    private function isSelected ($key, $value) {
-        if (getCurrentOption ($key) == $value) {
+    private function isSelected($key, $value) {
+        if (getCurrentOption($key) == $value) {
             return "selected='selected'";
         }
         return "";
     }
 
-    private function getStyleList () {
-        $result = array ();
-        foreach (glob ("templates/" . getCurrentTemplate () . "/styles/style-*.css") as $filename) {
-            if (preg_match ('/styles\/style-(.*?)\.css/', $filename, $m)) {
-                array_push ($result, $m [1]);
+    private function getStyleList() {
+        $result = array();
+        foreach (glob("templates/" . getCurrentTemplate() . "/styles/style-*.css") as $filename) {
+            if (preg_match('/styles\/style-(.*?)\.css/', $filename, $m)) {
+                array_push($result, $m [1]);
             }
         }
         return $result;
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->title = localize ("customize.title");
-        $this->entryArray = array ();
+        $this->title = localize("customize.title");
+        $this->entryArray = array();
 
-        $ignoredBaseArray = array (PageQueryResult::SCOPE_AUTHOR,
+        $ignoredBaseArray = array(PageQueryResult::SCOPE_AUTHOR,
                                    PageQueryResult::SCOPE_TAG,
                                    PageQueryResult::SCOPE_SERIES,
                                    PageQueryResult::SCOPE_PUBLISHER,
@@ -52,49 +52,49 @@ 
                                    "language");
 
         $content = "";
-        array_push ($this->entryArray, new Entry ("Template", "",
+        array_push($this->entryArray, new Entry("Template", "",
                                         "<span style='cursor: pointer;' onclick='$.cookie(\"template\", \"bootstrap\", { expires: 365 });window.location=$(\".headleft\").attr(\"href\");'>Click to switch to Bootstrap</span>", "text",
-                                        array ()));
+                                        array()));
         if (!preg_match("/(Kobo|Kindle\/3.0|EBRD1101)/", $_SERVER['HTTP_USER_AGENT'])) {
             $content .= '<select id="style" onchange="updateCookie (this);">';
-            foreach ($this-> getStyleList () as $filename) {
-                $content .= "<option value='{$filename}' " . $this->isSelected ("style", $filename) . ">{$filename}</option>";
+            foreach ($this-> getStyleList() as $filename) {
+                $content .= "<option value='{$filename}' " . $this->isSelected("style", $filename) . ">{$filename}</option>";
             }
             $content .= '</select>';
         } else {
-            foreach ($this-> getStyleList () as $filename) {
-                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked ("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>";
+            foreach ($this-> getStyleList() as $filename) {
+                $content .= "<input type='radio' onchange='updateCookieFromCheckbox (this);' id='style-{$filename}' name='style' value='{$filename}' " . $this->isChecked("style", $filename) . " /><label for='style-{$filename}'> {$filename} </label>";
             }
         }
-        array_push ($this->entryArray, new Entry (localize ("customize.style"), "",
+        array_push($this->entryArray, new Entry(localize("customize.style"), "",
                                         $content, "text",
-                                        array ()));
-        if (!useServerSideRendering ()) {
-            $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked ("use_fancyapps") . ' />';
-            array_push ($this->entryArray, new Entry (localize ("customize.fancybox"), "",
+                                        array()));
+        if (!useServerSideRendering()) {
+            $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="use_fancyapps" ' . $this->isChecked("use_fancyapps") . ' />';
+            array_push($this->entryArray, new Entry(localize("customize.fancybox"), "",
                                             $content, "text",
-                                            array ()));
+                                            array()));
         }
-        $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption ("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />';
-        array_push ($this->entryArray, new Entry (localize ("customize.paging"), "",
+        $content = '<input type="number" onchange="updateCookie (this);" id="max_item_per_page" value="' . getCurrentOption("max_item_per_page") . '" min="-1" max="1200" pattern="^[-+]?[0-9]+$" />';
+        array_push($this->entryArray, new Entry(localize("customize.paging"), "",
                                         $content, "text",
-                                        array ()));
-        $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption ("email") . '" />';
-        array_push ($this->entryArray, new Entry (localize ("customize.email"), "",
+                                        array()));
+        $content = '<input type="text" onchange="updateCookie (this);" id="email" value="' . getCurrentOption("email") . '" />';
+        array_push($this->entryArray, new Entry(localize("customize.email"), "",
                                         $content, "text",
-                                        array ()));
-        $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked ("html_tag_filter") . ' />';
-        array_push ($this->entryArray, new Entry (localize ("customize.filter"), "",
+                                        array()));
+        $content = '<input type="checkbox" onchange="updateCookieFromCheckbox (this);" id="html_tag_filter" ' . $this->isChecked("html_tag_filter") . ' />';
+        array_push($this->entryArray, new Entry(localize("customize.filter"), "",
                                         $content, "text",
-                                        array ()));
+                                        array()));
         $content = "";
         foreach ($ignoredBaseArray as $key) {
-            $keyPlural = preg_replace ('/(ss)$/', 's', $key . "s");
-            $content .=  '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked ("ignored_categories", $key) . ' > ' . localize ("{$keyPlural}.title") . '</input> ';
+            $keyPlural = preg_replace('/(ss)$/', 's', $key . "s");
+            $content .= '<input type="checkbox" name="ignored_categories[]" onchange="updateCookieFromCheckboxGroup (this);" id="ignored_categories_' . $key . '" ' . $this->isChecked("ignored_categories", $key) . ' > ' . localize("{$keyPlural}.title") . '</input> ';
         }
 
-        array_push ($this->entryArray, new Entry (localize ("customize.ignored"), "",
+        array_push($this->entryArray, new Entry(localize("customize.ignored"), "",
                                         $content, "text",
-                                        array ()));
+                                        array()));
     }
 }

lib/PageQueryResult.php

Spacing +48 added lines, -48 removed lines

@@ -15,16 +15,16 @@ 
     const SCOPE_BOOK = "book";
     const SCOPE_PUBLISHER = "publisher";
 
-    private function useTypeahead () {
-        return !is_null (getURLParam ("search"));
+    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;
-        if (useNormAndUp ()) {
-            $queryNormedAndUp = normAndUp ($this->query);
+        if (useNormAndUp()) {
+            $queryNormedAndUp = normAndUp($this->query);
         }
         if ($limit) {
             $n = 1;
@@ -32,59 +32,59 @@ 
         }
         switch ($scope) {
             case self::SCOPE_BOOK :
-                $array = Book::getBooksByStartingLetter ('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Book::getBooksByStartingLetter('%' . $queryNormedAndUp, $n, NULL, $numberPerPage);
                 break;
             case self::SCOPE_AUTHOR :
-                $array = Author::getAuthorsForSearch ('%' . $queryNormedAndUp);
+                $array = Author::getAuthorsForSearch('%' . $queryNormedAndUp);
                 break;
             case self::SCOPE_SERIES :
-                $array = Serie::getAllSeriesByQuery ($queryNormedAndUp);
+                $array = Serie::getAllSeriesByQuery($queryNormedAndUp);
                 break;
             case self::SCOPE_TAG :
-                $array = Tag::getAllTagsByQuery ($queryNormedAndUp, $n, NULL, $numberPerPage);
+                $array = Tag::getAllTagsByQuery($queryNormedAndUp, $n, NULL, $numberPerPage);
                 break;
             case self::SCOPE_PUBLISHER :
-                $array = Publisher::getAllPublishersByQuery ($queryNormedAndUp);
+                $array = Publisher::getAllPublishersByQuery($queryNormedAndUp);
                 break;
             default:
-                $array = Book::getBooksByQuery (
-                    array ("all" => "%" . $queryNormedAndUp . "%"), $n);
+                $array = Book::getBooksByQuery(
+                    array("all" => "%" . $queryNormedAndUp . "%"), $n);
         }
 
         return $array;
     }
 
-    public function doSearchByCategory () {
-        $database = GetUrlParam (DB);
-        $out = array ();
+    public function doSearchByCategory() {
+        $database = GetUrlParam(DB);
+        $out = array();
         $pagequery = Base::PAGE_OPENSEARCH_QUERY;
-        $dbArray = array ("");
+        $dbArray = array("");
         $d = $database;
         $query = $this->query;
         // Special case when no databases were chosen, we search on all databases
-        if (Base::noDatabaseSelected ()) {
-            $dbArray = Base::getDbNameList ();
+        if (Base::noDatabaseSelected()) {
+            $dbArray = Base::getDbNameList();
             $d = 0;
         }
         foreach ($dbArray as $key) {
-            if (Base::noDatabaseSelected ()) {
-                array_push ($this->entryArray, new Entry ($key, DB . ":query:{$d}",
+            if (Base::noDatabaseSelected()) {
+                array_push($this->entryArray, new Entry($key, DB . ":query:{$d}",
                                         " ", "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$d}")), "tt-header"));
-                Base::getDb ($d);
+                                        array(new LinkNavigation("?" . DB . "={$d}")), "tt-header"));
+                Base::getDb($d);
             }
-            foreach (array (PageQueryResult::SCOPE_BOOK,
+            foreach (array(PageQueryResult::SCOPE_BOOK,
                             PageQueryResult::SCOPE_AUTHOR,
                             PageQueryResult::SCOPE_SERIES,
                             PageQueryResult::SCOPE_TAG,
                             PageQueryResult::SCOPE_PUBLISHER) as $key) {
-                if (in_array($key, getCurrentOption ('ignored_categories'))) {
+                if (in_array($key, getCurrentOption('ignored_categories'))) {
                     continue;
                 }
-                $array = $this->searchByScope ($key, TRUE);
+                $array = $this->searchByScope($key, TRUE);
 
                 $i = 0;
-                if (count ($array) == 2 && is_array ($array [0])) {
+                if (count($array) == 2 && is_array($array [0])) {
                     $total = $array [1];
                     $array = $array [0];
                 } else {
@@ -97,32 +97,32 @@ 
                     // str_format (localize("seriesword", count($array))
                     // str_format (localize("tagword", count($array))
                     // str_format (localize("publisherword", count($array))
-                    array_push ($this->entryArray, new Entry (str_format (localize ("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
-                                        str_format (localize("{$key}word", $total), $total), "text",
-                                        array ( new LinkNavigation ("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
-                                        Base::noDatabaseSelected () ? "" : "tt-header", $total));
+                    array_push($this->entryArray, new Entry(str_format(localize("search.result.{$key}"), $this->query), DB . ":query:{$d}:{$key}",
+                                        str_format(localize("{$key}word", $total), $total), "text",
+                                        array(new LinkNavigation("?page={$pagequery}&query={$query}&db={$d}&scope={$key}")),
+                                        Base::noDatabaseSelected()?"":"tt-header", $total));
                 }
-                if (!Base::noDatabaseSelected () && $this->useTypeahead ()) {
+                if (!Base::noDatabaseSelected() && $this->useTypeahead()) {
                     foreach ($array as $entry) {
-                        array_push ($this->entryArray, $entry);
+                        array_push($this->entryArray, $entry);
                         $i++;
                         if ($i > 4) { break; };
                     }
                 }
             }
             $d++;
-            if (Base::noDatabaseSelected ()) {
-                Base::clearDb ();
+            if (Base::noDatabaseSelected()) {
+                Base::clearDb();
             }
         }
         return $out;
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $scope = getURLParam ("scope");
+        $scope = getURLParam("scope");
         if (empty ($scope)) {
-            $this->title = str_format (localize ("search.result"), $this->query);
+            $this->title = str_format(localize("search.result"), $this->query);
         } else {
             // Comment to help the perl i18n script
             // str_format (localize ("search.result.author"), $this->query)
@@ -130,31 +130,31 @@ 
             // str_format (localize ("search.result.series"), $this->query)
             // str_format (localize ("search.result.book"), $this->query)
             // str_format (localize ("search.result.publisher"), $this->query)
-            $this->title = str_format (localize ("search.result.{$scope}"), $this->query);
+            $this->title = str_format(localize("search.result.{$scope}"), $this->query);
         }
 
         $crit = "%" . $this->query . "%";
 
         // Special case when we are doing a search and no database is selected
-        if (Base::noDatabaseSelected () && !$this->useTypeahead ()) {
+        if (Base::noDatabaseSelected() && !$this->useTypeahead()) {
             $i = 0;
-            foreach (Base::getDbNameList () as $key) {
-                Base::clearDb ();
-                list ($array, $totalNumber) = Book::getBooksByQuery (array ("all" => $crit), 1, $i, 1);
-                array_push ($this->entryArray, new Entry ($key, DB . ":query:{$i}",
-                                        str_format (localize ("bookword", $totalNumber), $totalNumber), "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
+            foreach (Base::getDbNameList() as $key) {
+                Base::clearDb();
+                list ($array, $totalNumber) = Book::getBooksByQuery(array("all" => $crit), 1, $i, 1);
+                array_push($this->entryArray, new Entry($key, DB . ":query:{$i}",
+                                        str_format(localize("bookword", $totalNumber), $totalNumber), "text",
+                                        array(new LinkNavigation("?" . DB . "={$i}&page=9&query=" . $this->query)), "", $totalNumber));
                 $i++;
             }
             return;
         }
         if (empty ($scope)) {
-            $this->doSearchByCategory ();
+            $this->doSearchByCategory();
             return;
         }
 
-        $array = $this->searchByScope ($scope);
-        if (count ($array) == 2 && is_array ($array [0])) {
+        $array = $this->searchByScope($scope);
+        if (count($array) == 2 && is_array($array [0])) {
             list ($this->entryArray, $this->totalNumber) = $array;
         } else {
             $this->entryArray = $array;

lib/PageCustomDetail.php

Spacing +5 added lines, -5 removed lines

@@ -8,12 +8,12 @@
 
 class PageCustomDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $customId = getURLParam ("custom", NULL);
-        $custom = CustomColumn::getCustomById ($customId, $this->idGet);
-        $this->idPage = $custom->getEntryId ();
+        $customId = getURLParam("custom", NULL);
+        $custom = CustomColumn::getCustomById($customId, $this->idGet);
+        $this->idPage = $custom->getEntryId();
         $this->title = $custom->name;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom ($customId, $this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByCustom($customId, $this->idGet, $this->n);
     }
 }

lib/PageBookDetail.php

Spacing +2 added lines, -2 removed lines

@@ -8,9 +8,9 @@
 
 class PageBookDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->book = Book::getBookById ($this->idGet);
+        $this->book = Book::getBookById($this->idGet);
         $this->title = $this->book->title;
     }
 }

lib/PageAllRating.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 
 class PageAllRating extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         $this->title = localize("ratings.title");
         $this->entryArray = Rating::getAllRatings();