seblucas / cops

lib/CustomColumnTypeDate.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
             $id = $date->format("Y-m-d");
 
             $entryPContent = str_format(localize("bookword", $post->count), $post->count);
-            $entryPLinkArray = array(new LinkNavigation ($this->getUri($id)));
+            $entryPLinkArray = array(new LinkNavigation($this->getUri($id)));
 
             $entry = new Entry($date->format(localize("customcolumn.date.format")), $this->getEntryId($id), $entryPContent, $this->datatype, $entryPLinkArray, "", $post->count);
 

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

@@ -62,7 +62,7 @@ 
     public function getDescription()
     {
         $desc = $this->getDatabaseDescription();
-        if ($desc === NULL || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle());
+        if ($desc === null || empty($desc)) $desc = str_format(localize("customcolumn.description"), $this->getTitle());
         return $desc;
     }
 
@@ -77,7 +77,7 @@ 
 
             return new CustomColumn($date->format("Y-m-d"), $date->format(localize("customcolumn.date.format")), $this);
         }
-        return new CustomColumn(NULL, localize("customcolumn.date.unknown"), $this);
+        return new CustomColumn(null, localize("customcolumn.date.unknown"), $this);
     }
 
     public function isSearchable()

Braces +3 added lines, -1 removed lines

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

lib/Page.php

Spacing +66 added lines, -66 removed lines

@@ -24,55 +24,55 @@ 
     /* @var Entry[] */
     public $entryArray = array();
 
