mirror/FreshRSS
0
0 Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-10-27 05:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #49 : les flux sans auteur sont traités normalement désormais

Browse Source
This commit is contained in:
Marien Fressinaud committed 2013-04-10 20:55:12 +02:00
1 parent 30890b3d15
commit e6436444db
4 files changed
+44 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/feedController.php
+2
View File
@@ -33,9 +33,11 @@ class feedController extends ActionController {
'description' => $feed->description (),
'lastUpdate' => time ()
);
if ($feedDAO->addFeed ($values)) {
$entryDAO = new EntryDAO ();
$entries = $feed->entries ();
foreach ($entries as $entry) {
$values = $entry->toArray ();
$entryDAO->addEntry ($values);
app/models/Category.php
+10
View File
@@ -77,6 +77,8 @@ class CategoryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -94,6 +96,8 @@ class CategoryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -107,6 +111,8 @@ class CategoryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -124,6 +130,8 @@ 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;
}
}
@@ -140,6 +148,8 @@ 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;
}
}
app/models/Entry.php
+22 -4
View File
@@ -49,7 +49,11 @@ class Entry extends Model {
return $this->title;
}
public function author () {
return $this->author;
if (is_null ($this->author)) {
return '';
} else {
return $this->author;
}
}
public function content () {
return $this->content;
@@ -212,7 +216,7 @@ class Entry extends Model {
class EntryDAO extends Model_pdo {
public function addEntry ($valuesTmp) {
$sql = 'INSERT INTO entry(id, guid, title, author, content, link, date, is_read, is_favorite, is_public, id_feed, annotation, tags, lastUpdate) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
$sql = 'INSERT INTO entry(id, guid, title, author, content, link, date, is_read, is_favorite, is_public, id_feed, lastUpdate) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)';
$stm = $this->bd->prepare ($sql);
$values = array (
@@ -227,14 +231,14 @@ class EntryDAO extends Model_pdo {
$valuesTmp['is_favorite'],
$valuesTmp['is_public'],
$valuesTmp['id_feed'],
$valuesTmp['annotation'],
$valuesTmp['tags'],
$valuesTmp['lastUpdate'],
);
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -261,6 +265,8 @@ class EntryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -274,6 +280,8 @@ class EntryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -286,6 +294,8 @@ class EntryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -298,6 +308,8 @@ class EntryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -323,6 +335,8 @@ class EntryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -339,6 +353,8 @@ class EntryDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -356,6 +372,8 @@ 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;
}
}
app/models/Feed.php
+10
View File
@@ -207,6 +207,8 @@ class FeedDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -229,6 +231,8 @@ class FeedDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -245,6 +249,8 @@ class FeedDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -258,6 +264,8 @@ class FeedDAO extends Model_pdo {
if ($stm && $stm->execute ($values)) {
return true;
} else {
$info = $stm->errorInfo();
Log::record ('SQL error : ' . $info[2], Log::ERROR);
return false;
}
}
@@ -275,6 +283,8 @@ 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;
}
}