seblucas / cops

index.php

Indentation +8 added lines, -8 removed lines

@@ -37,14 +37,14 @@
     header('Content-Type:text/html;charset=utf-8');
 
     $data = array('title'                 => $config['cops_title_default'],
-                  'version'               => VERSION,
-                  'opds_url'              => $config['cops_full_url'] . 'feed.php',
-                  'customHeader'          => '',
-                  'template'              => getCurrentTemplate(),
-                  'server_side_rendering' => useServerSideRendering(),
-                  'current_css'           => getCurrentCss(),
-                  'favico'                => $config['cops_icon'],
-                  'getjson_url'           => 'getJSON.php?' . addURLParameter(getQueryString(), 'complete', 1));
+                    'version'               => VERSION,
+                    'opds_url'              => $config['cops_full_url'] . 'feed.php',
+                    'customHeader'          => '',
+                    'template'              => getCurrentTemplate(),
+                    'server_side_rendering' => useServerSideRendering(),
+                    'current_css'           => getCurrentCss(),
+                    'favico'                => $config['cops_icon'],
+                    'getjson_url'           => 'getJSON.php?' . addURLParameter(getQueryString(), 'complete', 1));
     if (preg_match('/Kindle/', $_SERVER['HTTP_USER_AGENT'])) {
         $data['customHeader'] = '<style media="screen" type="text/css"> html { font-size: 75%; -webkit-text-size-adjust: 75%; -ms-text-size-adjust: 75%; }</style>';
     }

transliteration.php

Indentation +80 added lines, -80 removed lines

@@ -26,56 +26,56 @@ 
  *   Transliterated text.
  */
 function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
-  // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
-  // avoid the overhead of initializing the decomposition tables by skipping
-  // out early.
-  if (!preg_match('/[\x80-\xff]/', $string)) {
+    // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
+    // avoid the overhead of initializing the decomposition tables by skipping
+    // out early.
+    if (!preg_match('/[\x80-\xff]/', $string)) {
     return $string;
-  }
+    }
 
-  static $tail_bytes;
+    static $tail_bytes;
 
-  if (!isset($tail_bytes)) {
+    if (!isset($tail_bytes)) {
     // Each UTF-8 head byte is followed by a certain number of tail bytes.
     $tail_bytes = array();
     for ($n = 0; $n < 256; $n++) {
-      if ($n < 0xc0) {
+        if ($n < 0xc0) {
         $remaining = 0;
-      }
-      elseif ($n < 0xe0) {
+        }
+        elseif ($n < 0xe0) {
         $remaining = 1;
-      }
-      elseif ($n < 0xf0) {
+        }
+        elseif ($n < 0xf0) {
         $remaining = 2;
-      }
-      elseif ($n < 0xf8) {
+        }
+        elseif ($n < 0xf8) {
         $remaining = 3;
-      }
-      elseif ($n < 0xfc) {
+        }
+        elseif ($n < 0xfc) {
         $remaining = 4;
-      }
-      elseif ($n < 0xfe) {
+        }
+        elseif ($n < 0xfe) {
         $remaining = 5;
-      }
-      else {
+        }
+        else {
         $remaining = 0;
-      }
-      $tail_bytes[chr($n)] = $remaining;
+        }
+        $tail_bytes[chr($n)] = $remaining;
+    }
     }
-  }
 
-  // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
-  // be handled much more quickly. Don't chop up Unicode areas for punctuation,
-  // though, that wastes energy.
-  preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
+    // Chop the text into pure-ASCII and non-ASCII areas; large ASCII parts can
+    // be handled much more quickly. Don't chop up Unicode areas for punctuation,
+    // though, that wastes energy.
+    preg_match_all('/[\x00-\x7f]+|[\x80-\xff][\x00-\x40\x5b-\x5f\x7b-\xff]*/', $string, $matches);
 
