seblucas / cops

lib/CustomColumnTypeSeries.php

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
         if ($post = $result->fetchObject()) {
             return new CustomColumn($id, $post->name, $this);
         }
-        return NULL;
+        return null;
     }
 
     protected function getAllCustomValuesFromDatabase()
@@ -92,7 +92,7 @@ 
         if ($post = $result->fetchObject()) {
             return new CustomColumn($post->id, $post->name . " [" . $post->extra . "]", $this);
         }
-        return new CustomColumn(NULL, "", $this);
+        return new CustomColumn(null, "", $this);
     }
 
     public function isSearchable()

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

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
         empty ($config['cops_mail_configuration']["address.from"])) {
         return "NOK. bad configuration.";
     }
-    return False;
+    return false;
 }
 
 function checkRequest ($idData, $emailDest) {
@@ -21,7 +21,7 @@ 
     if (empty ($emailDest)) {
         return 'No email sent.';
     }
-    return False;
+    return false;
 }
 
 if (php_sapi_name() === 'cli') { return; }

Spacing +14 added lines, -14 removed lines

@@ -3,11 +3,11 @@ 
 require_once dirname(__FILE__) . '/config.php';
 require_once dirname(__FILE__) . '/base.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.";
@@ -15,7 +15,7 @@ 
     return False;
 }
 
