From 61943f1661383bf8017b4c2a76fd11618e4adae0 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Thu, 11 Apr 2013 20:32:10 +0200
Subject: Plus possible d'ajouter un flux déjà existant + meilleure gestion
 actualisation / import OPML
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/Category.php |  4 ----
 app/models/Entry.php    |  2 --
 app/models/Feed.php     | 18 ++++++++++++++++--
 3 files changed, 16 insertions(+), 8 deletions(-)

(limited to 'app/models')

diff --git a/app/models/Category.php b/app/models/Category.php
index a153b8838..ae803591f 100755
--- a/app/models/Category.php
+++ b/app/models/Category.php
@@ -130,8 +130,6 @@ class CategoryDAO extends Model_pdo {
 		if (isset ($cat[0])) {
 			return $cat[0];
 		} else {
-			$info = $stm->errorInfo();
-			Log::record ('SQL error : ' . $info[2], Log::ERROR);
 			return false;
 		}
 	}
@@ -148,8 +146,6 @@ class CategoryDAO extends Model_pdo {
 		if (isset ($cat[0])) {
 			return $cat[0];
 		} else {
-			$info = $stm->errorInfo();
-			Log::record ('SQL error : ' . $info[2], Log::ERROR);
 			return false;
 		}
 	}
diff --git a/app/models/Entry.php b/app/models/Entry.php
index 4c672bcf3..c8d05c5eb 100755
--- a/app/models/Entry.php
+++ b/app/models/Entry.php
@@ -372,8 +372,6 @@ class EntryDAO extends Model_pdo {
 		if (isset ($entry[0])) {
 			return $entry[0];
 		} else {
-			$info = $stm->errorInfo();
-			Log::record ('SQL error : ' . $info[2], Log::ERROR);
 			return false;
 		}
 	}
diff --git a/app/models/Feed.php b/app/models/Feed.php
index 056cbf626..2e6782921 100644
--- a/app/models/Feed.php
+++ b/app/models/Feed.php
@@ -287,8 +287,22 @@ class FeedDAO extends Model_pdo {
 		if (isset ($feed[$id])) {
 			return $feed[$id];
 		} else {
-			$info = $stm->errorInfo();
-			Log::record ('SQL error : ' . $info[2], Log::ERROR);
+			return false;
+		}
+	}
+	public function searchByUrl ($url) {
+		$sql = 'SELECT * FROM feed WHERE url=?';
+		$stm = $this->bd->prepare ($sql);
+
+		$values = array ($url);
+
+		$stm->execute ($values);
+		$res = $stm->fetchAll (PDO::FETCH_ASSOC);
+		$feed = current (HelperFeed::daoToFeed ($res));
+
+		if (isset ($feed)) {
+			return $feed;
+		} else {
 			return false;
 		}
 	}
-- 
cgit v1.2.3