-  $result = '';
-  foreach ($matches[0] as $str) {
+    $result = '';
+    foreach ($matches[0] as $str) {
     if ($str[0] < "\x80") {
-      // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
-      // skip over it.
-      $result .= $str;
-      continue;
+        // ASCII chunk: guaranteed to be valid UTF-8 and in normal form C, so
+        // skip over it.
+        $result .= $str;
+        continue;
     }
 
     // We'll have to examine the chunk byte by byte to ensure that it consists
@@ -91,72 +91,72 @@ 
     $len = $chunk + 1;
 
     for ($i = -1; --$len; ) {
-      $c = $str[++$i];
-      if ($remaining = $tail_bytes[$c]) {
+        $c = $str[++$i];
+        if ($remaining = $tail_bytes[$c]) {
         // UTF-8 head byte!
         $sequence = $head = $c;
         do {
-          // Look for the defined number of tail bytes...
-          if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
+            // Look for the defined number of tail bytes...
+            if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
             // Legal tail bytes are nice.
             $sequence .= $c;
-          }
-          else {
+            }
+            else {
             if ($len == 0) {
-              // Premature end of string! Drop a replacement character into
-              // output to represent the invalid UTF-8 sequence.
-              $result .= $unknown;
-              break 2;
+                // Premature end of string! Drop a replacement character into
+                // output to represent the invalid UTF-8 sequence.
+                $result .= $unknown;
+                break 2;
             }
             else {
-              // Illegal tail byte; abandon the sequence.
-              $result .= $unknown;
-              // Back up and reprocess this byte; it may itself be a legal
-              // ASCII or UTF-8 sequence head.
-              --$i;
-              ++$len;
-              continue 2;
+                // Illegal tail byte; abandon the sequence.
+                $result .= $unknown;
+                // Back up and reprocess this byte; it may itself be a legal
+                // ASCII or UTF-8 sequence head.
+                --$i;
+                ++$len;
+                continue 2;
+            }
             }
-          }
         } while (--$remaining);
 
         $n = ord($head);
         if ($n <= 0xdf) {
-          $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
+            $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
         }
         elseif ($n <= 0xef) {
-          $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
+            $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
         }
         elseif ($n <= 0xf7) {
-          $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
+            $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
         }
         elseif ($n <= 0xfb) {
-          $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
+            $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
         }
         elseif ($n <= 0xfd) {
-          $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128);
+            $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128);
         } else {
-          $ord = $n;
+            $ord = $n;
         }
         $result .= _transliteration_replace($ord, $unknown, $source_langcode);
         $head = '';
-      } elseif ($c < "\x80") {
+        } elseif ($c < "\x80") {
         // ASCII byte.
         $result .= $c;
         $head = '';
-      } elseif ($c < "\xc0") {
+        } elseif ($c < "\xc0") {
         // Illegal tail bytes.
         if ($head == '') {
-          $result .= $unknown;
+            $result .= $unknown;
         }
-      } else {
+        } else {
         // Miscellaneous freaks.
         $result .= $unknown;
         $head = '';
-      }
+        }
     }
-  }
-  return $result;
+    }
+    return $result;
 }
 
 /**
@@ -175,38 +175,38 @@ 
  *   ASCII replacement character.
  */
 function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
-  static $map = array();
+    static $map = array();
 
-  //GL: set language later
-  /*
+    //GL: set language later
+    /*
   if (!isset($langcode)) {
     global $language;
     $langcode = $language->language;
   }
   */
 
-  $bank = $ord >> 8;
+    $bank = $ord >> 8;
 
-  if (!isset($map[$bank][$langcode])) {
+    if (!isset($map[$bank][$langcode])) {
     $file = './resources/transliteration-data/' . sprintf('x%02x', $bank) . '.php';  
     if (file_exists($file)) {
-      $base = array();
-      $variant = array();
-      include $file;
-      if ($langcode != 'en' && isset($variant[$langcode])) {
+        $base = array();
+        $variant = array();
+        include $file;
+        if ($langcode != 'en' && isset($variant[$langcode])) {
         // Merge in language specific mappings.
         $map[$bank][$langcode] = $variant[$langcode] + $base;
-      }
-      else {
+        }
+        else {
         $map[$bank][$langcode] = $base;
-      }
+        }
     }
     else {
-      $map[$bank][$langcode] = array();
+        $map[$bank][$langcode] = array();
+    }
     }
-  }
 
-  $ord = $ord & 255;
+    $ord = $ord & 255;
 
-  return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
+    return isset($map[$bank][$langcode][$ord]) ? $map[$bank][$langcode][$ord] : $unknown;
 }

Braces +18 added lines, -30 removed lines

@@ -25,7 +25,8 @@ 
  * @return
  *   Transliterated text.
  */