-function checkRequest ($idData, $emailDest) {
+function checkRequest($idData, $emailDest) {
     if (empty ($idData)) {
         return 'No data sent.';
     }
@@ -29,22 +29,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;
 }
@@ -66,12 +66,12 @@ 
 $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->CharSet = "UTF-8";
@@ -79,15 +79,15 @@ 
 if (!empty ($config['cops_mail_configuration']["subject"])) {
     $mail->Subject = $config['cops_mail_configuration']["subject"];
 }
-$mail->Subject .= $data->getUpdatedFilename ();
-$mail->Body    = "<h1>" . $book->title . "</h1><h2>" . $book->getAuthorsName () . "</h2>" . $book->getComment ();
+$mail->Subject .= $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");
 

Braces +16 added lines, -6 removed lines

@@ -3,7 +3,8 @@ 
 require_once dirname(__FILE__) . '/config.php';
 require_once dirname(__FILE__) . '/base.php';
 
-function checkConfiguration () {
+function checkConfiguration ()
+{
     global $config;
 
     if (is_null ($config['cops_mail_configuration']) ||
@@ -15,7 +16,8 @@ 
     return False;
 }
 
-function checkRequest ($idData, $emailDest) {
+function checkRequest ($idData, $emailDest)
+{
     if (empty ($idData)) {
         return 'No data sent.';
     }
@@ -59,10 +61,18 @@ 
     $mail->Port = 465;
 }
 $mail->SMTPAuth = !empty ($config['cops_mail_configuration']["smtp.username"]);
-if (!empty ($config['cops_mail_configuration']["smtp.username"])) $mail->Username = $config['cops_mail_configuration']["smtp.username"];
-if (!empty ($config['cops_mail_configuration']["smtp.password"])) $mail->Password = $config['cops_mail_configuration']["smtp.password"];
-if (!empty ($config['cops_mail_configuration']["smtp.secure"])) $mail->SMTPSecure = $config['cops_mail_configuration']["smtp.secure"];
-if (!empty ($config['cops_mail_configuration']["smtp.port"])) $mail->Port = $config['cops_mail_configuration']["smtp.port"];
+if (!empty ($config['cops_mail_configuration']["smtp.username"])) {
+    $mail->Username = $config['cops_mail_configuration']["smtp.username"];
+}
+if (!empty ($config['cops_mail_configuration']["smtp.password"])) {
+    $mail->Password = $config['cops_mail_configuration']["smtp.password"];
+}
+if (!empty ($config['cops_mail_configuration']["smtp.secure"])) {
+    $mail->SMTPSecure = $config['cops_mail_configuration']["smtp.secure"];
+}
+if (!empty ($config['cops_mail_configuration']["smtp.port"])) {
+    $mail->Port = $config['cops_mail_configuration']["smtp.port"];
+}
 
 $mail->From = $config['cops_mail_configuration']["address.from"];
 $mail->FromName = $config['cops_title_default'];

epubfs.php

Spacing +4 added lines, -4 removed lines

@@ -72,11 +72,11 @@
 try {
     $data = getComponentContent($book, $component, $add);
 
-    $expires = 60*60*24*14;
+    $expires = 60 * 60 * 24 * 14;
     header('Pragma: public');
-    header('Cache-Control: maxage='.$expires);
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    header ('Content-Type: ' . $book->componentContentType($component));
+    header('Cache-Control: maxage=' . $expires);
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
+    header('Content-Type: ' . $book->componentContentType($component));
     echo $data;
 } catch (Exception $e) {
     error_log($e);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
     return;
 }
 
-$idData = getURLParam('data', NULL);
+$idData = getURLParam('data', null);
 $add = 'data=' . $idData . '&';
 if (!is_null(GetUrlParam(DB))) {
     $add .= DB . '=' . GetUrlParam(DB) . '&';

config.php

Braces +2 added lines, -4 removed lines

@@ -21,13 +21,11 @@
 }
 
 if(!is_null($config['cops_basic_authentication']) &&
-    is_array($config['cops_basic_authentication']))
-{
+    is_array($config['cops_basic_authentication'])) {
     if (!isset($_SERVER['PHP_AUTH_USER']) ||
         (isset($_SERVER['PHP_AUTH_USER']) &&
         ($_SERVER['PHP_AUTH_USER']!=$config['cops_basic_authentication']['username'] ||
-        $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password'])))
-    {
+        $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password']))) {
         header('WWW-Authenticate: Basic realm="COPS Authentication"');
         header('HTTP/1.0 401 Unauthorized');
         echo 'This site is password protected';

Spacing +4 added lines, -4 removed lines

@@ -12,20 +12,20 @@
     require dirname(__FILE__) . '/config_local.php';
 }
 
-$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER) ? $_SERVER['PHP_AUTH_USER'] : '';
+$remote_user = array_key_exists('PHP_AUTH_USER', $_SERVER)?$_SERVER['PHP_AUTH_USER']:'';
 // Clean username, only allow a-z, A-Z, 0-9, -_ chars
-$remote_user = preg_replace( '/[^a-zA-Z0-9_-]/', '', $remote_user);
+$remote_user = preg_replace('/[^a-zA-Z0-9_-]/', '', $remote_user);
 $user_config_file = 'config_local.' . $remote_user . '.php';
 if (file_exists(dirname(__FILE__) . '/' . $user_config_file) && (php_sapi_name() !== 'cli')) {
     require dirname(__FILE__) . '/' . $user_config_file;
 }
 
-if(!is_null($config['cops_basic_authentication']) &&
+if (!is_null($config['cops_basic_authentication']) &&
     is_array($config['cops_basic_authentication']))
 {
     if (!isset($_SERVER['PHP_AUTH_USER']) ||
         (isset($_SERVER['PHP_AUTH_USER']) &&
-        ($_SERVER['PHP_AUTH_USER']!=$config['cops_basic_authentication']['username'] ||
+        ($_SERVER['PHP_AUTH_USER'] != $config['cops_basic_authentication']['username'] ||
         $_SERVER['PHP_AUTH_PW'] != $config['cops_basic_authentication']['password'])))
     {
         header('WWW-Authenticate: Basic realm="COPS Authentication"');

checkconfig.php

Braces +1 added lines, -2 removed lines

@@ -237,8 +237,7 @@
                 $db = new PDO('sqlite:' . Base::getDbFileName($i));
                 $result = $db->prepare('select books.path || "/" || data.name || "." || lower (format) as fullpath from data join books on data.book = books.id');
                 $result->execute();
-                while ($post = $result->fetchObject())
-                {
+                while ($post = $result->fetchObject()) {
                     if (!is_file (Base::getDbDirectory($i) . $post->fullpath)) {
                         echo '<p>' . Base::getDbDirectory($i) . $post->fullpath . '</p>';
                     }

Spacing +6 added lines, -6 removed lines

@@ -26,7 +26,7 @@ 
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>COPS Configuration Check</title>
-    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss ()) ?>" media="screen" />
+    <link rel="stylesheet" type="text/css" href="<?php echo getUrlWithVersion(getCurrentCss()) ?>" media="screen" />
 </head>
 <body>
 <div class="container">
@@ -151,7 +151,7 @@ 
             <h2>Check if the rendering will be done on client side or server side</h2>
             <h4>
             <?php
-            if (useServerSideRendering ()) {
+            if (useServerSideRendering()) {
                 echo 'Server side rendering';
             } else {
                 echo 'Client side rendering';
@@ -167,7 +167,7 @@ 
             <h2>Check if Calibre database path is not an URL</h2>
             <h4>
             <?php
-            if (!preg_match ('#^http#', $database)) {
+            if (!preg_match('#^http#', $database)) {
                 echo $name . ' OK';
             } else {
                 echo $name . ' Calibre path has to be local (no URL allowed)';
@@ -200,7 +200,7 @@ 
             <h4>
             <?php
             try {
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
                 echo $name . ' OK';
             } catch (Exception $e) {
                 echo $name . ' If the file is readable, check your php configuration. Exception detail : ' . $e;
@@ -213,7 +213,7 @@ 
             <h4>
             <?php
             try {
-                $db = new PDO('sqlite:'. Base::getDbFileName($i));
+                $db = new PDO('sqlite:' . Base::getDbFileName($i));
                 $count = $db->query('select count(*) FROM sqlite_master WHERE type="table" AND name in ("books", "authors", "tags", "series")')->fetchColumn();
                 if ($count == 4) {
                     echo $name . ' OK';
@@ -237,7 +237,7 @@ 
                 $result->execute();
                 while ($post = $result->fetchObject())
                 {
-                    if (!is_file (Base::getDbDirectory($i) . $post->fullpath)) {
+                    if (!is_file(Base::getDbDirectory($i) . $post->fullpath)) {
                         echo '<p>' . Base::getDbDirectory($i) . $post->fullpath . '</p>';
                     }
                 }

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
     $err   = getURLParam('err', -1);
     $full  = getURLParam('full');
-    $error = NULL;
+    $error = null;
     switch ($err) {
         case 1 :
             $error = 'Database error';

lib/Data.php

Doc Comments +10 added lines

@@ -152,6 +152,9 @@ 
         return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
+    /**
+     * @param Book $book
+     */
     public static function getDataByBook ($book) {
         $out = array ();
         $result = parent::getDb ()->prepare('select id, format, name
@@ -165,6 +168,9 @@ 
         return $out;
     }
 
+    /**
+     * @param string $urlParam
+     */
     public static function handleThumbnailLink ($urlParam, $height) {
         global $config;
 
@@ -184,6 +190,10 @@ 
         return $urlParam;
     }
 
+    /**
+     * @param string $type
+     * @param string $filename
+     */
     public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL, $view = false)
     {
         global $config;

Indentation +1 added lines, -1 removed lines

@@ -105,7 +105,7 @@
     public function getUpdatedFilenameKepub () {
         $str = $this->getUpdatedFilename () . ".kepub.epub";
         return str_replace(array(':', '#', '&'),
-                           array('-', '-', ' '), $str );
+                            array('-', '-', ' '), $str );
     }
 
     public function getDataLink ($rel, $title = NULL, $view = false) {

Spacing +44 added lines, -44 removed lines

@@ -59,25 +59,25 @@ 
         $this->id = $post->id;
         $this->name = $post->name;
         $this->format = $post->format;
-        $this->realFormat = str_replace ("ORIGINAL_", "", $post->format);
-        $this->extension = strtolower ($this->realFormat);
+        $this->realFormat = str_replace("ORIGINAL_", "", $post->format);
+        $this->extension = strtolower($this->realFormat);
         $this->book = $book;
     }
 
-    public function isKnownType () {
-        return array_key_exists ($this->extension, self::$mimetypes);
+    public function isKnownType() {
+        return array_key_exists($this->extension, self::$mimetypes);
     }
 
-    public function getMimeType () {
+    public function getMimeType() {
         $result = "application/octet-stream";
-        if ($this->isKnownType ()) {
+        if ($this->isKnownType()) {
             return self::$mimetypes [$this->extension];
         } elseif (function_exists('finfo_open') === true) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
             if (is_resource($finfo) === true)
             {
-                $result = finfo_file($finfo, $this->getLocalPath ());
+                $result = finfo_file($finfo, $this->getLocalPath());
             }
 
             finfo_close($finfo);
@@ -86,55 +86,55 @@ 
         return $result;
     }
 
-    public function isEpubValidOnKobo () {
+    public function isEpubValidOnKobo() {
         return $this->format == "EPUB" || $this->format == "KEPUB";
     }
 
-    public function getFilename () {
-        return $this->name . "." . strtolower ($this->format);
+    public function getFilename() {
+        return $this->name . "." . strtolower($this->format);
     }
 
-    public function getUpdatedFilename () {
-        return $this->book->getAuthorsSort () . " - " . $this->book->title;
+    public function getUpdatedFilename() {
+        return $this->book->getAuthorsSort() . " - " . $this->book->title;
     }
 
-    public function getUpdatedFilenameEpub () {
-        return $this->getUpdatedFilename () . ".epub";
+    public function getUpdatedFilenameEpub() {
+        return $this->getUpdatedFilename() . ".epub";
     }
 
-    public function getUpdatedFilenameKepub () {
-        $str = $this->getUpdatedFilename () . ".kepub.epub";
+    public function getUpdatedFilenameKepub() {
+        $str = $this->getUpdatedFilename() . ".kepub.epub";
         return str_replace(array(':', '#', '&'),
-                           array('-', '-', ' '), $str );
+                           array('-', '-', ' '), $str);
     }
 
-    public function getDataLink ($rel, $title = NULL, $view = false) {
+    public function getDataLink($rel, $title = NULL, $view = false) {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
             return $this->getHtmlLinkWithRewriting($title, $view);
         }
 
-        return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title, NULL, $view);
+        return self::getLink($this->book, $this->extension, $this->getMimeType(), $rel, $this->getFilename(), $this->id, $title, NULL, $view);
     }
 
-    public function getHtmlLink () {
+    public function getHtmlLink() {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE)->href;
     }
 
-    public function getViewHtmlLink () {
+    public function getViewHtmlLink() {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE, NULL, true)->href;
     }
 
-    public function getLocalPath () {
-        return $this->book->path . "/" . $this->getFilename ();
+    public function getLocalPath() {
+        return $this->book->path . "/" . $this->getFilename();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL, $view = false) {
+    public function getHtmlLinkWithRewriting($title = NULL, $view = false) {
         global $config;
 
         $database = "";
-        if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
+        if (!is_null(GetUrlParam(DB))) $database = GetUrlParam(DB) . "/";
 
         $prefix = "download";
         if ($view) {
@@ -143,33 +143,33 @@ 
         $href = $prefix . "/" . $this->id . "/" . $database;
 
         if ($config['cops_provide_kepub'] == "1" &&
-            $this->isEpubValidOnKobo () &&
+            $this->isEpubValidOnKobo() &&
             preg_match("/Kobo/", $_SERVER['HTTP_USER_AGENT'])) {
-            $href .= rawurlencode ($this->getUpdatedFilenameKepub ());
+            $href .= rawurlencode($this->getUpdatedFilenameKepub());
         } else {
-            $href .= rawurlencode ($this->getFilename ());
+            $href .= rawurlencode($this->getFilename());
         }
-        return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
+        return new Link($href, $this->getMimeType(), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
-    public static function getDataByBook ($book) {
-        $out = array ();
-        $result = parent::getDb ()->prepare('select id, format, name
+    public static function getDataByBook($book) {
+        $out = array();
+        $result = parent::getDb()->prepare('select id, format, name
                                              from data where book = ?');
-        $result->execute (array ($book->id));
+        $result->execute(array($book->id));
 
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            array_push ($out, new Data ($post, $book));
+            array_push($out, new Data($post, $book));
         }
         return $out;
     }
 
-    public static function handleThumbnailLink ($urlParam, $height) {
+    public static function handleThumbnailLink($urlParam, $height) {
         global $config;
 
-        if (is_null ($height)) {
-            if (preg_match ('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
+        if (is_null($height)) {
+            if (preg_match('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
                 $height = $config['cops_opds_thumbnail_height'];
             }
             else
@@ -184,14 +184,14 @@ 
         return $urlParam;
     }
 
-    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL, $view = false)
+    public static function getLink($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL, $view = false)
     {
         global $config;
 
         $urlParam = addURLParameter("", "data", $idData);
         if ($view) $urlParam = addURLParameter($urlParam, "view", 1);
 
-        if (Base::useAbsolutePath () ||
+        if (Base::useAbsolutePath() ||
             $rel == Link::OPDS_THUMBNAIL_TYPE ||
             ($type == "epub" && $config['cops_update_epub-metadata']))
         {
@@ -200,18 +200,18 @@ 
                 $urlParam = self::handleThumbnailLink($urlParam, $height);
             }
             $urlParam = addURLParameter($urlParam, "id", $book->id);
-            if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+            if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam(DB));
             if ($config['cops_thumbnail_handling'] != "1" &&
                 !empty ($config['cops_thumbnail_handling']) &&
                 $rel == Link::OPDS_THUMBNAIL_TYPE) {
-                return new Link ($config['cops_thumbnail_handling'], $mime, $rel, $title);
+                return new Link($config['cops_thumbnail_handling'], $mime, $rel, $title);
             } else {
-                return new Link ("fetch.php?" . $urlParam, $mime, $rel, $title);
+                return new Link("fetch.php?" . $urlParam, $mime, $rel, $title);
             }
         }
         else
         {
-            return new Link (str_replace('%2F','/',rawurlencode ($book->path."/".$filename)), $mime, $rel, $title);
+            return new Link(str_replace('%2F', '/', rawurlencode($book->path . "/" . $filename)), $mime, $rel, $title);
         }
     }
 }

Braces +47 added lines, -31 removed lines

@@ -55,7 +55,8 @@ 
         'zip'   => 'application/zip'
     );
 
-    public function __construct($post, $book = null) {
+    public function __construct($post, $book = null)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
         $this->format = $post->format;
@@ -64,19 +65,20 @@ 
         $this->book = $book;
     }
 
-    public function isKnownType () {
+    public function isKnownType ()
+    {
         return array_key_exists ($this->extension, self::$mimetypes);
     }
 
-    public function getMimeType () {
+    public function getMimeType ()
+    {
         $result = "application/octet-stream";
         if ($this->isKnownType ()) {
             return self::$mimetypes [$this->extension];
         } elseif (function_exists('finfo_open') === true) {
             $finfo = finfo_open(FILEINFO_MIME_TYPE);
 
-            if (is_resource($finfo) === true)
-            {
+            if (is_resource($finfo) === true) {
                 $result = finfo_file($finfo, $this->getLocalPath ());
             }
 
@@ -86,29 +88,35 @@ 
         return $result;
     }
 
-    public function isEpubValidOnKobo () {
+    public function isEpubValidOnKobo ()
+    {
         return $this->format == "EPUB" || $this->format == "KEPUB";
     }
 
-    public function getFilename () {
+    public function getFilename ()
+    {
         return $this->name . "." . strtolower ($this->format);
     }
 
-    public function getUpdatedFilename () {
+    public function getUpdatedFilename ()
+    {
         return $this->book->getAuthorsSort () . " - " . $this->book->title;
     }
 
-    public function getUpdatedFilenameEpub () {
+    public function getUpdatedFilenameEpub ()
+    {
         return $this->getUpdatedFilename () . ".epub";
     }
 
-    public function getUpdatedFilenameKepub () {
+    public function getUpdatedFilenameKepub ()
+    {
         $str = $this->getUpdatedFilename () . ".kepub.epub";
         return str_replace(array(':', '#', '&'),
                            array('-', '-', ' '), $str );
     }
 
-    public function getDataLink ($rel, $title = NULL, $view = false) {
+    public function getDataLink ($rel, $title = NULL, $view = false)
+    {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
@@ -118,23 +126,29 @@ 
         return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title, NULL, $view);
     }
 
-    public function getHtmlLink () {
+    public function getHtmlLink ()
+    {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE)->href;
     }
 
-    public function getViewHtmlLink () {
+    public function getViewHtmlLink ()
+    {
         return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE, NULL, true)->href;
     }
 
-    public function getLocalPath () {
+    public function getLocalPath ()
+    {
         return $this->book->path . "/" . $this->getFilename ();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL, $view = false) {
+    public function getHtmlLinkWithRewriting ($title = NULL, $view = false)
+    {
         global $config;
 
         $database = "";
-        if (!is_null (GetUrlParam (DB))) $database = GetUrlParam (DB) . "/";
+        if (!is_null (GetUrlParam (DB))) {
+            $database = GetUrlParam (DB) . "/";
+        }
 
         $prefix = "download";
         if ($view) {
@@ -152,28 +166,27 @@ 
         return new Link ($href, $this->getMimeType (), Link::OPDS_ACQUISITION_TYPE, $title);
     }
 
-    public static function getDataByBook ($book) {
+    public static function getDataByBook ($book)
+    {
         $out = array ();
         $result = parent::getDb ()->prepare('select id, format, name
                                              from data where book = ?');
         $result->execute (array ($book->id));
 
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             array_push ($out, new Data ($post, $book));
         }
         return $out;
     }
 
-    public static function handleThumbnailLink ($urlParam, $height) {
+    public static function handleThumbnailLink ($urlParam, $height)
+    {
         global $config;
 
         if (is_null ($height)) {
             if (preg_match ('/feed.php/', $_SERVER["SCRIPT_NAME"])) {
                 $height = $config['cops_opds_thumbnail_height'];
-            }
-            else
-            {
+            } else {
                 $height = $config['cops_html_thumbnail_height'];
             }
         }
@@ -189,18 +202,23 @@ 
         global $config;
 
         $urlParam = addURLParameter("", "data", $idData);
-        if ($view) $urlParam = addURLParameter($urlParam, "view", 1);
+        if ($view) {
+            $urlParam = addURLParameter($urlParam, "view", 1);
+        }
 
         if (Base::useAbsolutePath () ||
             $rel == Link::OPDS_THUMBNAIL_TYPE ||
-            ($type == "epub" && $config['cops_update_epub-metadata']))
-        {
-            if ($type != "jpg") $urlParam = addURLParameter($urlParam, "type", $type);
+            ($type == "epub" && $config['cops_update_epub-metadata'])) {
+            if ($type != "jpg") {
+                $urlParam = addURLParameter($urlParam, "type", $type);
+            }
             if ($rel == Link::OPDS_THUMBNAIL_TYPE) {
                 $urlParam = self::handleThumbnailLink($urlParam, $height);
             }
             $urlParam = addURLParameter($urlParam, "id", $book->id);
-            if (!is_null (GetUrlParam (DB))) $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+            if (!is_null (GetUrlParam (DB))) {
+                $urlParam = addURLParameter ($urlParam, DB, GetUrlParam (DB));
+            }
             if ($config['cops_thumbnail_handling'] != "1" &&
                 !empty ($config['cops_thumbnail_handling']) &&
                 $rel == Link::OPDS_THUMBNAIL_TYPE) {
@@ -208,9 +226,7 @@ 
             } else {
                 return new Link ("fetch.php?" . $urlParam, $mime, $rel, $title);
             }
-        }
-        else
-        {
+        } else {
             return new Link (str_replace('%2F','/',rawurlencode ($book->path."/".$filename)), $mime, $rel, $title);
         }
     }

Upper-Lower-Casing +5 added lines, -5 removed lines

@@ -108,14 +108,14 @@ 
                            array('-', '-', ' '), $str );
     }
 
-    public function getDataLink ($rel, $title = NULL, $view = false) {
+    public function getDataLink ($rel, $title = null, $view = false) {
         global $config;
 
         if ($rel == Link::OPDS_ACQUISITION_TYPE && $config['cops_use_url_rewriting'] == "1") {
             return $this->getHtmlLinkWithRewriting($title, $view);
         }
 
-        return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title, NULL, $view);
+        return self::getLink ($this->book, $this->extension, $this->getMimeType (), $rel, $this->getFilename (), $this->id, $title, null, $view);
     }
 
     public function getHtmlLink () {
@@ -123,14 +123,14 @@ 
     }
 
     public function getViewHtmlLink () {
-        return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE, NULL, true)->href;
+        return $this->getDataLink(Link::OPDS_ACQUISITION_TYPE, null, true)->href;
     }
 
     public function getLocalPath () {
         return $this->book->path . "/" . $this->getFilename ();
     }
 
-    public function getHtmlLinkWithRewriting ($title = NULL, $view = false) {
+    public function getHtmlLinkWithRewriting ($title = null, $view = false) {
         global $config;
 
         $database = "";
@@ -184,7 +184,7 @@ 
         return $urlParam;
     }
 
-    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = NULL, $height = NULL, $view = false)
+    public static function getLink ($book, $type, $mime, $rel, $filename, $idData, $title = null, $height = null, $view = false)
     {
         global $config;
 

lib/Book.php

Doc Comments +17 added lines, -1 removed lines

@@ -208,6 +208,9 @@ 
         return 'index.php' . $urlParam;
     }
 
+    /**
+     * @return string
+     */
     public function getTitle () {
         return $this->title;
     }
@@ -395,6 +398,9 @@ 
         return reset($reduced);
     }
 
+    /**
+     * @param string $extension
+     */
     public function getFilePath($extension, $idData = NULL, $relative = false)
     {
         /*if ($extension == 'jpg')
@@ -562,6 +568,9 @@ 
             $this->getLinkArray(), $this);
     }
 
+    /**
+     * @param integer $database
+     */
     public static function getBookCount($database = NULL) {
         return parent::executeQuerySingle('select count(*) from books', $database);
     }
@@ -610,7 +619,7 @@ 
     }
 
     /**
-     * @param $customColumn CustomColumn
+     * @param CustomColumn $customColumn CustomColumn
      * @param $id integer
      * @param $n integer
      * @return array
@@ -650,6 +659,10 @@ 
         return NULL;
     }
 
+    /**
+     * @param integer $database
+     * @param integer $numberPerPage
+     */
     public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
         $i = 0;
         $critArray = array();
@@ -697,6 +710,9 @@ 
         return $entryArray;
     }
 
+    /**
+     * @param integer $numberPerPage
+     */
     public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
         return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage);
     }

Spacing +54 added lines, -54 removed lines

@@ -7,55 +7,55 @@ 
  */
 
 // Silly thing because PHP forbid string concatenation in class const
-define ('SQL_BOOKS_LEFT_JOIN', 'left outer join comments on comments.book = books.id
+define('SQL_BOOKS_LEFT_JOIN', 'left outer join comments on comments.book = books.id
                                 left outer join books_ratings_link on books_ratings_link.book = books.id
                                 left outer join ratings on books_ratings_link.rating = ratings.id ');
-define ('SQL_BOOKS_ALL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' order by books.sort ');
-define ('SQL_BOOKS_BY_PUBLISHER', 'select {0} from books_publishers_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_ALL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . ' order by books.sort ');
+define('SQL_BOOKS_BY_PUBLISHER', 'select {0} from books_publishers_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_publishers_link.book = books.id and publisher = ? {1} order by publisher');
-define ('SQL_BOOKS_BY_FIRST_LETTER', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_FIRST_LETTER', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where upper (books.sort) like ? order by books.sort');
-define ('SQL_BOOKS_BY_AUTHOR', 'select {0} from books_authors_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_AUTHOR', 'select {0} from books_authors_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     left outer join books_series_link on books_series_link.book = books.id
                                                     where books_authors_link.book = books.id and author = ? {1} order by series desc, series_index asc, pubdate asc');
-define ('SQL_BOOKS_BY_SERIE', 'select {0} from books_series_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_SERIE', 'select {0} from books_series_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_series_link.book = books.id and series = ? {1} order by series_index');
-define ('SQL_BOOKS_BY_TAG', 'select {0} from books_tags_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_TAG', 'select {0} from books_tags_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_tags_link.book = books.id and tag = ? {1} order by sort');
-define ('SQL_BOOKS_BY_LANGUAGE', 'select {0} from books_languages_link, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_LANGUAGE', 'select {0} from books_languages_link, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_languages_link.book = books.id and lang_code = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.{3} = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_TRUE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = 1 {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_FALSE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = 0 {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_BOOL_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books.id not in (select book from {2}) {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     left join {2} on {2}.book = books.id
                                                     left join {3} on {3}.id = {2}.{4}
                                                     where {3}.value = ?  order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_RATING_NULL', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
 								                    left join {2} on {2}.book = books.id
 								                    left join {3} on {3}.id = {2}.{4}
                                                     where ((books.id not in (select {2}.book from {2})) or ({3}.value = 0)) {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DATE', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and date({2}.value) = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DIRECT', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.value = ? {1} order by sort');
-define ('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_CUSTOM_DIRECT_ID', 'select {0} from {2}, books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where {2}.book = books.id and {2}.id = ? {1} order by sort');
-define ('SQL_BOOKS_QUERY', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_QUERY', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where (
                                                     exists (select null from authors, books_authors_link where book = books.id and author = authors.id and authors.name like ?) or
                                                     exists (select null from tags, books_tags_link where book = books.id and tag = tags.id and tags.name like ?) or
                                                     exists (select null from series, books_series_link on book = books.id and books_series_link.series = series.id and series.name like ?) or
                                                     exists (select null from publishers, books_publishers_link where book = books.id and books_publishers_link.publisher = publishers.id and publishers.name like ?) or
                                                     title like ?) {1} order by books.sort');
-define ('SQL_BOOKS_RECENT', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_RECENT', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where 1=1 {1} order by timestamp desc limit ');
-define ('SQL_BOOKS_BY_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
+define('SQL_BOOKS_BY_RATING', 'select {0} from books ' . SQL_BOOKS_LEFT_JOIN . '
                                                     where books_ratings_link.book = books.id and ratings.id = ? {1} order by sort');
 
 class Book extends Base
@@ -105,7 +105,7 @@ 
     public $serie = NULL;
     public $tags = NULL;
     public $languages = NULL;
-    public $format = array ();
+    public $format = array();
     private $coverFileName = NULL;
 
     public function __construct($line) {
@@ -191,24 +191,24 @@ 
     }
 
     public function getEntryId() {
-        return self::ALL_BOOKS_UUID.':'.$this->uuid;
+        return self::ALL_BOOKS_UUID . ':' . $this->uuid;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
-        return self::ALL_BOOKS_ID.':letter:'.$startingLetter;
+    public static function getEntryIdByLetter($startingLetter) {
+        return self::ALL_BOOKS_ID . ':letter:' . $startingLetter;
     }
 
-    public function getUri () {
-        return '?page='.parent::PAGE_BOOK_DETAIL.'&id=' . $this->id;
+    public function getUri() {
+        return '?page=' . parent::PAGE_BOOK_DETAIL . '&id=' . $this->id;
     }
 
-    public function getDetailUrl () {
+    public function getDetailUrl() {
         $urlParam = $this->getUri();
-        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB));
+        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam(DB));
         return 'index.php' . $urlParam;
     }
 
-    public function getTitle () {
+    public function getTitle() {
         return $this->title;
     }
 
@@ -217,22 +217,22 @@ 
     /**
      * @return Author[]
      */
-    public function getAuthors () {
+    public function getAuthors() {
         if (is_null($this->authors)) {
             $this->authors = Author::getAuthorByBookId($this->id);
         }
         return $this->authors;
     }
 
-    public function getAuthorsName () {
-        return implode(', ', array_map(function ($author) { return $author->name; }, $this->getAuthors()));
+    public function getAuthorsName() {
+        return implode(', ', array_map(function($author) { return $author->name; }, $this->getAuthors()));
     }
 
-    public function getAuthorsSort () {
-        return implode(', ', array_map(function ($author) { return $author->sort; }, $this->getAuthors()));
+    public function getAuthorsSort() {
+        return implode(', ', array_map(function($author) { return $author->sort; }, $this->getAuthors()));
     }
 
-    public function getPublisher () {
+    public function getPublisher() {
         if (is_null($this->publisher)) {
             $this->publisher = Publisher::getPublisherByBookId($this->id);
         }
@@ -271,7 +271,7 @@ 
      * @return Tag[]
      */
     public function getTags() {
-        if (is_null ($this->tags)) {
+        if (is_null($this->tags)) {
             $this->tags = array();
 
             $result = parent::getDb()->prepare('select tags.id as id, name
@@ -289,7 +289,7 @@ 
     }
 
     public function getTagsName() {
-        return implode(', ', array_map(function ($tag) { return $tag->name; }, $this->getTags()));
+        return implode(', ', array_map(function($tag) { return $tag->name; }, $this->getTags()));
     }
 
     /**
@@ -341,7 +341,7 @@ 
 
     public function getDataById($idData)
     {
-        $reduced = array_filter($this->getDatas(), function ($data) use ($idData) {
+        $reduced = array_filter($this->getDatas(), function($data) use ($idData) {
             return $data->id == $idData;
         });
         return reset($reduced);
@@ -365,7 +365,7 @@ 
         if (empty ($this->pubdate)) {
             return '';
         }
-        $dateY = (int) substr($this->pubdate, 0, 4);
+        $dateY = (int)substr($this->pubdate, 0, 4);
         if ($dateY > 102) {
             return str_pad($dateY, 4, '0', STR_PAD_LEFT);
         }
@@ -374,8 +374,8 @@ 
 
     public function getComment($withSerie = true) {
         $addition = '';
-        $se = $this->getSerie ();
-        if (!is_null ($se) && $withSerie) {
+        $se = $this->getSerie();
+        if (!is_null($se) && $withSerie) {
             $addition = $addition . '<strong>' . localize('content.series') . '</strong>' . str_format(localize('content.series.data'), $this->seriesIndex, htmlspecialchars($se->name)) . "<br />\n";
         }
         if (preg_match('/<\/(div|p|a|span)>/', $this->comment))
@@ -389,7 +389,7 @@ 
     }
 
     public function getDataFormat($format) {
-        $reduced = array_filter($this->getDatas(), function ($data) use ($format) {
+        $reduced = array_filter($this->getDatas(), function($data) use ($format) {
             return $data->format == $format;
         });
         return reset($reduced);
@@ -454,7 +454,7 @@ 
             }
             $epub->Authors($authorArray);
             $epub->Language($this->getLanguages());
-            $epub->Description ($this->getComment(false));
+            $epub->Description($this->getComment(false));
             $epub->Subjects($this->getTagsName());
             // -DC- Use cover file name
             // $epub->Cover2($this->getFilePath('jpg'), 'image/jpeg');
@@ -466,7 +466,7 @@ 
                 $epub->SerieIndex($this->seriesIndex);
             }
             $filename = $data->getUpdatedFilenameEpub();
-            if ($config['cops_provide_kepub'] == '1'  && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
+            if ($config['cops_provide_kepub'] == '1' && preg_match('/Kobo/', $_SERVER['HTTP_USER_AGENT'])) {
                 $epub->updateForKepub();
                 $filename = $data->getUpdatedFilenameKepub();
             }
@@ -494,11 +494,11 @@ 
             if (!is_null($width)) {
                 $nw = $width;
                 if ($nw >= $w) { return false; }
-                $nh = ($nw*$h)/$w;
+                $nh = ($nw * $h) / $w;
             } else {
                 $nh = $height;
                 if ($nh >= $h) { return false; }
-                $nw = ($nh*$w)/$h;
+                $nw = ($nh * $w) / $h;
             }
         } else {
             return false;
@@ -511,7 +511,7 @@ 
         else {
         	$src_img = imagecreatefromjpeg($file);
         }
-        $dst_img = imagecreatetruecolor($nw,$nh);
+        $dst_img = imagecreatetruecolor($nw, $nh);
         if (!imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h)) {
         	return false;
         }
@@ -531,7 +531,7 @@ 
         return true;
     }
 
-    public function getLinkArray ()
+    public function getLinkArray()
     {
         $linkArray = array();
 
@@ -564,7 +564,7 @@ 
         }
 
         $serie = $this->getSerie();
-        if (!is_null ($serie)) {
+        if (!is_null($serie)) {
             array_push($linkArray, new LinkNavigation($serie->getUri(), 'related', str_format(localize('content.series.data'), $this->seriesIndex, $serie->name)));
         }
 
@@ -589,13 +589,13 @@ 
         $entry = new Entry(localize('allbooks.title'),
                           self::ALL_BOOKS_ID,
                           str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text',
-                          array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks);
+                          array(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS)), '', $nBooks);
         array_push($result, $entry);
         if ($config['cops_recentbooks_limit'] > 0) {
             $entry = new Entry(localize('recent.title'),
                               self::ALL_RECENT_BOOKS_ID,
                               str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text',
-                              array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
+                              array(new LinkNavigation('?page=' . parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
             array_push($result, $entry);
         }
         return $result;
@@ -691,7 +691,7 @@ 
     }
 
     public static function getBooks($n) {
-        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL , array (), $n);
+        list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL, array(), $n);
         return array($entryArray, $totalNumber);
     }
 
@@ -708,7 +708,7 @@ 
         {
             array_push($entryArray, new Entry($post->title, Book::getEntryIdByLetter($post->title),
                 str_format(localize('bookword', $post->count), $post->count), 'text',
-                array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS_LETTER.'&id='. rawurlencode($post->title))), '', $post->count));
+                array(new LinkNavigation('?page=' . parent::PAGE_ALL_BOOKS_LETTER . '&id=' . rawurlencode($post->title))), '', $post->count));
         }
         return $entryArray;
     }
@@ -733,7 +733,7 @@ 
 
     public static function getAllRecentBooks() {
         global $config;
-        list ($entryArray, ) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
+        list ($entryArray,) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
         return $entryArray;
     }
 

Braces +103 added lines, -81 removed lines

@@ -108,7 +108,8 @@ 
     public $format = array ();
     private $coverFileName = NULL;
 
-    public function __construct($line) {
+    public function __construct($line)
+    {
     	global $config;
 
         $this->id = $line->id;
@@ -168,8 +169,7 @@ 
         		}
         		if ($cover === false || !file_exists($cover)) {
         			$this->hasCover = 0;
-        		}
-        		else {
+        		} else {
         			$this->coverFileName = $cover;
         		}
         	}
@@ -190,25 +190,32 @@ 
     	return $res;
     }
 
-    public function getEntryId() {
+    public function getEntryId()
+    {
         return self::ALL_BOOKS_UUID.':'.$this->uuid;
     }
 
-    public static function getEntryIdByLetter ($startingLetter) {
+    public static function getEntryIdByLetter ($startingLetter)
+    {
         return self::ALL_BOOKS_ID.':letter:'.$startingLetter;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return '?page='.parent::PAGE_BOOK_DETAIL.'&id=' . $this->id;
     }
 
-    public function getDetailUrl () {
+    public function getDetailUrl ()
+    {
         $urlParam = $this->getUri();
-        if (!is_null(GetUrlParam(DB))) $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB));
+        if (!is_null(GetUrlParam(DB))) {
+            $urlParam = addURLParameter($urlParam, DB, GetUrlParam (DB));
+        }
         return 'index.php' . $urlParam;
     }
 
-    public function getTitle () {
+    public function getTitle ()
+    {
         return $this->title;
     }
 
@@ -217,22 +224,26 @@ 
     /**
      * @return Author[]
      */
-    public function getAuthors () {
+    public function getAuthors ()
+    {
         if (is_null($this->authors)) {
             $this->authors = Author::getAuthorByBookId($this->id);
         }
         return $this->authors;
     }
 
-    public function getAuthorsName () {
+    public function getAuthorsName ()
+    {
         return implode(', ', array_map(function ($author) { return $author->name; }, $this->getAuthors()));
     }
 
-    public function getAuthorsSort () {
+    public function getAuthorsSort ()
+    {
         return implode(', ', array_map(function ($author) { return $author->sort; }, $this->getAuthors()));
     }
 
-    public function getPublisher () {
+    public function getPublisher ()
+    {
         if (is_null($this->publisher)) {
             $this->publisher = Publisher::getPublisherByBookId($this->id);
         }
@@ -242,7 +253,8 @@ 
     /**
      * @return Serie
      */
-    public function getSerie() {
+    public function getSerie()
+    {
         if (is_null($this->serie)) {
             $this->serie = Serie::getSerieByBookId($this->id);
         }
@@ -252,7 +264,8 @@ 
     /**
      * @return string
      */
-    public function getLanguages() {
+    public function getLanguages()
+    {
         $lang = array();
         $result = parent::getDb()->prepare('select languages.lang_code
                 from books_languages_link, languages
@@ -260,8 +273,7 @@ 
                 and book = ?
                 order by item_order');
         $result->execute(array($this->id));
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             array_push($lang, Language::getLanguageString($post->lang_code));
         }
         return implode(', ', $lang);
@@ -270,7 +282,8 @@ 
     /**
      * @return Tag[]
      */
-    public function getTags() {
+    public function getTags()
+    {
         if (is_null ($this->tags)) {
             $this->tags = array();
 
@@ -280,15 +293,15 @@ 
                 and book = ?
                 order by name');
             $result->execute(array($this->id));
-            while ($post = $result->fetchObject())
-            {
+            while ($post = $result->fetchObject()) {
                 array_push($this->tags, new Tag($post));
             }
         }
         return $this->tags;
     }
 
-    public function getTagsName() {
+    public function getTagsName()
+    {
         return implode(', ', array_map(function ($tag) { return $tag->name; }, $this->getTags()));
     }
 
@@ -305,9 +318,12 @@ 
 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
-    public static function getFilterString() {
+    public static function getFilterString()
+    {
         $filter = getURLParam('tag', NULL);
-        if (empty($filter)) return '';
+        if (empty($filter)) {
+            return '';
+        }
 
         $exists = true;
         if (preg_match("/^!(.*)$/", $filter, $matches)) {
@@ -347,7 +363,8 @@ 
         return reset($reduced);
     }
 
-    public function getRating() {
+    public function getRating()
+    {
         if (is_null($this->rating) || $this->rating == 0) {
             return '';
         }
@@ -361,7 +378,8 @@ 
         return $retour;
     }
 
-    public function getPubDate() {
+    public function getPubDate()
+    {
         if (empty ($this->pubdate)) {
             return '';
         }
@@ -372,23 +390,22 @@ 
         return '';
     }
 
-    public function getComment($withSerie = true) {
+    public function getComment($withSerie = true)
+    {
         $addition = '';
         $se = $this->getSerie ();
         if (!is_null ($se) && $withSerie) {
             $addition = $addition . '<strong>' . localize('content.series') . '</strong>' . str_format(localize('content.series.data'), $this->seriesIndex, htmlspecialchars($se->name)) . "<br />\n";
         }
-        if (preg_match('/<\/(div|p|a|span)>/', $this->comment))
-        {
+        if (preg_match('/<\/(div|p|a|span)>/', $this->comment)) {
             return $addition . html2xhtml($this->comment);
-        }
-        else
-        {
+        } else {
             return $addition . htmlspecialchars($this->comment);
         }
     }
 
-    public function getDataFormat($format) {
+    public function getDataFormat($format)
+    {
         $reduced = array_filter($this->getDatas(), function ($data) use ($format) {
             return $data->format == $format;
         });
@@ -419,16 +436,14 @@ 
     	if ($extension == "jpg" || $extension == "png") {
     		if (empty($this->coverFileName)) {
     			return $this->path . '/cover.' . $extension;
-    		}
-    		else {
+    		} else {
     			$ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
     			if ($ext == $extension) {
     				return $this->coverFileName;
     			}
     		}
     		return false;
-    	}
-    	else {
+    	} else {
     		$data = $this->getDataById($idData);
     		if (!$data) {
     			return NULL;
@@ -443,8 +458,7 @@ 
         global $config;
         $data = $this->getDataById($idData);
 
-        try
-        {
+        try {
             $epub = new EPub($data->getLocalPath());
 
             $epub->Title($this->title);
@@ -471,14 +485,13 @@ 
                 $filename = $data->getUpdatedFilenameKepub();
             }
             $epub->download($filename);
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             echo 'Exception : ' . $e->getMessage();
         }
     }
 
-    public function getThumbnail($width, $height, $outputfile = NULL, $inType = 'jpg') {
+    public function getThumbnail($width, $height, $outputfile = NULL, $inType = 'jpg')
+    {
         if (is_null($width) && is_null($height)) {
             return false;
         }
@@ -507,8 +520,7 @@ 
         // Draw the image
         if ($inType == 'png') {
         	$src_img = imagecreatefrompng($file);
-        }
-        else {
+        } else {
         	$src_img = imagecreatefromjpeg($file);
         }
         $dst_img = imagecreatetruecolor($nw,$nh);
@@ -519,8 +531,7 @@ 
         	if (!imagepng($dst_img, $outputfile, 9)) {
         		return false;
         	}
-        }
-        else {
+        } else {
         	if (!imagejpeg($dst_img, $outputfile, 80)) {
         		return false;
         	}
@@ -543,17 +554,14 @@ 
         	if ($ext == 'png') {
         		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", NULL));
         		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", NULL));
-        	}
-        	else {
+        	} else {
         		array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
         		array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
         	}
         }
 
-        foreach ($this->getDatas() as $data)
-        {
-            if ($data->isKnownType())
-            {
+        foreach ($this->getDatas() as $data) {
+            if ($data->isKnownType()) {
                 array_push($linkArray, $data->getDataLink(Link::OPDS_ACQUISITION_TYPE, $data->format));
             }
         }
@@ -572,17 +580,20 @@ 
     }
 
 
-    public function getEntry() {
+    public function getEntry()
+    {
         return new EntryBook($this->getTitle(), $this->getEntryId(),
             $this->getComment(), 'text/html',
             $this->getLinkArray(), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = NULL)
+    {
         return parent::executeQuerySingle('select count(*) from books', $database);
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         global $config;
         $nBooks = parent::executeQuerySingle('select count(*) from books');
         $result = array();
@@ -601,27 +612,33 @@ 
         return $result;
     }
 
-    public static function getBooksByAuthor($authorId, $n) {
+    public static function getBooksByAuthor($authorId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_AUTHOR, array($authorId), $n);
     }
 
-    public static function getBooksByRating($ratingId, $n) {
+    public static function getBooksByRating($ratingId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_RATING, array($ratingId), $n);
     }
 
-    public static function getBooksByPublisher($publisherId, $n) {
+    public static function getBooksByPublisher($publisherId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_PUBLISHER, array($publisherId), $n);
     }
 
-    public static function getBooksBySeries($serieId, $n) {
+    public static function getBooksBySeries($serieId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_SERIE, array($serieId), $n);
     }
 
-    public static function getBooksByTag($tagId, $n) {
+    public static function getBooksByTag($tagId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_TAG, array($tagId), $n);
     }
 
-    public static function getBooksByLanguage($languageId, $n) {
+    public static function getBooksByLanguage($languageId, $n)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_LANGUAGE, array($languageId), $n);
     }
 
@@ -631,32 +648,33 @@ 
      * @param $n integer
      * @return array
      */
-    public static function getBooksByCustom($customColumn, $id, $n) {
+    public static function getBooksByCustom($customColumn, $id, $n)
+    {
         list($query, $params) = $customColumn->getQuery($id);
 
         return self::getEntryArray($query, $params, $n);
     }
 
-    public static function getBookById($bookId) {
+    public static function getBookById($bookId)
+    {
     	$result = parent::getDb()->prepare('select ' . self::getBookColumns() . '
 from books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where books.id = ?');
         $result->execute(array($bookId));
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             $book = new Book($post);
             return $book;
         }
         return NULL;
     }
 
-    public static function getBookByDataId($dataId) {
+    public static function getBookByDataId($dataId)
+    {
     	$result = parent::getDb()->prepare('select ' . self::getBookColumns() . ', data.name, data.format
 from data, books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where data.book = books.id and data.id = ?');
         $result->execute(array($dataId));
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             $book = new Book($post);
             $data = new Data($post, $book);
             $data->id = $dataId;
@@ -666,7 +684,8 @@ 
         return NULL;
     }
 
-    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $i = 0;
         $critArray = array();
         foreach (array(PageQueryResult::SCOPE_AUTHOR,
@@ -677,8 +696,7 @@ 
             if (in_array($key, getCurrentOption('ignored_categories')) ||
                 (!array_key_exists($key, $query) && !array_key_exists('all', $query))) {
                 $critArray[$i] = self::BAD_SEARCH;
-            }
-            else {
+            } else {
                 if (array_key_exists($key, $query)) {
                     $critArray[$i] = $query[$key];
                 } else {
@@ -690,12 +708,14 @@ 
         return self::getEntryArray(self::SQL_BOOKS_QUERY, $critArray, $n, $database, $numberPerPage);
     }
 
-    public static function getBooks($n) {
+    public static function getBooks($n)
+    {
         list ($entryArray, $totalNumber) = self::getEntryArray(self::SQL_BOOKS_ALL , array (), $n);
         return array($entryArray, $totalNumber);
     }
 
-    public static function getAllBooks() {
+    public static function getAllBooks()
+    {
         /* @var $result PDOStatement */
 
         list (, $result) = parent::executeQuery('select {0}
@@ -704,8 +724,7 @@ 
 order by substr (upper (sort), 1, 1)', 'substr (upper (sort), 1, 1) as title, count(*) as count', self::getFilterString(), array(), -1);
 
         $entryArray = array();
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             array_push($entryArray, new Entry($post->title, Book::getEntryIdByLetter($post->title),
                 str_format(localize('bookword', $post->count), $post->count), 'text',
                 array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS_LETTER.'&id='. rawurlencode($post->title))), '', $post->count));
@@ -713,25 +732,27 @@ 
         return $entryArray;
     }
 
-    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL)
+    {
         return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL)
+    {
         /* @var $totalNumber integer */
         /* @var $result PDOStatement */
     	list($totalNumber, $result) = parent::executeQuery($query, self::getBookColumns(), self::getFilterString(), $params, $n, $database, $numberPerPage);
 
         $entryArray = array();
-        while ($post = $result->fetchObject())
-        {
+        while ($post = $result->fetchObject()) {
             $book = new Book($post);
             array_push($entryArray, $book->getEntry());
         }
         return array($entryArray, $totalNumber);
     }
 
-    public static function getAllRecentBooks() {
+    public static function getAllRecentBooks()
+    {
         global $config;
         list ($entryArray, ) = self::getEntryArray(self::SQL_BOOKS_RECENT . $config['cops_recentbooks_limit'], array(), -1);
         return $entryArray;
@@ -743,7 +764,8 @@ 
      * @param string[] $columns
      * @return CustomColumn[]
      */
-    public function getCustomColumnValues($columns, $asArray = false) {
+    public function getCustomColumnValues($columns, $asArray = false)
+    {
         $result = array();
 
         foreach ($columns as $lookup) {

Upper-Lower-Casing +26 added lines, -26 removed lines

@@ -99,14 +99,14 @@ 
     public $seriesIndex;
     public $comment;
     public $rating;
-    public $datas = NULL;
-    public $authors = NULL;
-    public $publisher = NULL;
-    public $serie = NULL;
-    public $tags = NULL;
-    public $languages = NULL;
+    public $datas = null;
+    public $authors = null;
+    public $publisher = null;
+    public $serie = null;
+    public $tags = null;
+    public $languages = null;
     public $format = array ();
-    private $coverFileName = NULL;
+    private $coverFileName = null;
 
     public function __construct($line) {
     	global $config;
@@ -136,12 +136,12 @@ 
         		$imgDirectory = Base::getImgDirectory();
         		$this->coverFileName = $line->cover;
         		if (!file_exists($this->coverFileName)) {
-        			$this->coverFileName = NULL;
+        			$this->coverFileName = null;
         		}
         		if (empty($this->coverFileName)) {
         			$this->coverFileName = sprintf('%s%s', $imgDirectory, $line->cover);
         			if (!file_exists($this->coverFileName)) {
-        				$this->coverFileName = NULL;
+        				$this->coverFileName = null;
         			}
         		}
         		if (empty($this->coverFileName)) {
@@ -149,12 +149,12 @@ 
         			if ($data) {
         				$this->coverFileName = sprintf('%s%s/%s', $imgDirectory, $data->name, $line->cover);
         				if (!file_exists($this->coverFileName)) {
-        					$this->coverFileName = NULL;
+        					$this->coverFileName = null;
         				}
         				if (empty($this->coverFileName)) {
         					$this->coverFileName = sprintf('%s%s.jpg', $imgDirectory, $data->name);
         					if (!file_exists($this->coverFileName)) {
-        						$this->coverFileName = NULL;
+        						$this->coverFileName = null;
         					}
         				}
         			}
@@ -306,7 +306,7 @@ 
     /* End of other class (author, series, tag, ...) initialization and accessors */
 
     public static function getFilterString() {
-        $filter = getURLParam('tag', NULL);
+        $filter = getURLParam('tag', null);
         if (empty($filter)) return '';
 
         $exists = true;
@@ -328,7 +328,7 @@ 
     {
         $bestFormatForKindle = array('EPUB', 'PDF', 'AZW3', 'MOBI');
         $bestRank = -1;
-        $bestData = NULL;
+        $bestData = null;
         foreach ($this->getDatas() as $data) {
             $key = array_search($data->format, $bestFormatForKindle);
             if ($key !== false && $key > $bestRank) {
@@ -395,7 +395,7 @@ 
         return reset($reduced);
     }
 
-    public function getFilePath($extension, $idData = NULL, $relative = false)
+    public function getFilePath($extension, $idData = null, $relative = false)
     {
         /*if ($extension == 'jpg')
         {
@@ -431,7 +431,7 @@ 
     	else {
     		$data = $this->getDataById($idData);
     		if (!$data) {
-    			return NULL;
+    			return null;
     		}
     		$file = $data->name . "." . strtolower($data->format);
     		return $this->path . '/' . $file;
@@ -478,7 +478,7 @@ 
         }
     }
 
-    public function getThumbnail($width, $height, $outputfile = NULL, $inType = 'jpg') {
+    public function getThumbnail($width, $height, $outputfile = null, $inType = 'jpg') {
         if (is_null($width) && is_null($height)) {
             return false;
         }
@@ -541,12 +541,12 @@ 
         	//array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
         	$ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
         	if ($ext == 'png') {
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", NULL));
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", NULL));
+        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", null));
+        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", null));
         	}
         	else {
-        		array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
-        		array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
+        		array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', null));
+        		array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", null));
         	}
         }
 
@@ -578,7 +578,7 @@ 
             $this->getLinkArray(), $this);
     }
 
-    public static function getBookCount($database = NULL) {
+    public static function getBookCount($database = null) {
         return parent::executeQuerySingle('select count(*) from books', $database);
     }
 
@@ -647,7 +647,7 @@ 
             $book = new Book($post);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
     public static function getBookByDataId($dataId) {
@@ -663,10 +663,10 @@ 
             $book->datas = array($data);
             return $book;
         }
-        return NULL;
+        return null;
     }
 
-    public static function getBooksByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByQuery($query, $n, $database = null, $numberPerPage = null) {
         $i = 0;
         $critArray = array();
         foreach (array(PageQueryResult::SCOPE_AUTHOR,
@@ -713,11 +713,11 @@ 
         return $entryArray;
     }
 
-    public static function getBooksByStartingLetter($letter, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getBooksByStartingLetter($letter, $n, $database = null, $numberPerPage = null) {
         return self::getEntryArray(self::SQL_BOOKS_BY_FIRST_LETTER, array($letter . '%'), $n, $database, $numberPerPage);
     }
 
-    public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getEntryArray($query, $params, $n, $database = null, $numberPerPage = null) {
         /* @var $totalNumber integer */
         /* @var $result PDOStatement */
     	list($totalNumber, $result) = parent::executeQuery($query, self::getBookColumns(), self::getFilterString(), $params, $n, $database, $numberPerPage);

Indentation +104 added lines, -104 removed lines

@@ -109,7 +109,7 @@ 
     private $coverFileName = NULL;
 
     public function __construct($line) {
-    	global $config;
+        global $config;
 
         $this->id = $line->id;
         $this->title = $line->title;
@@ -120,7 +120,7 @@ 
         // -DC- Init relative or full path
         $this->path = $line->path;
         if (!is_dir($this->path)) {
-        	$this->path = Base::getDbDirectory() . $line->path;
+            $this->path = Base::getDbDirectory() . $line->path;
         }
         $this->seriesIndex = $line->series_index;
         $this->comment = $line->comment;
@@ -132,48 +132,48 @@ 
         //    $this->hasCover = 0;
         //}
         if ($this->hasCover) {
-        	if (!empty($config['calibre_database_field_cover'])) {
-        		$imgDirectory = Base::getImgDirectory();
-        		$this->coverFileName = $line->cover;
-        		if (!file_exists($this->coverFileName)) {
-        			$this->coverFileName = NULL;
-        		}
-        		if (empty($this->coverFileName)) {
-        			$this->coverFileName = sprintf('%s%s', $imgDirectory, $line->cover);
-        			if (!file_exists($this->coverFileName)) {
-        				$this->coverFileName = NULL;
-        			}
-        		}
-        		if (empty($this->coverFileName)) {
-        			// Try with the epub file name
-        			$data = $this->getDataFormat('EPUB');
-        			if ($data) {
-        				$this->coverFileName = sprintf('%s%s/%s', $imgDirectory, $data->name, $line->cover);
-        				if (!file_exists($this->coverFileName)) {
-        					$this->coverFileName = NULL;
-        				}
-        				if (empty($this->coverFileName)) {
-        					$this->coverFileName = sprintf('%s%s.jpg', $imgDirectory, $data->name);
-        					if (!file_exists($this->coverFileName)) {
-        						$this->coverFileName = NULL;
-        					}
-        				}
-        			}
-        		}
-        	}
-        	// Else try with default cover file name
-        	if (empty($this->coverFileName)) {
-        		$cover = $this->getFilePath("jpg");
-        		if ($cover === false || !file_exists($cover)) {
-        			$cover = $this->getFilePath("png");
-        		}
-        		if ($cover === false || !file_exists($cover)) {
-        			$this->hasCover = 0;
-        		}
-        		else {
-        			$this->coverFileName = $cover;
-        		}
-        	}
+            if (!empty($config['calibre_database_field_cover'])) {
+                $imgDirectory = Base::getImgDirectory();
+                $this->coverFileName = $line->cover;
+                if (!file_exists($this->coverFileName)) {
+                    $this->coverFileName = NULL;
+                }
+                if (empty($this->coverFileName)) {
+                    $this->coverFileName = sprintf('%s%s', $imgDirectory, $line->cover);
+                    if (!file_exists($this->coverFileName)) {
+                        $this->coverFileName = NULL;
+                    }
+                }
+                if (empty($this->coverFileName)) {
+                    // Try with the epub file name
+                    $data = $this->getDataFormat('EPUB');
+                    if ($data) {
+                        $this->coverFileName = sprintf('%s%s/%s', $imgDirectory, $data->name, $line->cover);
+                        if (!file_exists($this->coverFileName)) {
+                            $this->coverFileName = NULL;
+                        }
+                        if (empty($this->coverFileName)) {
+                            $this->coverFileName = sprintf('%s%s.jpg', $imgDirectory, $data->name);
+                            if (!file_exists($this->coverFileName)) {
+                                $this->coverFileName = NULL;
+                            }
+                        }
+                    }
+                }
+            }
+            // Else try with default cover file name
+            if (empty($this->coverFileName)) {
+                $cover = $this->getFilePath("jpg");
+                if ($cover === false || !file_exists($cover)) {
+                    $cover = $this->getFilePath("png");
+                }
+                if ($cover === false || !file_exists($cover)) {
+                    $this->hasCover = 0;
+                }
+                else {
+                    $this->coverFileName = $cover;
+                }
+            }
         }
         $this->rating = $line->rating;
     }
@@ -181,14 +181,14 @@ 
     // -DC- Get customisable book columns
     private static function getBookColumns()
     {
-    	global $config;
+        global $config;
 
-    	$res = self::BOOK_COLUMNS;
-    	if (!empty($config['calibre_database_field_cover'])) {
-    		$res = str_replace('has_cover,', 'has_cover, ' . $config['calibre_database_field_cover'] . ',', $res);
-    	}
+        $res = self::BOOK_COLUMNS;
+        if (!empty($config['calibre_database_field_cover'])) {
+            $res = str_replace('has_cover,', 'has_cover, ' . $config['calibre_database_field_cover'] . ',', $res);
+        }
 
-    	return $res;
+        return $res;
     }
 
     public function getEntryId() {
@@ -417,26 +417,26 @@ 
         {
             return $this->path.'/'.$file;
         }*/
-    	if ($extension == "jpg" || $extension == "png") {
-    		if (empty($this->coverFileName)) {
-    			return $this->path . '/cover.' . $extension;
-    		}
-    		else {
-    			$ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
-    			if ($ext == $extension) {
-    				return $this->coverFileName;
-    			}
-    		}
-    		return false;
-    	}
-    	else {
-    		$data = $this->getDataById($idData);
-    		if (!$data) {
-    			return NULL;
-    		}
-    		$file = $data->name . "." . strtolower($data->format);
-    		return $this->path . '/' . $file;
-    	}
+        if ($extension == "jpg" || $extension == "png") {
+            if (empty($this->coverFileName)) {
+                return $this->path . '/cover.' . $extension;
+            }
+            else {
+                $ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
+                if ($ext == $extension) {
+                    return $this->coverFileName;
+                }
+            }
+            return false;
+        }
+        else {
+            $data = $this->getDataById($idData);
+            if (!$data) {
+                return NULL;
+            }
+            $file = $data->name . "." . strtolower($data->format);
+            return $this->path . '/' . $file;
+        }
     }
 
     public function getUpdatedEpub($idData)
@@ -507,24 +507,24 @@ 
 
         // Draw the image
         if ($inType == 'png') {
-        	$src_img = imagecreatefrompng($file);
+            $src_img = imagecreatefrompng($file);
         }
         else {
-        	$src_img = imagecreatefromjpeg($file);
+            $src_img = imagecreatefromjpeg($file);
         }
         $dst_img = imagecreatetruecolor($nw,$nh);
         if (!imagecopyresampled($dst_img, $src_img, 0, 0, 0, 0, $nw, $nh, $w, $h)) {
-        	return false;
+            return false;
         }
         if ($inType == 'png') {
-        	if (!imagepng($dst_img, $outputfile, 9)) {
-        		return false;
-        	}
+            if (!imagepng($dst_img, $outputfile, 9)) {
+                return false;
+            }
         }
         else {
-        	if (!imagejpeg($dst_img, $outputfile, 80)) {
-        		return false;
-        	}
+            if (!imagejpeg($dst_img, $outputfile, 80)) {
+                return false;
+            }
         }
         imagedestroy($src_img);
         imagedestroy($dst_img);
@@ -537,18 +537,18 @@ 
         $linkArray = array();
 
         if ($this->hasCover) {
-        	// -DC- Use cover file name
-        	//array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
-        	//array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
-        	$ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
-        	if ($ext == 'png') {
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", NULL));
-        		array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", NULL));
-        	}
-        	else {
-        		array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
-        		array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
-        	}
+            // -DC- Use cover file name
+            //array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
+            //array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_THUMBNAIL_TYPE, 'cover.jpg', NULL));
+            $ext = strtolower(pathinfo($this->coverFileName, PATHINFO_EXTENSION));
+            if ($ext == 'png') {
+                array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_IMAGE_TYPE, "cover.png", NULL));
+                array_push($linkArray, Data::getLink($this, "png", "image/png", Link::OPDS_THUMBNAIL_TYPE, "cover.png", NULL));
+            }
+            else {
+                array_push($linkArray, Data::getLink($this, 'jpg', 'image/jpeg', Link::OPDS_IMAGE_TYPE, 'cover.jpg', NULL));
+                array_push($linkArray, Data::getLink($this, "jpg", "image/jpeg", Link::OPDS_THUMBNAIL_TYPE, "cover.jpg", NULL));
+            }
         }
 
         foreach ($this->getDatas() as $data)
@@ -588,15 +588,15 @@ 
         $nBooks = parent::executeQuerySingle('select count(*) from books');
         $result = array();
         $entry = new Entry(localize('allbooks.title'),
-                          self::ALL_BOOKS_ID,
-                          str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text',
-                          array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks);
+                            self::ALL_BOOKS_ID,
+                            str_format(localize('allbooks.alphabetical', $nBooks), $nBooks), 'text',
+                            array(new LinkNavigation('?page='.parent::PAGE_ALL_BOOKS)), '', $nBooks);
         array_push($result, $entry);
         if ($config['cops_recentbooks_limit'] > 0) {
             $entry = new Entry(localize('recent.title'),
-                              self::ALL_RECENT_BOOKS_ID,
-                              str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text',
-                              array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
+                                self::ALL_RECENT_BOOKS_ID,
+                                str_format(localize('recent.list'), $config['cops_recentbooks_limit']), 'text',
+                                array ( new LinkNavigation ('?page='.parent::PAGE_ALL_RECENT_BOOKS)), '', $config['cops_recentbooks_limit']);
             array_push($result, $entry);
         }
         return $result;
@@ -639,7 +639,7 @@ 
     }
 
     public static function getBookById($bookId) {
-    	$result = parent::getDb()->prepare('select ' . self::getBookColumns() . '
+        $result = parent::getDb()->prepare('select ' . self::getBookColumns() . '
 from books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where books.id = ?');
         $result->execute(array($bookId));
@@ -652,7 +652,7 @@ 
     }
 
     public static function getBookByDataId($dataId) {
-    	$result = parent::getDb()->prepare('select ' . self::getBookColumns() . ', data.name, data.format
+        $result = parent::getDb()->prepare('select ' . self::getBookColumns() . ', data.name, data.format
 from data, books ' . self::SQL_BOOKS_LEFT_JOIN . '
 where data.book = books.id and data.id = ?');
         $result->execute(array($dataId));
@@ -671,10 +671,10 @@ 
         $i = 0;
         $critArray = array();
         foreach (array(PageQueryResult::SCOPE_AUTHOR,
-                       PageQueryResult::SCOPE_TAG,
-                       PageQueryResult::SCOPE_SERIES,
-                       PageQueryResult::SCOPE_PUBLISHER,
-                       PageQueryResult::SCOPE_BOOK) as $key) {
+                        PageQueryResult::SCOPE_TAG,
+                        PageQueryResult::SCOPE_SERIES,
+                        PageQueryResult::SCOPE_PUBLISHER,
+                        PageQueryResult::SCOPE_BOOK) as $key) {
             if (in_array($key, getCurrentOption('ignored_categories')) ||
                 (!array_key_exists($key, $query) && !array_key_exists('all', $query))) {
                 $critArray[$i] = self::BAD_SEARCH;
@@ -721,7 +721,7 @@ 
     public static function getEntryArray($query, $params, $n, $database = NULL, $numberPerPage = NULL) {
         /* @var $totalNumber integer */
         /* @var $result PDOStatement */
-    	list($totalNumber, $result) = parent::executeQuery($query, self::getBookColumns(), self::getFilterString(), $params, $n, $database, $numberPerPage);
+        list($totalNumber, $result) = parent::executeQuery($query, self::getBookColumns(), self::getFilterString(), $params, $n, $database, $numberPerPage);
 
         $entryArray = array();
         while ($post = $result->fetchObject())

fetch.php

Indentation +8 added lines, -8 removed lines

@@ -41,7 +41,7 @@ 
 
     // -DC- Add png type
     if ($book && ($type == 'jpg' || $type == 'png' || empty ($config['calibre_internal_directory']))) {
-    	  if ($type == 'jpg' || $type == 'png') {
+            if ($type == 'jpg' || $type == 'png') {
             $file = $book->getFilePath($type);
         } else {
             $file = $book->getFilePath($type, $idData);
@@ -54,15 +54,15 @@ 
 
     switch ($type)
     {
-    		// -DC- Add png type
+            // -DC- Add png type
         case 'jpg':
         case 'png':
-        		if ($type == 'jpg') {
-          	  header('Content-Type: image/jpeg');
-        		}
-        		else {
-        			header('Content-Type: image/png');
-        		}
+                if ($type == 'jpg') {
+                header('Content-Type: image/jpeg');
+                }
+                else {
+                    header('Content-Type: image/png');
+                }
             //by default, we don't cache
             $thumbnailCacheFullpath = null;
             if ( isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '' ) {

Braces +2 added lines, -4 removed lines

@@ -52,15 +52,13 @@
         }
     }
 
-    switch ($type)
-    {
+    switch ($type) {
     		// -DC- Add png type
         case 'jpg':
         case 'png':
         		if ($type == 'jpg') {
           	  header('Content-Type: image/jpeg');
-        		}
-        		else {
+        		} else {
         			header('Content-Type: image/png');
         		}
             //by default, we don't cache

Upper-Lower-Casing +3 added lines, -3 removed lines

@@ -23,10 +23,10 @@
     header('Pragma: public');
     header('Cache-Control: max-age=' . $expires);
     header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
-    $bookId   = getURLParam('id', NULL);
+    $bookId   = getURLParam('id', null);
     $type     = getURLParam('type', 'jpg');
-    $idData   = getURLParam('data', NULL);
-    $viewOnly = getURLParam('view', FALSE);
+    $idData   = getURLParam('data', null);
+    $viewOnly = getURLParam('view', false);
 
     if (is_null($bookId)) {
         $book = Book::getBookByDataId($idData);

Spacing +10 added lines, -10 removed lines

@@ -19,10 +19,10 @@ 
         }
     }
 
-    $expires = 60*60*24*14;
+    $expires = 60 * 60 * 24 * 14;
     header('Pragma: public');
     header('Cache-Control: max-age=' . $expires);
-    header('Expires: ' . gmdate('D, d M Y H:i:s', time()+$expires) . ' GMT');
+    header('Expires: ' . gmdate('D, d M Y H:i:s', time() + $expires) . ' GMT');
     $bookId   = getURLParam('id', NULL);
     $type     = getURLParam('type', 'jpg');
     $idData   = getURLParam('data', NULL);
@@ -35,7 +35,7 @@ 
     }
 
     if (!$book) {
-        notFound ();
+        notFound();
         return;
     }
 
@@ -65,15 +65,15 @@ 
         		}
             //by default, we don't cache
             $thumbnailCacheFullpath = null;
-            if ( isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '' ) {
+            if (isset($config['cops_thumbnail_cache_directory']) && $config['cops_thumbnail_cache_directory'] !== '') {
                 $thumbnailCacheFullpath = $config['cops_thumbnail_cache_directory'];
                 //if multiple databases, add a subfolder with the database ID
-                $thumbnailCacheFullpath .= !is_null(GetUrlParam (DB)) ? 'db-' . GetUrlParam (DB) . DIRECTORY_SEPARATOR : '';
+                $thumbnailCacheFullpath .= !is_null(GetUrlParam(DB))?'db-' . GetUrlParam(DB) . DIRECTORY_SEPARATOR:'';
                 //when there are lots of thumbnails, it's better to save files in subfolders, so if the book's uuid is
                 //"01234567-89ab-cdef-0123-456789abcdef", we will save the thumbnail in .../0/12/34567-89ab-cdef-0123-456789abcdef-...
                 $thumbnailCacheFullpath .= substr($book->uuid, 0, 1) . DIRECTORY_SEPARATOR . substr($book->uuid, 1, 2) . DIRECTORY_SEPARATOR;
                 //check if cache folder exists or create it
-                if ( file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true) ) {
+                if (file_exists($thumbnailCacheFullpath) || mkdir($thumbnailCacheFullpath, 0700, true)) {
                     //we name the thumbnail from the book's uuid and it's dimensions (width and/or height)
                     $thumbnailCacheName = substr($book->uuid, 3) . '-' . getURLParam('width') . 'x' . getURLParam('height') . '.' . $type;
                     $thumbnailCacheFullpath = $thumbnailCacheFullpath . $thumbnailCacheName;
@@ -83,9 +83,9 @@ 
                 }
             }
 
-            if ( $thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath) ) {
+            if ($thumbnailCacheFullpath !== null && file_exists($thumbnailCacheFullpath)) {
                 //return the already cached thumbnail
-                readfile( $thumbnailCacheFullpath );
+                readfile($thumbnailCacheFullpath);
                 return;
             }
 
@@ -93,12 +93,12 @@ 
             $height = getURLParam('height');
             if ($book->getThumbnail($width, $height, $thumbnailCacheFullpath, $type)) {
                 //if we don't cache the thumbnail, imagejpeg() in $book->getThumbnail() already return the image data
-                if ( $thumbnailCacheFullpath === null ) {
+                if ($thumbnailCacheFullpath === null) {
                     // The cover had to be resized
                     return;
                 } else {
                     //return the just cached thumbnail
-                    readfile( $thumbnailCacheFullpath );
+                    readfile($thumbnailCacheFullpath);
                     return;
                 }
             }

lib/Tag.php

Doc Comments +4 added lines

@@ -54,6 +54,10 @@
         return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
     }
 
+    /**
+     * @param string $query
+     * @param integer $numberPerPage
+     */
     public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';

Indentation +6 added lines, -6 removed lines

@@ -43,13 +43,13 @@
     }
 
     public static function getAllTags() {
-    	global $config;
+        global $config;
 
-    	$sql = self::SQL_ALL_TAGS;
-    	$sortField = $config['calibre_database_field_sort'];
-    	if (!empty($sortField)) {
-    		$sql = str_replace('tags.name', 'tags.' . $sortField, $sql);
-    	}
+        $sql = self::SQL_ALL_TAGS;
+        $sortField = $config['calibre_database_field_sort'];
+        if (!empty($sortField)) {
+            $sql = str_replace('tags.name', 'tags.' . $sortField, $sql);
+        }
 
         return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
     }

Spacing +19 added lines, -19 removed lines

@@ -20,24 +20,24 @@ 
         $this->name = $post->name;
     }
 
-    public function getUri () {
-        return "?page=".parent::PAGE_TAG_DETAIL."&id=$this->id";
+    public function getUri() {
+        return "?page=" . parent::PAGE_TAG_DETAIL . "&id=$this->id";
     }
 
-    public function getEntryId () {
-        return self::ALL_TAGS_ID.":".$this->id;
+    public function getEntryId() {
+        return self::ALL_TAGS_ID . ":" . $this->id;
     }
 
     public static function getCount() {
         // str_format (localize("tags.alphabetical", count(array))
-        return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
+        return parent::getCountGeneric("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
-        $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
-        $result->execute (array ($tagId));
-        if ($post = $result->fetchObject ()) {
-            return new Tag ($post);
+    public static function getTagById($tagId) {
+        $result = parent::getDb()->prepare('select id, name  from tags where id = ?');
+        $result->execute(array($tagId));
+        if ($post = $result->fetchObject()) {
+            return new Tag($post);
         }
         return NULL;
     }
@@ -51,21 +51,21 @@ 
     		$sql = str_replace('tags.name', 'tags.' . $sortField, $sql);
     	}
 
-        return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
+        return Base::getEntryArrayWithBookNumber($sql, self::TAG_COLUMNS, array(), "Tag");
     }
 
     public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
-        $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
+        $columns = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
-        list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);
+        list ($totalNumber, $result) = parent::executeQuery($sql, $columns, "", array('%' . $query . '%'), $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
+        while ($post = $result->fetchObject())
         {
-            $tag = new Tag ($post);
-            array_push ($entryArray, new Entry ($tag->name, $tag->getEntryId (),
-                str_format (localize("bookword", $post->count), $post->count), "text",
-                array ( new LinkNavigation ($tag->getUri ()))));
+            $tag = new Tag($post);
+            array_push($entryArray, new Entry($tag->name, $tag->getEntryId(),
+                str_format(localize("bookword", $post->count), $post->count), "text",
+                array(new LinkNavigation($tag->getUri()))));
         }
-        return array ($entryArray, $totalNumber);
+        return array($entryArray, $totalNumber);
     }
 }

Braces +15 added lines, -9 removed lines

@@ -15,25 +15,30 @@ 
     public $id;
     public $name;
 
-    public function __construct($post) {
+    public function __construct($post)
+    {
         $this->id = $post->id;
         $this->name = $post->name;
     }
 
-    public function getUri () {
+    public function getUri ()
+    {
         return "?page=".parent::PAGE_TAG_DETAIL."&id=$this->id";
     }
 
-    public function getEntryId () {
+    public function getEntryId ()
+    {
         return self::ALL_TAGS_ID.":".$this->id;
     }
 
-    public static function getCount() {
+    public static function getCount()
+    {
         // str_format (localize("tags.alphabetical", count(array))
         return parent::getCountGeneric ("tags", self::ALL_TAGS_ID, parent::PAGE_ALL_TAGS);
     }
 
-    public static function getTagById ($tagId) {
+    public static function getTagById ($tagId)
+    {
         $result = parent::getDb ()->prepare('select id, name  from tags where id = ?');
         $result->execute (array ($tagId));
         if ($post = $result->fetchObject ()) {
@@ -42,7 +47,8 @@ 
         return NULL;
     }
 
-    public static function getAllTags() {
+    public static function getAllTags()
+    {
     	global $config;
 
     	$sql = self::SQL_ALL_TAGS;
@@ -54,13 +60,13 @@ 
         return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL)
+    {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
         list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);
         $entryArray = array();
-        while ($post = $result->fetchObject ())
-        {
+        while ($post = $result->fetchObject ()) {
             $tag = new Tag ($post);
             array_push ($entryArray, new Entry ($tag->name, $tag->getEntryId (),
                 str_format (localize("bookword", $post->count), $post->count), "text",

Upper-Lower-Casing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
         if ($post = $result->fetchObject ()) {
             return new Tag ($post);
         }
-        return NULL;
+        return null;
     }
 
     public static function getAllTags() {
@@ -54,7 +54,7 @@ 
         return Base::getEntryArrayWithBookNumber ($sql, self::TAG_COLUMNS, array (), "Tag");
     }
 
-    public static function getAllTagsByQuery($query, $n, $database = NULL, $numberPerPage = NULL) {
+    public static function getAllTagsByQuery($query, $n, $database = null, $numberPerPage = null) {
         $columns  = "tags.id as id, tags.name as name, (select count(*) from books_tags_link where tags.id = tag) as count";
         $sql = 'select {0} from tags where upper (tags.name) like ? {1} order by tags.name';
         list ($totalNumber, $result) = parent::executeQuery ($sql, $columns, "", array ('%' . $query . '%'), $n, $database, $numberPerPage);