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

Fix typo + improve detection OPML file

Browse Source
This commit is contained in:
Marien Fressinaud
2014-03-29 19:10:18 +01:00
parent d464833922
commit 7676a197a4
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controllers/importExportController.php
View File

@@ -115,7 +115,8 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
if (substr_compare($filename, '.zip', -4) === 0) {
return 'zip';
} elseif (substr_compare($filename, '.opml', -5) === 0) {
} elseif (substr_compare($filename, '.opml', -5) === 0 ||
substr_compare($filename, '.xml', -4) === 0) {
return 'opml';
} elseif (strcmp($filename, 'starred.json') === 0) {
return 'json_starred';
@@ -144,7 +145,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
// on calcule la date des articles les plus anciens qu'on accepte
$nb_month_old = $this->view->conf->old_entries;
$date_min = time() -(3600 * 24 * 30 * $nb_month_old);
$date_min = time() - (3600 * 24 * 30 * $nb_month_old);
// la variable $error permet de savoir si une erreur est survenue
// Le but est de ne pas arrêter l'import même en cas d'erreur
@@ -294,7 +295,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
$this->view->type = 'starred';
$this->view->entries = $this->entryDAO->listWhere(
's', '', 'all', 'ASC',
$entryDAO->countUnreadReadFavorites()['all']
$this->entryDAO->countUnreadReadFavorites()['all']
);
} elseif ($type == 'feed' && !is_null($feed)) {
$this->view->list_title = Minz_Translate::t("feed_list", $feed->name());

2
app/views/importExport/index.phtml
View File

@@ -34,7 +34,7 @@
<?php echo Minz_Translate::t ('export_starred'); ?>
</label>
<select name="export_feeds[]" size="10" multiple="multiple">
<select name="export_feeds[]" size="<?php echo min(10, count($this->feeds)); ?>" multiple="multiple">
<?php foreach ($this->feeds as $feed) { ?>
<option value="<?php echo $feed->id(); ?>"><?php echo $feed->name(); ?></option>
<?php } ?>