seblucas / cops

lib/CustomColumnTypeComment.php

Braces +3 added lines, -1 removed lines

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

sendtomail.php

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

lib/Book.php

Braces +105 added lines, -82 removed lines

@@ -108,7 +108,8 @@ 
     public $format = array ();
 
 
-    public function __construct($line) {
+    public function __construct($line)
+    {
         $this->id = $line->id;
         $this->title = $line->title;
         $this->timestamp = strtotime($line->timestamp);
@@ -126,25 +127,32 @@ 
         $this->rating = $line->rating;
     }
 
-    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;
     }
 
@@ -153,22 +161,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);
         }
@@ -178,7 +190,8 @@ 
     /**
      * @return Serie
      */
-    public function getSerie() {
+    public function getSerie()
+    {
         if (is_null($this->serie)) {
             $this->serie = Serie::getSerieByBookId($this->id);
         }
@@ -188,7 +201,8 @@ 
     /**
      * @return string
      */
-    public function getLanguages() {
+    public function getLanguages()
+    {
         $lang = array();
         $result = parent::getDb()->prepare('select languages.lang_code
                 from books_languages_link, languages
@@ -196,8 +210,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);
@@ -206,7 +219,8 @@ 
     /**
      * @return Tag[]
      */
-    public function getTags() {
+    public function getTags()
+    {
         if (is_null ($this->tags)) {
             $this->tags = array();
 
@@ -216,15 +230,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()));
     }
 
@@ -241,9 +255,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)) {
@@ -283,7 +300,8 @@ 
         return reset($reduced);
     }
 
-    public function getRating() {
+    public function getRating()
+    {
         if (is_null($this->rating) || $this->rating == 0) {
             return '';
         }
@@ -297,7 +315,8 @@ 
         return $retour;
     }
 
-    public function getPubDate() {
+    public function getPubDate()
+    {
         if (empty ($this->pubdate)) {
             return '';
         }
@@ -308,23 +327,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;
         });
@@ -333,23 +351,19 @@ 
 
     public function getFilePath($extension, $idData = NULL, $relative = false)
     {
-        if ($extension == 'jpg')
-        {
+        if ($extension == 'jpg') {
             $file = 'cover.jpg';
-        }
-        else
-        {
+        } else {
             $data = $this->getDataById($idData);
-            if (!$data) return NULL;
+            if (!$data) {
+                return NULL;
+            }
             $file = $data->name . '.' . strtolower($data->format);
         }
 
-        if ($relative)
-        {
+        if ($relative) {
             return $this->relativePath.'/'.$file;
-        }
-        else
-        {
+        } else {
             return $this->path.'/'.$file;
         }
     }
@@ -359,8 +373,7 @@ 
         global $config;
         $data = $this->getDataById($idData);
 
-        try
-        {
+        try {
             $epub = new EPub($data->getLocalPath());
 
             $epub->Title($this->title);
@@ -385,14 +398,13 @@ 
                 $filename = $data->getUpdatedFilenameKepub();
             }
             $epub->download($filename);
-        }
-        catch (Exception $e)
-        {
+        } catch (Exception $e) {
             echo 'Exception : ' . $e->getMessage();
         }
     }
 
-    public function getThumbnail($width, $height, $outputfile = NULL) {
+    public function getThumbnail($width, $height, $outputfile = NULL)
+    {
         if (is_null($width) && is_null($height)) {
             return false;
         }
@@ -431,17 +443,14 @@ 
     {
         $linkArray = array();
 
-        if ($this->hasCover)
-        {
+        if ($this->hasCover) {
             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));
             }
         }
@@ -460,17 +469,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();
@@ -489,27 +501,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);
     }
 
@@ -519,32 +537,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::BOOK_COLUMNS . '
 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::BOOK_COLUMNS . ', 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;
@@ -554,7 +573,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,
@@ -565,8 +585,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 {
@@ -578,12 +597,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}
@@ -592,8 +613,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));
@@ -601,25 +621,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::BOOK_COLUMNS, 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;
@@ -631,7 +653,8 @@ 
      * @param string[] $columns
      * @return CustomColumn[]
      */
-    public function getCustomColumnValues($columns, $asArray = false) {
+    public function getCustomColumnValues($columns, $asArray = false)
+    {
         $result = array();
 
         foreach ($columns as $lookup) {