aboutsummaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-04 20:48:38 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-11-04 23:34:07 +0100
commit5e1109312044b41932e14eb2e8e9ad9497d2ac61 (patch)
treeee2bf0d13cc40ceb28bab7423c9f896574f60645 /app/models
parent4a999fb6286bafcd070a1ebe53ceb5effacc8b59 (diff)
Détails : blancs
Suppression des blancs en fin de ligne
Diffstat (limited to 'app/models')
-rwxr-xr-xapp/models/Category.php8
-rwxr-xr-xapp/models/RSSConfiguration.php12
2 files changed, 10 insertions, 10 deletions
diff --git a/app/models/Category.php b/app/models/Category.php
index ebe55a837..7659e68f6 100755
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -37,7 +37,7 @@ class Category extends Model {
}
public function nbFeed () {
if ($this->nbFeed < 0) {
- $catDAO = new CategoryDAO ();
+ $catDAO = new CategoryDAO ();
$this->nbFeed = $catDAO->countFeed ($this->id ());
}
@@ -45,7 +45,7 @@ class Category extends Model {
}
public function nbNotRead () {
if ($this->nbNotRead < 0) {
- $catDAO = new CategoryDAO ();
+ $catDAO = new CategoryDAO ();
$this->nbNotRead = $catDAO->countNotRead ($this->id ());
}
@@ -181,7 +181,7 @@ class CategoryDAO extends Model_pdo {
. 'COUNT(CASE WHEN e.is_read = 0 THEN 1 END) AS nbNotRead, '
. 'COUNT(e.id) AS nbEntries, '
. 'f.* '
- . 'FROM ' . $this->prefix . 'category c '
+ . 'FROM ' . $this->prefix . 'category c '
. 'LEFT OUTER JOIN ' . $this->prefix . 'feed f ON f.category = c.id '
. 'LEFT OUTER JOIN ' . $this->prefix . 'entry e ON e.id_feed = f.id '
. 'GROUP BY f.id '
@@ -290,7 +290,7 @@ class HelperCategory {
$cat->_id ($previousLine['c_id']);
$list[] = $cat;
- $feedsDao = array(); //Prepare for next category
+ $feedsDao = array(); //Prepare for next category
}
$previousLine = $line;
diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index 4a99dfd2e..289538fd5 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -10,7 +10,7 @@ class RSSConfiguration extends Model {
private $view_mode;
private $default_view;
private $display_posts;
- private $onread_jump_next;
+ private $onread_jump_next;
private $lazyload;
private $sort_order;
private $old_entries;
@@ -32,7 +32,7 @@ class RSSConfiguration extends Model {
private $bottomline_tags;
private $bottomline_date;
private $bottomline_link;
-
+
public function __construct () {
$confDAO = new RSSConfigurationDAO ();
$this->_language ($confDAO->language);
@@ -40,7 +40,7 @@ class RSSConfiguration extends Model {
$this->_viewMode ($confDAO->view_mode);
$this->_defaultView ($confDAO->default_view);
$this->_displayPosts ($confDAO->display_posts);
- $this->_onread_jump_next ($confDAO->onread_jump_next);
+ $this->_onread_jump_next ($confDAO->onread_jump_next);
$this->_lazyload ($confDAO->lazyload);
$this->_sortOrder ($confDAO->sort_order);
$this->_oldEntries ($confDAO->old_entries);
@@ -63,7 +63,7 @@ class RSSConfiguration extends Model {
$this->_bottomline_date ($confDAO->bottomline_date);
$this->_bottomline_link ($confDAO->bottomline_link);
}
-
+
public function availableLanguages () {
return $this->available_languages;
}
@@ -431,12 +431,12 @@ class RSSConfigurationDAO extends Model_array {
$this->bottomline_link = $this->array['bottomline_link'];
}
}
-
+
public function update ($values) {
foreach ($values as $key => $value) {
$this->array[$key] = $value;
}
-
+
$this->writeFile($this->array);
}
}