mbirth / cops

sendtomail.php

Indentation +3 added lines, -3 removed lines

@@ -78,9 +78,9 @@
 $mail->AltBody = "Sent by COPS";
 
 if (!$mail->Send()) {
-   echo localize ("mail.messagenotsent");
-   echo 'Mailer Error: ' . $mail->ErrorInfo;
-   exit;
+    echo localize ("mail.messagenotsent");
+    echo 'Mailer Error: ' . $mail->ErrorInfo;
+    exit;
 }
 
 echo localize ("mail.messagesent");

Spacing +14 added lines, -14 removed lines

@@ -2,11 +2,11 @@ 
 
 require_once ("config.php");
 
-function checkConfiguration () {
+function checkConfiguration() {
     global $config;
 
-    if (is_null ($config['cops_mail_configuration']) ||
-        !is_array ($config['cops_mail_configuration']) ||
+    if (is_null($config['cops_mail_configuration']) ||
+        !is_array($config['cops_mail_configuration']) ||
         empty ($config['cops_mail_configuration']["smtp.host"]) ||
         empty ($config['cops_mail_configuration']["address.from"])) {
         return "NOK. bad configuration.";
@@ -14,7 +14,7 @@ 
     return False;
 }
 
-function checkRequest ($idData, $emailDest) {
+function checkRequest($idData, $emailDest) {
     if (empty ($idData)) {
         return 'No data sent.';
     }
@@ -28,22 +28,22 @@ 
 
 global $config;
 
-if ($error = checkConfiguration ()) {
+if ($error = checkConfiguration()) {
     echo $error;
     exit;
 }
 
 $idData = $_REQUEST["data"];
 $emailDest = $_REQUEST["email"];
-if ($error = checkRequest ($idData, $emailDest)) {
+if ($error = checkRequest($idData, $emailDest)) {
     echo $error;
     exit;
 }
 
 $book = Book::getBookByDataId($idData);
-$data = $book->getDataById ($idData);
+$data = $book->getDataById($idData);
 
-if (filesize ($data->getLocalPath ()) > 10 * 1024 * 1024) {
+if (filesize($data->getLocalPath()) > 10 * 1024 * 1024) {
     echo 'Attachment too big';
     exit;
 }
@@ -65,23 +65,23 @@ 
 $mail->From = $config['cops_mail_configuration']["address.from"];
 $mail->FromName = $config['cops_title_default'];
 
-foreach (explode (";", $emailDest) as $emailAddress) {
+foreach (explode(";", $emailDest) as $emailAddress) {
     if (empty ($emailAddress)) { continue; }
     $mail->AddAddress($emailAddress);
 }
 
-$mail->AddAttachment($data->getLocalPath ());
+$mail->AddAttachment($data->getLocalPath());
 
 $mail->IsHTML(true);
-$mail->Subject = 'Sent by COPS : ' . $data->getUpdatedFilename ();
-$mail->Body    = "<h1>" . $book->title . "</h1><h2>" . $book->getAuthorsName () . "</h2>" . $book->getComment ();
+$mail->Subject = 'Sent by COPS : ' . $data->getUpdatedFilename();
+$mail->Body    = "<h1>" . $book->title . "</h1><h2>" . $book->getAuthorsName() . "</h2>" . $book->getComment();
 $mail->AltBody = "Sent by COPS";
 
 if (!$mail->Send()) {
-   echo localize ("mail.messagenotsent");
+   echo localize("mail.messagenotsent");
    echo 'Mailer Error: ' . $mail->ErrorInfo;
    exit;
 }
 
-echo localize ("mail.messagesent");
+echo localize("mail.messagesent");
 

transliteration.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
     // Counting down is faster. I'm *so* sorry.
     $len = $chunk + 1;
 
-    for ($i = -1; --$len; ) {
+    for ($i = -1; --$len;) {
       $c = $str[++$i];
       if ($remaining = $tail_bytes[$c]) {
         // UTF-8 head byte!
@@ -207,5 +207,5 @@ 
 
   $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;
 }

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;
 }

lib/Language.php

Spacing +19 added lines, -19 removed lines

@@ -17,17 +17,17 @@ 
         $this->lang_code = $plang_code;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_LANGUAGE_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_LANGUAGE_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_LANGUAGES_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_LANGUAGES_ID . ":" . $this->id;
     }
 
-    public static function getLanguageString ($code) {
-        $string = localize("languages.".$code);
-        if (preg_match ("/^languages/", $string)) {
+    public static function getLanguageString($code) {
+        $string = localize("languages." . $code);
+        if (preg_match("/^languages/", $string)) {
             return $code;
         }
         return $string;
@@ -35,14 +35,14 @@ 
 
     public static function getCount() {
         // str_format (localize("languages.alphabetical", count(array))
-        return parent::getCountGeneric ("languages", self::ALL_LANGUAGES_ID, parent::PAGE_ALL_LANGUAGES);
+        return parent::getCountGeneric("languages", self::ALL_LANGUAGES_ID, parent::PAGE_ALL_LANGUAGES);
     }
 
-    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 ()) {
-            return new Language ($post->id, Language::getLanguageString ($post->lang_code));
+    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()) {
+            return new Language($post->id, Language::getLanguageString($post->lang_code));
         }
         return NULL;
     }
@@ -50,18 +50,18 @@ 
 
 
     public static function getAllLanguages() {
-        $result = parent::getDb ()->query('select languages.id as id, languages.lang_code as lang_code, count(*) as count
+        $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",
-                array ( new LinkNavigation ($language->getUri ())), "", $post->count));
+            $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",
+                array(new LinkNavigation($language->getUri())), "", $post->count));
         }
         return $entryArray;
     }

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

Spacing +5 added lines, -5 removed lines

@@ -8,15 +8,15 @@
 
 class PageAllBooksLetter extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter ($this->idGet, $this->n);
-        $this->idPage = Book::getEntryIdByLetter ($this->idGet);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByStartingLetter($this->idGet, $this->n);
+        $this->idPage = Book::getEntryIdByLetter($this->idGet);
 
         $count = $this->totalNumber;
         if ($count == -1)
-            $count = count ($this->entryArray);
+            $count = count($this->entryArray);
 
-        $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("bookword", $count), $count), $this->idGet);
+        $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("bookword", $count), $count), $this->idGet);
     }
 }