-    public static function getPage ($pageId, $id, $query, $n)
+    public static function getPage($pageId, $id, $query, $n)
     {
         switch ($pageId) {
             case Base::PAGE_ALL_AUTHORS :
-                return new PageAllAuthors ($id, $query, $n);
+                return new PageAllAuthors($id, $query, $n);
             case Base::PAGE_AUTHORS_FIRST_LETTER :
-                return new PageAllAuthorsLetter ($id, $query, $n);
+                return new PageAllAuthorsLetter($id, $query, $n);
             case Base::PAGE_AUTHOR_DETAIL :
-                return new PageAuthorDetail ($id, $query, $n);
+                return new PageAuthorDetail($id, $query, $n);
             case Base::PAGE_ALL_TAGS :
-                return new PageAllTags ($id, $query, $n);
+                return new PageAllTags($id, $query, $n);
             case Base::PAGE_TAG_DETAIL :
-                return new PageTagDetail ($id, $query, $n);
+                return new PageTagDetail($id, $query, $n);
             case Base::PAGE_ALL_LANGUAGES :
-                return new PageAllLanguages ($id, $query, $n);
+                return new PageAllLanguages($id, $query, $n);
             case Base::PAGE_LANGUAGE_DETAIL :
-                return new PageLanguageDetail ($id, $query, $n);
+                return new PageLanguageDetail($id, $query, $n);
             case Base::PAGE_ALL_CUSTOMS :
-                return new PageAllCustoms ($id, $query, $n);
+                return new PageAllCustoms($id, $query, $n);
             case Base::PAGE_CUSTOM_DETAIL :
-                return new PageCustomDetail ($id, $query, $n);
+                return new PageCustomDetail($id, $query, $n);
             case Base::PAGE_ALL_RATINGS :
-                return new PageAllRating ($id, $query, $n);
+                return new PageAllRating($id, $query, $n);
             case Base::PAGE_RATING_DETAIL :
-                return new PageRatingDetail ($id, $query, $n);
+                return new PageRatingDetail($id, $query, $n);
             case Base::PAGE_ALL_SERIES :
-                return new PageAllSeries ($id, $query, $n);
+                return new PageAllSeries($id, $query, $n);
             case Base::PAGE_ALL_BOOKS :
-                return new PageAllBooks ($id, $query, $n);
+                return new PageAllBooks($id, $query, $n);
             case Base::PAGE_ALL_BOOKS_LETTER:
-                return new PageAllBooksLetter ($id, $query, $n);
+                return new PageAllBooksLetter($id, $query, $n);
             case Base::PAGE_ALL_RECENT_BOOKS :
-                return new PageRecentBooks ($id, $query, $n);
+                return new PageRecentBooks($id, $query, $n);
             case Base::PAGE_SERIE_DETAIL :
-                return new PageSerieDetail ($id, $query, $n);
+                return new PageSerieDetail($id, $query, $n);
             case Base::PAGE_OPENSEARCH_QUERY :
-                return new PageQueryResult ($id, $query, $n);
+                return new PageQueryResult($id, $query, $n);
             case Base::PAGE_BOOK_DETAIL :
-                return new PageBookDetail ($id, $query, $n);
+                return new PageBookDetail($id, $query, $n);
             case Base::PAGE_ALL_PUBLISHERS:
-                return new PageAllPublishers ($id, $query, $n);
+                return new PageAllPublishers($id, $query, $n);
             case Base::PAGE_PUBLISHER_DETAIL :
-                return new PagePublisherDetail ($id, $query, $n);
+                return new PagePublisherDetail($id, $query, $n);
             case Base::PAGE_ABOUT :
-                return new PageAbout ($id, $query, $n);
+                return new PageAbout($id, $query, $n);
             case Base::PAGE_CUSTOMIZE :
-                return new PageCustomize ($id, $query, $n);
+                return new PageCustomize($id, $query, $n);
             default:
-                $page = new Page ($id, $query, $n);
+                $page = new Page($id, $query, $n);
                 $page->idPage = "cops:catalog";
                 return $page;
         }
@@ -85,96 +85,96 @@ 
         $this->query = $pquery;
         $this->n = $pn;
         $this->favicon = $config['cops_icon'];
-        $this->authorName = empty($config['cops_author_name']) ? utf8_encode('Sébastien Lucas') : $config['cops_author_name'];
-        $this->authorUri = empty($config['cops_author_uri']) ? 'http://blog.slucas.fr' : $config['cops_author_uri'];
-        $this->authorEmail = empty($config['cops_author_email']) ? 'sebastien@slucas.fr' : $config['cops_author_email'];
+        $this->authorName = empty($config['cops_author_name'])?utf8_encode('Sébastien Lucas'):$config['cops_author_name'];
+        $this->authorUri = empty($config['cops_author_uri'])?'http://blog.slucas.fr':$config['cops_author_uri'];
+        $this->authorEmail = empty($config['cops_author_email'])?'sebastien@slucas.fr':$config['cops_author_email'];
     }
 
-    public function InitializeContent ()
+    public function InitializeContent()
     {
         global $config;
         $this->title = $config['cops_title_default'];
         $this->subtitle = $config['cops_subtitle_default'];
-        if (Base::noDatabaseSelected ()) {
+        if (Base::noDatabaseSelected()) {
             $i = 0;
-            foreach (Base::getDbNameList () as $key) {
-                $nBooks = Book::getBookCount ($i);
-                array_push ($this->entryArray, new Entry ($key, "cops:{$i}:catalog",
-                                        str_format (localize ("bookword", $nBooks), $nBooks), "text",
-                                        array ( new LinkNavigation ("?" . DB . "={$i}")), "", $nBooks));
+            foreach (Base::getDbNameList() as $key) {
+                $nBooks = Book::getBookCount($i);
+                array_push($this->entryArray, new Entry($key, "cops:{$i}:catalog",
+                                        str_format(localize("bookword", $nBooks), $nBooks), "text",
+                                        array(new LinkNavigation("?" . DB . "={$i}")), "", $nBooks));
                 $i++;
-                Base::clearDb ();
+                Base::clearDb();
             }
         } else {
-            if (!in_array (PageQueryResult::SCOPE_AUTHOR, getCurrentOption ('ignored_categories'))) {
-                array_push ($this->entryArray, Author::getCount());
+            if (!in_array(PageQueryResult::SCOPE_AUTHOR, getCurrentOption('ignored_categories'))) {
+                array_push($this->entryArray, Author::getCount());
             }
-            if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_SERIES, getCurrentOption('ignored_categories'))) {
                 $series = Serie::getCount();
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
+                if (!is_null($series)) array_push($this->entryArray, $series);
             }
-            if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_PUBLISHER, getCurrentOption('ignored_categories'))) {
                 $publisher = Publisher::getCount();
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
+                if (!is_null($publisher)) array_push($this->entryArray, $publisher);
             }
-            if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_TAG, getCurrentOption('ignored_categories'))) {
                 $tags = Tag::getCount();
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
+                if (!is_null($tags)) array_push($this->entryArray, $tags);
             }
