mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-01-26 14:18:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix issue #111 : index httpAuth ajouté (OPML)

Browse Source 
Il manquait cet index lors de l'ajout d'un flux par import OPML, c'est
ok maintenant
This commit is contained in:
Marien Fressinaud
2013-07-26 19:08:09 +02:00
parent 6ac530c595
commit 5b313ecdcb
2 changed files with 4 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/feedController.php
View File

@@ -246,7 +246,8 @@ class feedController extends ActionController {
'name' => $feed->name (),
'website' => $feed->website (),
'description' => $feed->description (),
'lastUpdate' => 0
'lastUpdate' => 0,
'httpAuth' => $feed->httpAuth ()
);
// ajout du flux que s'il n'est pas déjà en BDD

23
app/models/Entry.php
View File

@@ -14,7 +14,6 @@ class Entry extends Model {
private $is_public;
private $feed;
private $tags;
private $notes;
private $lastUpdate;
public function __construct ($feed = '', $guid = '', $title = '', $author = '', $content = '',
@@ -31,7 +30,6 @@ class Entry extends Model {
$this->_isPublic ($is_public);
$this->_feed ($feed);
$this->_lastUpdate ($pubdate);
$this->_notes ('');
$this->_tags (array ());
}
@@ -96,17 +94,6 @@ class Entry extends Model {
return $this->tags;
}
}
public function notes ($raw = true, $parse_tags = true) {
if ($raw) {
return $this->notes;
} else {
if($parse_tags) {
return parse_tags (bbdecode ($this->notes));
} else {
return bbdecode ($this->notes);
}
}
}
public function lastUpdate ($raw = false) {
if ($raw) {
return $this->lastUpdate;
@@ -165,9 +152,6 @@ class Entry extends Model {
$this->tags = $value;
}
public function _notes ($value) {
$this->notes = $value;
}
public function _lastUpdate ($value) {
if (is_int (intval ($value))) {
$this->lastUpdate = $value;
@@ -231,8 +215,7 @@ class Entry extends Model {
'is_public' => $this->isPublic (),
'id_feed' => $this->feed (),
'lastUpdate' => $this->lastUpdate (true),
'tags' => $this->tags (true),
'annotation' => $this->notes ()
'tags' => $this->tags (true)
);
}
}
@@ -578,7 +561,6 @@ class HelperEntry {
$dao['is_public']
);
$entry->_notes ($dao['annotation']);
$entry->_lastUpdate ($dao['lastUpdate']);
$entry->_tags ($dao['tags']);
@@ -606,8 +588,7 @@ class HelperEntry {
$word = strtolower ($word);
if (strpos (strtolower ($dao['title']), $word) === false &&
strpos (strtolower ($dao['content']), $word) === false &&
strpos (strtolower ($dao['link']), $word) === false &&
strpos (strtolower ($dao['annotation']), $word) === false) {
strpos (strtolower ($dao['link']), $word) === false) {
return false;
}
}