mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-05-08 07:05:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactorisation : correction classes oubliées

Browse Source
This commit is contained in:
Alexandre Alapetite
2013-12-19 21:19:45 +01:00
parent 3280b14ed6
commit 6b7d96d0ea
6 changed files with 20 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Controllers/indexController.php
View File

@@ -77,7 +77,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
return;
}
$this->view->nb_not_read = HelperCategory::CountUnreads($this->view->cat_aside, 1);
$this->view->nb_not_read = FreshRSS_CategoryDAO::CountUnreads($this->view->cat_aside, 1);
// mise à jour des titres
$this->view->rss_title = $this->view->currentName . ' | ' . Minz_View::title();
@@ -112,7 +112,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
$hasUnread = (!isset($this->view->cat_aside[$getId])) || ($this->view->cat_aside[$getId]->nbNotRead() > 0);
break;
case 'f':
$myFeed = HelperCategory::findFeed($this->view->cat_aside, $getId);
$myFeed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
$hasUnread = ($myFeed === null) || ($myFeed->nbNotRead() > 0);
break;
default:
@@ -188,7 +188,7 @@ class FreshRSS_index_Controller extends Minz_ActionController {
return false;
}
case 'f':
$feed = HelperCategory::findFeed($this->view->cat_aside, $getId);
$feed = FreshRSS_CategoryDAO::findFeed($this->view->cat_aside, $getId);
if (empty($feed)) {
$feed = $this->feedDAO->searchById ($getId);
}

16
app/Models/CategoryDAO.php
View File

@@ -60,7 +60,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
$stm->execute ($values);
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$cat = HelperCategory::daoToCategory ($res);
$cat = self::daoToCategory ($res);
if (isset ($cat[0])) {
return $cat[0];
@@ -76,7 +76,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
$stm->execute ($values);
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$cat = HelperCategory::daoToCategory ($res);
$cat = self::daoToCategory ($res);
if (isset ($cat[0])) {
return $cat[0];
@@ -96,12 +96,12 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
. 'ORDER BY c.name, f.name';
$stm = $this->bd->prepare ($sql);
$stm->execute ();
return HelperCategory::daoToCategoryPrepopulated ($stm->fetchAll (PDO::FETCH_ASSOC));
return self::daoToCategoryPrepopulated ($stm->fetchAll (PDO::FETCH_ASSOC));
} else {
$sql = 'SELECT * FROM `' . $this->prefix . 'category` ORDER BY name';
$stm = $this->bd->prepare ($sql);
$stm->execute ();
return HelperCategory::daoToCategory ($stm->fetchAll (PDO::FETCH_ASSOC));
return self::daoToCategory ($stm->fetchAll (PDO::FETCH_ASSOC));
}
}
@@ -111,7 +111,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
$stm->execute ();
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$cat = HelperCategory::daoToCategory ($res);
$cat = self::daoToCategory ($res);
if (isset ($cat[0])) {
return $cat[0];
@@ -164,9 +164,7 @@ class FreshRSS_CategoryDAO extends Minz_ModelPdo {
return $res[0]['count'];
}
}
class HelperCategory {
public static function findFeed($categories, $feed_id) {
foreach ($categories as $category) {
foreach ($category->feeds () as $feed) {
@@ -205,7 +203,7 @@ class HelperCategory {
$cat = new FreshRSS_Category (
$previousLine['c_name'],
isset($previousLine['c_color']) ? $previousLine['c_color'] : '',
HelperFeed::daoToFeed ($feedsDao, $previousLine['c_id'])
FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
);
$cat->_id ($previousLine['c_id']);
$list[$previousLine['c_id']] = $cat;
@@ -222,7 +220,7 @@ class HelperCategory {
$cat = new FreshRSS_Category (
$previousLine['c_name'],
isset($previousLine['c_color']) ? $previousLine['c_color'] : '',
HelperFeed::daoToFeed ($feedsDao, $previousLine['c_id'])
FreshRSS_FeedDAO::daoToFeed ($feedsDao, $previousLine['c_id'])
);
$cat->_id ($previousLine['c_id']);
$list[$previousLine['c_id']] = $cat;

8
app/Models/EntryDAO.php
View File

@@ -242,7 +242,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
$stm->execute ($values);
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$entries = HelperEntry::daoToEntry ($res);
$entries = self::daoToEntry ($res);
return isset ($entries[0]) ? $entries[0] : false;
}
@@ -255,7 +255,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
$stm->execute ($values);
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$entries = HelperEntry::daoToEntry ($res);
$entries = self::daoToEntry ($res);
return isset ($entries[0]) ? $entries[0] : false;
}
@@ -372,7 +372,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
$stm = $this->bd->prepare ($sql);
$stm->execute ($values);
return HelperEntry::daoToEntry ($stm->fetchAll (PDO::FETCH_ASSOC));
return self::daoToEntry ($stm->fetchAll (PDO::FETCH_ASSOC));
}
public function listLastGuidsByFeed($id, $n) {
@@ -430,9 +430,7 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
$stm = $this->bd->prepare ($sql);
$stm->execute ();
}
}
class HelperEntry {
public static function daoToEntry ($listDAO) {
$list = array ();

12
app/Models/FeedDAO.php
View File

@@ -158,7 +158,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
$stm->execute ($values);
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$feed = HelperFeed::daoToFeed ($res);
$feed = self::daoToFeed ($res);
if (isset ($feed[$id])) {
return $feed[$id];
@@ -174,7 +174,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
$stm->execute ($values);
$res = $stm->fetchAll (PDO::FETCH_ASSOC);
$feed = current (HelperFeed::daoToFeed ($res));
$feed = current (self::daoToFeed ($res));
if (isset ($feed)) {
return $feed;
@@ -188,7 +188,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
$stm = $this->bd->prepare ($sql);
$stm->execute ();
return HelperFeed::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
return self::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
}
public function listFeedsOrderUpdate () {
@@ -196,7 +196,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
$stm = $this->bd->prepare ($sql);
$stm->execute ();
return HelperFeed::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
return self::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
}
public function listByCategory ($cat) {
@@ -207,7 +207,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
$stm->execute ($values);
return HelperFeed::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
return self::daoToFeed ($stm->fetchAll (PDO::FETCH_ASSOC));
}
public function countEntries ($id) {
@@ -299,9 +299,7 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo {
return false;
}
}
}
class HelperFeed {
public static function daoToFeed ($listDAO, $catID = null) {
$list = array ();

2
app/views/helpers/view/normal_view.phtml
View File

@@ -62,7 +62,7 @@ if (!empty($this->entries)) {
?></li><?php
}
}
$feed = HelperCategory::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache
$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache
if (empty($feed)) $feed = $item->feed (true);
?>
<li class="item website"><a href="<?php echo _url ('index', 'index', 'get', 'f_' . $feed->id ()); ?>"><img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span></a></li>

2
app/views/helpers/view/reader_view.phtml
View File

@@ -11,7 +11,7 @@ if (!empty($this->entries)) {
<div class="flux_content">
<div class="content">
<?php
$feed = HelperCategory::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache
$feed = FreshRSS_CategoryDAO::findFeed($this->cat_aside, $item->feed ()); //We most likely already have the feed object in cache
if (empty($feed)) $feed = $item->feed (true);
?>
<a href="<?php echo $item->link (); ?>">