-            if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
+            if (!in_array(PageQueryResult::SCOPE_RATING, getCurrentOption('ignored_categories'))) {
                 $rating = Rating::getCount();
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
+                if (!is_null($rating)) array_push($this->entryArray, $rating);
             }
-            if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
+            if (!in_array("language", getCurrentOption('ignored_categories'))) {
                 $languages = Language::getCount();
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
+                if (!is_null($languages)) array_push($this->entryArray, $languages);
             }
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
                 $customColumn = CustomColumnType::createByLookup($lookup);
-                if (!is_null ($customColumn) && $customColumn->isSearchable()) {
-                    array_push ($this->entryArray, $customColumn->getCount());
+                if (!is_null($customColumn) && $customColumn->isSearchable()) {
+                    array_push($this->entryArray, $customColumn->getCount());
                 }
             }
-            $this->entryArray = array_merge ($this->entryArray, Book::getCount());
+            $this->entryArray = array_merge($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled()) $this->title = Base::getDbName();
         }
     }
 
-    public function isPaginated ()
+    public function isPaginated()
     {
-        return (getCurrentOption ("max_item_per_page") != -1 &&
+        return (getCurrentOption("max_item_per_page") != -1 &&
                 $this->totalNumber != -1 &&
-                $this->totalNumber > getCurrentOption ("max_item_per_page"));
+                $this->totalNumber > getCurrentOption("max_item_per_page"));
     }
 
-    public function getNextLink ()
+    public function getNextLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
-        if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
+        if (($this->n) * getCurrentOption("max_item_per_page") < $this->totalNumber) {
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n + 1), "next", localize("paging.next.alternate"));
         }
         return NULL;
     }
 
-    public function getPrevLink ()
+    public function getPrevLink()
     {
-        $currentUrl = preg_replace ("/\&n=.*?$/", "", "?" . getQueryString ());
+        $currentUrl = preg_replace("/\&n=.*?$/", "", "?" . getQueryString());
         if ($this->n > 1) {
-            return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
+            return new LinkNavigation($currentUrl . "&n=" . ($this->n - 1), "previous", localize("paging.previous.alternate"));
         }
         return NULL;
     }
 
-    public function getMaxPage ()
+    public function getMaxPage()
     {
-        return ceil ($this->totalNumber / getCurrentOption ("max_item_per_page"));
+        return ceil($this->totalNumber / getCurrentOption("max_item_per_page"));
     }
 
-    public function containsBook ()
+    public function containsBook()
     {
-        if (count ($this->entryArray) == 0) return false;
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
+        if (count($this->entryArray) == 0) return false;
+        if (get_class($this->entryArray [0]) == "EntryBook") return true;
         return false;
     }
 }

Braces +26 added lines, -9 removed lines

@@ -78,7 +78,8 @@ 
         }
     }
 