lib/PageLanguageDetail.php

Spacing +4 added lines, -4 removed lines

@@ -8,11 +8,11 @@
 
 class PageLanguageDetail extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $language = Language::getLanguageById ($this->idGet);
-        $this->idPage = $language->getEntryId ();
+        $language = Language::getLanguageById($this->idGet);
+        $this->idPage = $language->getEntryId();
         $this->title = $language->lang_code;
-        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage ($this->idGet, $this->n);
+        list ($this->entryArray, $this->totalNumber) = Book::getBooksByLanguage($this->idGet, $this->n);
     }
 }

lib/PageAllAuthorsLetter.php

Spacing +4 added lines, -4 removed lines

@@ -8,10 +8,10 @@
 
 class PageAllAuthorsLetter extends Page
 {
-    public function InitializeContent ()
+    public function InitializeContent()
     {
-        $this->idPage = Author::getEntryIdByLetter ($this->idGet);
-        $this->entryArray = Author::getAuthorsByStartingLetter ($this->idGet);
-        $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("authorword", count ($this->entryArray)), count ($this->entryArray)), $this->idGet);
+        $this->idPage = Author::getEntryIdByLetter($this->idGet);
+        $this->entryArray = Author::getAuthorsByStartingLetter($this->idGet);
+        $this->title = str_format(localize("splitByLetter.letter"), str_format(localize("authorword", count($this->entryArray)), count($this->entryArray)), $this->idGet);
     }
 }

lib/EntryBook.php

Spacing +5 added lines, -5 removed lines

@@ -11,23 +11,23 @@
     public $book;
 
     public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pbook) {
-        parent::__construct ($ptitle, $pid, $pcontent, $pcontentType, $plinkArray);
+        parent::__construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray);
         $this->book = $pbook;
         $this->localUpdated = $pbook->timestamp;
     }
 
-    public function getCoverThumbnail () {
+    public function getCoverThumbnail() {
         foreach ($this->linkArray as $link) {
             if ($link->rel == Link::OPDS_THUMBNAIL_TYPE)
-                return $link->hrefXhtml ();
+                return $link->hrefXhtml();
         }
         return null;
     }
 
-    public function getCover () {
+    public function getCover() {
         foreach ($this->linkArray as $link) {
             if ($link->rel == Link::OPDS_IMAGE_TYPE)
-                return $link->hrefXhtml ();
+                return $link->hrefXhtml();
         }
         return null;
     }