-function _transliteration_process($string, $unknown = '?', $source_langcode = NULL) {
+function _transliteration_process($string, $unknown = '?', $source_langcode = NULL)
+{
   // ASCII is always valid NFC! If we're only ever given plain ASCII, we can
   // avoid the overhead of initializing the decomposition tables by skipping
   // out early.
@@ -41,23 +42,17 @@ 
     for ($n = 0; $n < 256; $n++) {
       if ($n < 0xc0) {
         $remaining = 0;
-      }
-      elseif ($n < 0xe0) {
+      } elseif ($n < 0xe0) {
         $remaining = 1;
-      }
-      elseif ($n < 0xf0) {
+      } elseif ($n < 0xf0) {
         $remaining = 2;
-      }
-      elseif ($n < 0xf8) {
+      } elseif ($n < 0xf8) {
         $remaining = 3;
-      }
-      elseif ($n < 0xfc) {
+      } elseif ($n < 0xfc) {
         $remaining = 4;
-      }
-      elseif ($n < 0xfe) {
+      } elseif ($n < 0xfe) {
         $remaining = 5;
-      }
-      else {
+      } else {
         $remaining = 0;
       }
       $tail_bytes[chr($n)] = $remaining;
@@ -100,15 +95,13 @@ 
           if (--$len && ($c = $str[++$i]) >= "\x80" && $c < "\xc0") {
             // Legal tail bytes are nice.
             $sequence .= $c;
-          }
-          else {
+          } else {
             if ($len == 0) {
               // Premature end of string! Drop a replacement character into
               // output to represent the invalid UTF-8 sequence.
               $result .= $unknown;
               break 2;
-            }
-            else {
+            } else {
               // Illegal tail byte; abandon the sequence.
               $result .= $unknown;
               // Back up and reprocess this byte; it may itself be a legal
@@ -123,17 +116,13 @@ 
         $n = ord($head);
         if ($n <= 0xdf) {
           $ord = ($n - 192) * 64 + (ord($sequence[1]) - 128);
-        }
-        elseif ($n <= 0xef) {
+        } elseif ($n <= 0xef) {
           $ord = ($n - 224) * 4096 + (ord($sequence[1]) - 128) * 64 + (ord($sequence[2]) - 128);
-        }
-        elseif ($n <= 0xf7) {
+        } elseif ($n <= 0xf7) {
           $ord = ($n - 240) * 262144 + (ord($sequence[1]) - 128) * 4096 + (ord($sequence[2]) - 128) * 64 + (ord($sequence[3]) - 128);
-        }
-        elseif ($n <= 0xfb) {
+        } elseif ($n <= 0xfb) {
           $ord = ($n - 248) * 16777216 + (ord($sequence[1]) - 128) * 262144 + (ord($sequence[2]) - 128) * 4096 + (ord($sequence[3]) - 128) * 64 + (ord($sequence[4]) - 128);
-        }
-        elseif ($n <= 0xfd) {
+        } elseif ($n <= 0xfd) {
           $ord = ($n - 252) * 1073741824 + (ord($sequence[1]) - 128) * 16777216 + (ord($sequence[2]) - 128) * 262144 + (ord($sequence[3]) - 128) * 4096 + (ord($sequence[4]) - 128) * 64 + (ord($sequence[5]) - 128);
         } else {
           $ord = $n;
@@ -174,7 +163,8 @@ 
  * @return
  *   ASCII replacement character.
  */
-function _transliteration_replace($ord, $unknown = '?', $langcode = NULL) {
+function _transliteration_replace($ord, $unknown = '?', $langcode = NULL)
+{
   static $map = array();
 
   //GL: set language later
@@ -196,12 +186,10 @@ 
       if ($langcode != 'en' && isset($variant[$langcode])) {
         // Merge in language specific mappings.
         $map[$bank][$langcode] = $variant[$langcode] + $base;
-      }
-      else {
+      } else {
         $map[$bank][$langcode] = $base;
       }
-    }
-    else {
+    } else {
       $map[$bank][$langcode] = array();
     }
   }

lib/CustomColumnTypeInteger.php

Braces +3 added lines, -1 removed lines

@@ -55,7 +55,9 @@
     public function getDescription()
     {
         $desc = $this->getDatabaseDescription();
-        if ($desc === NULL || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle());
+        if ($desc === NULL || empty($desc)) {
+            $desc = str_format(localize("customcolumn.description"), $this->getTitle());
+        }
         return $desc;
     }
 

lib/CustomColumnType.php

Braces +9 added lines, -6 removed lines

@@ -181,8 +181,9 @@ 
     public static function createByCustomID($customId)
     {
         // Reuse already created CustomColumns for performance
-        if (array_key_exists($customId, self::$customColumnCacheID))
-            return self::$customColumnCacheID[$customId];
+        if (array_key_exists($customId, self::$customColumnCacheID)) {
+                    return self::$customColumnCacheID[$customId];
+        }
 
         $datatype = self::getDatatypeByCustomID($customId);
 
@@ -221,8 +222,9 @@ 
     public static function createByLookup($lookup)
     {
         // Reuse already created CustomColumns for performance
-        if (array_key_exists($lookup, self::$customColumnCacheLookup))
-            return self::$customColumnCacheLookup[$lookup];
+        if (array_key_exists($lookup, self::$customColumnCacheLookup)) {
+                    return self::$customColumnCacheLookup[$lookup];
+        }
 
         $result = parent::getDb()->prepare('SELECT id FROM custom_columns WHERE label = ?');
         $result->execute(array($lookup));
@@ -241,8 +243,9 @@ 
     public function getAllCustomValues()
     {
         // lazy loading
-        if ($this->customValues == NULL)
-            $this->customValues = $this->getAllCustomValuesFromDatabase();
+        if ($this->customValues == NULL) {
+                    $this->customValues = $this->getAllCustomValuesFromDatabase();
+        }
 
         return $this->customValues;
     }

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

Braces +16 added lines, -9 removed lines

@@ -14,12 +14,12 @@ 
      * @param Book $book
      * @return array
      */
-    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++;
@@ -71,7 +71,8 @@ 
      * @param Book $book
      * @return array
      */
-    public static function getFullBookContentArray ($book) {
+    public static function getFullBookContentArray ($book)
+    {
         global $config;
         $out = self::getBookContentArray ($book);
         $database = GetUrlParam (DB);
@@ -106,7 +107,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);
@@ -115,7 +117,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) {
@@ -131,7 +134,8 @@ 
         return $out;
     }
 
-    public static function addCompleteArray ($in) {
+    public static function addCompleteArray ($in)
+    {
         global $config;
         $out = $in;
 
@@ -178,7 +182,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");
@@ -247,7 +252,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;
     }

Indentation +49 added lines, -49 removed lines

@@ -24,7 +24,7 @@ 
             if ($data = $book->getDataFormat ($format)) {
                 $i++;
                 array_push ($preferedData, array ("url" => $data->getHtmlLink (),
-                  "viewUrl" => $data->getViewHtmlLink (), "name" => $format));
+                    "viewUrl" => $data->getViewHtmlLink (), "name" => $format));
             }
         }
 
@@ -52,20 +52,20 @@ 
         $cc = $book->getCustomColumnValues($config['cops_calibre_custom_column_list'], true);
 
         return array ("id" => $book->id,
-                      "hasCover" => $book->hasCover,
-                      "preferedData" => $preferedData,
-                      "rating" => $book->getRating (),
-                      "publisherName" => $pn,
-                      "publisherurl" => $pu,
-                      "pubDate" => $book->getPubDate (),
-                      "languagesName" => $book->getLanguages (),
-                      "authorsName" => $book->getAuthorsName (),
-                      "tagsName" => $book->getTagsName (),
-                      "seriesName" => $sn,
-                      "seriesIndex" => $book->seriesIndex,
-                      "seriesCompleteName" => $scn,
-                      "seriesurl" => $su,
-                      "customcolumns_list" => $cc);
+                        "hasCover" => $book->hasCover,
+                        "preferedData" => $preferedData,
+                        "rating" => $book->getRating (),
+                        "publisherName" => $pn,
+                        "publisherurl" => $pu,
+                        "pubDate" => $book->getPubDate (),
+                        "languagesName" => $book->getLanguages (),
+                        "authorsName" => $book->getAuthorsName (),
+                        "tagsName" => $book->getTagsName (),
+                        "seriesName" => $sn,
+                        "seriesIndex" => $book->seriesIndex,
+                        "seriesCompleteName" => $scn,
+                        "seriesurl" => $su,
+                        "customcolumns_list" => $cc);
     }
 
     /**
@@ -142,45 +142,45 @@ 
         $out = $in;
 
         $out ["c"] = array ("version" => VERSION, "i18n" => array (
-                           "coverAlt" => localize("i18n.coversection"),
-                           "authorsTitle" => localize("authors.title"),
-                           "bookwordTitle" => localize("bookword.title"),
-                           "tagsTitle" => localize("tags.title"),
-                           "seriesTitle" => localize("series.title"),
-                           "customizeTitle" => localize ("customize.title"),
-                           "aboutTitle" => localize ("about.title"),
-                           "previousAlt" => localize ("paging.previous.alternate"),
-                           "nextAlt" => localize ("paging.next.alternate"),
-                           "searchAlt" => localize ("search.alternate"),
-                           "sortAlt" => localize ("sort.alternate"),
-                           "homeAlt" => localize ("home.alternate"),
-                           "cogAlt" => localize ("cog.alternate"),
-                           "permalinkAlt" => localize ("permalink.alternate"),
-                           "publisherName" => localize("publisher.name"),
-                           "pubdateTitle" => localize("pubdate.title"),
-                           "languagesTitle" => localize("language.title"),
-                           "contentTitle" => localize("content.summary"),
-                           "filterClearAll" => localize("filter.clearall"),
-                           "sortorderAsc" => localize("search.sortorder.asc"),
-                           "sortorderDesc" => localize("search.sortorder.desc"),
-                           "customizeEmail" => localize("customize.email")),
-                       "url" => array (
-                           "detailUrl" => "index.php?page=13&id={0}&db={1}",
-                           "coverUrl" => "fetch.php?id={0}&db={1}",
-                           "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
-                       "config" => array (
-                           "use_fancyapps" => $config ["cops_use_fancyapps"],
-                           "max_item_per_page" => $config['cops_max_item_per_page'],
-                           "kindleHack"        => "",
-                           "server_side_rendering" => useServerSideRendering (),
-                           "html_tag_filter" => $config['cops_html_tag_filter']));
+                            "coverAlt" => localize("i18n.coversection"),
+                            "authorsTitle" => localize("authors.title"),
+                            "bookwordTitle" => localize("bookword.title"),
+                            "tagsTitle" => localize("tags.title"),
+                            "seriesTitle" => localize("series.title"),
+                            "customizeTitle" => localize ("customize.title"),
+                            "aboutTitle" => localize ("about.title"),
+                            "previousAlt" => localize ("paging.previous.alternate"),
+                            "nextAlt" => localize ("paging.next.alternate"),
+                            "searchAlt" => localize ("search.alternate"),
+                            "sortAlt" => localize ("sort.alternate"),
+                            "homeAlt" => localize ("home.alternate"),
+                            "cogAlt" => localize ("cog.alternate"),
+                            "permalinkAlt" => localize ("permalink.alternate"),
+                            "publisherName" => localize("publisher.name"),
+                            "pubdateTitle" => localize("pubdate.title"),
+                            "languagesTitle" => localize("language.title"),
+                            "contentTitle" => localize("content.summary"),
+                            "filterClearAll" => localize("filter.clearall"),
+                            "sortorderAsc" => localize("search.sortorder.asc"),
+                            "sortorderDesc" => localize("search.sortorder.desc"),
+                            "customizeEmail" => localize("customize.email")),
+                        "url" => array (
+                            "detailUrl" => "index.php?page=13&id={0}&db={1}",
+                            "coverUrl" => "fetch.php?id={0}&db={1}",
+                            "thumbnailUrl" => "fetch.php?height=" . $config['cops_html_thumbnail_height'] . "&id={0}&db={1}"),
+                        "config" => array (
+                            "use_fancyapps" => $config ["cops_use_fancyapps"],
+                            "max_item_per_page" => $config['cops_max_item_per_page'],
+                            "kindleHack"        => "",
+                            "server_side_rendering" => useServerSideRendering (),
+                            "html_tag_filter" => $config['cops_html_tag_filter']));
         if ($config['cops_thumbnail_handling'] == "1") {
             $out ["c"]["url"]["thumbnailUrl"] = $out ["c"]["url"]["coverUrl"];
         } else if (!empty ($config['cops_thumbnail_handling'])) {
             $out ["c"]["url"]["thumbnailUrl"] = $config['cops_thumbnail_handling'];
         }
         if (preg_match("/./", $_SERVER['HTTP_USER_AGENT'])) {
-          $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
+            $out ["c"]["config"]["kindleHack"] = 'style="text-decoration: none !important;"';
         }
         return $out;
     }
@@ -239,7 +239,7 @@ 
         }
         if (!is_null (getURLParam ("complete")) || $complete) {
             $out = self::addCompleteArray ($out);
-       }
+        }
 
         $out ["containsBook"] = 0;
         if ($currentPage->containsBook ()) {

lib/PageAllBooks.php

Braces +1 added lines, -2 removed lines

@@ -13,8 +13,7 @@
         $this->title = localize ("allbooks.title");
         if (getCurrentOption ("titles_split_first_letter") == 1) {
             $this->entryArray = Book::getAllBooks();
-        }
-        else {
+        } else {
             list ($this->entryArray, $this->totalNumber) = Book::getBooks ($this->n);
         }
         $this->idPage = Book::ALL_BOOKS_ID;

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 = ?');