-    public function __construct($pid, $pquery, $pn) {
+    public function __construct($pid, $pquery, $pn)
+    {
         global $config;
 
         $this->idGet = $pid;
@@ -111,23 +112,33 @@ 
             }
             if (!in_array (PageQueryResult::SCOPE_SERIES, getCurrentOption ('ignored_categories'))) {
                 $series = Serie::getCount();
-                if (!is_null ($series)) array_push ($this->entryArray, $series);
+                if (!is_null ($series)) {
+                    array_push ($this->entryArray, $series);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_PUBLISHER, getCurrentOption ('ignored_categories'))) {
                 $publisher = Publisher::getCount();
-                if (!is_null ($publisher)) array_push ($this->entryArray, $publisher);
+                if (!is_null ($publisher)) {
+                    array_push ($this->entryArray, $publisher);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_TAG, getCurrentOption ('ignored_categories'))) {
                 $tags = Tag::getCount();
-                if (!is_null ($tags)) array_push ($this->entryArray, $tags);
+                if (!is_null ($tags)) {
+                    array_push ($this->entryArray, $tags);
+                }
             }
             if (!in_array (PageQueryResult::SCOPE_RATING, getCurrentOption ('ignored_categories'))) {
                 $rating = Rating::getCount();
-                if (!is_null ($rating)) array_push ($this->entryArray, $rating);
+                if (!is_null ($rating)) {
+                    array_push ($this->entryArray, $rating);
+                }
             }
             if (!in_array ("language", getCurrentOption ('ignored_categories'))) {
                 $languages = Language::getCount();
-                if (!is_null ($languages)) array_push ($this->entryArray, $languages);
+                if (!is_null ($languages)) {
+                    array_push ($this->entryArray, $languages);
+                }
             }
             foreach ($config['cops_calibre_custom_column'] as $lookup) {
                 $customColumn = CustomColumnType::createByLookup($lookup);
@@ -137,7 +148,9 @@ 
             }
             $this->entryArray = array_merge ($this->entryArray, Book::getCount());
 
-            if (Base::isMultipleDatabaseEnabled ()) $this->title =  Base::getDbName ();
+            if (Base::isMultipleDatabaseEnabled ()) {
+                $this->title =  Base::getDbName ();
+            }
         }
     }
 
@@ -173,8 +186,12 @@ 
 
     public function containsBook ()
     {
-        if (count ($this->entryArray) == 0) return false;
-        if (get_class ($this->entryArray [0]) == "EntryBook") return true;
+        if (count ($this->entryArray) == 0) {
+            return false;
+        }
+        if (get_class ($this->entryArray [0]) == "EntryBook") {
+            return true;
+        }
         return false;
     }
 }

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

@@ -154,7 +154,7 @@ 
         if (($this->n) * getCurrentOption ("max_item_per_page") < $this->totalNumber) {
             return new LinkNavigation ($currentUrl . "&n=" . ($this->n + 1), "next", localize ("paging.next.alternate"));
         }
-        return NULL;
+        return null;
     }
 
     public function getPrevLink ()
@@ -163,7 +163,7 @@ 
         if ($this->n > 1) {
             return new LinkNavigation ($currentUrl . "&n=" . ($this->n - 1), "previous", localize ("paging.previous.alternate"));
         }
-        return NULL;
+        return null;
     }
 
     public function getMaxPage ()

lib/PageAllBooksLetter.php

Spacing +5 added lines, -5 removed lines

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

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
         $this->idPage = Book::getEntryIdByLetter ($this->idGet);
 
         $count = $this->totalNumber;
-        if ($count == -1)
-            $count = count ($this->entryArray);
+        if ($count == -1) {
+                    $count = count ($this->entryArray);
+        }
 
         $this->title = str_format (localize ("splitByLetter.letter"), str_format (localize ("bookword", $count), $count), $this->idGet);
     }

lib/Entry.php

Spacing +10 added lines, -10 removed lines

@@ -31,23 +31,23 @@ 
         Publisher::ALL_PUBLISHERS_ID     => 'images/publisher.png'
     );
 
-    public function getUpdatedTime () {
-        if (!is_null ($this->localUpdated)) {
-            return date (DATE_ATOM, $this->localUpdated);
+    public function getUpdatedTime() {
+        if (!is_null($this->localUpdated)) {
+            return date(DATE_ATOM, $this->localUpdated);
         }
-        if (is_null (self::$updated)) {
+        if (is_null(self::$updated)) {
             self::$updated = time();
         }
-        return date (DATE_ATOM, self::$updated);
+        return date(DATE_ATOM, self::$updated);
     }
 
-    public function getNavLink () {
+    public function getNavLink() {
         foreach ($this->linkArray as $link) {
             /* @var $link LinkNavigation */
 
             if ($link->type != Link::OPDS_NAVIGATION_TYPE) { continue; }
 
-            return $link->hrefXhtml ();
+            return $link->hrefXhtml();
         }
         return "#";
     }
@@ -66,13 +66,13 @@ 
         {
             foreach (self::$icons as $reg => $image)
             {
-                if (preg_match ("/" . $reg . "/", $pid)) {
-                    array_push ($this->linkArray, new Link (getUrlWithVersion ($image), "image/png", Link::OPDS_THUMBNAIL_TYPE));
+                if (preg_match("/" . $reg . "/", $pid)) {
+                    array_push($this->linkArray, new Link(getUrlWithVersion($image), "image/png", Link::OPDS_THUMBNAIL_TYPE));
                     break;
                 }
             }
         }
 
-        if (!is_null (GetUrlParam (DB))) $this->id = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $this->id);
+        if (!is_null(GetUrlParam(DB))) $this->id = str_replace("cops:", "cops:" . GetUrlParam(DB) . ":", $this->id);
     }
 }

Braces +11 added lines, -8 removed lines

@@ -31,7 +31,8 @@ 
         Publisher::ALL_PUBLISHERS_ID     => 'images/publisher.png'
     );
 
-    public function getUpdatedTime () {
+    public function getUpdatedTime ()
+    {
         if (!is_null ($this->localUpdated)) {
             return date (DATE_ATOM, $this->localUpdated);
         }
@@ -41,7 +42,8 @@ 
         return date (DATE_ATOM, self::$updated);
     }
 
-    public function getNavLink () {
+    public function getNavLink ()
+    {
         foreach ($this->linkArray as $link) {
             /* @var $link LinkNavigation */
 
@@ -52,7 +54,8 @@ 
         return "#";
     }
 
-    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pclass = "", $pcount = 0) {
+    public function __construct($ptitle, $pid, $pcontent, $pcontentType, $plinkArray, $pclass = "", $pcount = 0)
+    {
         global $config;
         $this->title = $ptitle;
         $this->id = $pid;
@@ -62,10 +65,8 @@ 
         $this->className = $pclass;
         $this->numberOfElement = $pcount;
 
-        if ($config['cops_show_icons'] == 1)
-        {
-            foreach (self::$icons as $reg => $image)
-            {
+        if ($config['cops_show_icons'] == 1) {
+            foreach (self::$icons as $reg => $image) {
                 if (preg_match ("/" . $reg . "/", $pid)) {
                     array_push ($this->linkArray, new Link (getUrlWithVersion ($image), "image/png", Link::OPDS_THUMBNAIL_TYPE));
                     break;
@@ -73,6 +74,8 @@ 
             }
         }
 
-        if (!is_null (GetUrlParam (DB))) $this->id = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $this->id);
+        if (!is_null (GetUrlParam (DB))) {
+            $this->id = str_replace ("cops:", "cops:" . GetUrlParam (DB) . ":", $this->id);
+        }
     }
 }

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

@@ -16,7 +16,7 @@
     public $linkArray;
     public $localUpdated;
     public $className;
-    private static $updated = NULL;
+    private static $updated = null;
 
     public static $icons = array(
         Author::ALL_AUTHORS_ID           => 'images/author.png',

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