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

Coding style (views)

Browse Source 
See https://github.com/marienfressinaud/FreshRSS/issues/655
This commit is contained in:
Marien Fressinaud committed 2014-10-05 19:11:43 +02:00
1 parent b5dee73ea0
commit 65ab90d3c7
16 files changed
+150 -150
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/FreshRSS.php
+12 -12
View File
@@ -88,7 +88,7 @@ class FreshRSS extends Minz_FrontController {
try {
$this->conf = new FreshRSS_Configuration($currentUser);
Minz_View::_param ('conf', $this->conf);
Minz_View::_param('conf', $this->conf);
Minz_Session::_param('currentUser', $currentUser);
} catch (Minz_Exception $me) {
$loginOk = false;
@@ -100,8 +100,8 @@ class FreshRSS extends Minz_FrontController {
'type' => 'bad',
'content' => 'Invalid configuration for user [' . $currentUser . ']!',
);
Minz_Session::_param ('notification', $notif);
Minz_Log::record ($notif['content'] . ' ' . $me->getMessage(), Minz_Log::WARNING);
Minz_Session::_param('notification', $notif);
Minz_Log::record($notif['content'] . ' ' . $me->getMessage(), Minz_Log::WARNING);
Minz_Session::_param('currentUser', '');
} catch (Exception $e) {
die($e->getMessage());
@@ -130,13 +130,13 @@ class FreshRSS extends Minz_FrontController {
return $loginOk;
}
private function loadParamsView () {
Minz_Session::_param ('language', $this->conf->language);
private function loadParamsView() {
Minz_Session::_param('language', $this->conf->language);
Minz_Translate::init();
$output = Minz_Request::param ('output', '');
$output = Minz_Request::param('output', '');
if (($output === '') || ($output !== 'normal' && $output !== 'rss' && $output !== 'reader' && $output !== 'global')) {
$output = $this->conf->view_mode;
Minz_Request::_param ('output', $output);
Minz_Request::_param('output', $output);
}
}
@@ -161,7 +161,7 @@ class FreshRSS extends Minz_FrontController {
switch (Minz_Configuration::authType()) {
case 'form':
if (!$loginOk) {
Minz_View::appendScript(Minz_Url::display ('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')));
Minz_View::appendScript(Minz_Url::display('/scripts/bcrypt.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/bcrypt.min.js')));
}
break;
case 'persona':
@@ -173,11 +173,11 @@ class FreshRSS extends Minz_FrontController {
Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js')));
}
private function loadNotifications () {
$notif = Minz_Session::param ('notification');
private function loadNotifications() {
$notif = Minz_Session::param('notification');
if ($notif) {
Minz_View::_param ('notification', $notif);
Minz_Session::_param ('notification');
Minz_View::_param('notification', $notif);
Minz_Session::_param('notification');
}
}
app/views/configure/display.phtml
+4 -4
View File
@@ -1,16 +1,16 @@
<?php $this->partial ('aside_configure'); ?>
<?php $this->partial('aside_configure'); ?>
<div class="post">
<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
<form method="post" action="<?php echo _url ('configure', 'display'); ?>">
<form method="post" action="<?php echo _url('configure', 'display'); ?>">
<legend><?php echo _t('display_configuration'); ?></legend>
<div class="form-group">
<label class="group-name" for="language"><?php echo _t('language'); ?></label>
<div class="group-controls">
<select name="language" id="language">
<?php $languages = $this->conf->availableLanguages (); ?>
<?php $languages = $this->conf->availableLanguages(); ?>
<?php foreach ($languages as $short => $lib) { ?>
<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
<?php } ?>
app/views/configure/sharing.phtml
+3 -3
View File
@@ -1,9 +1,9 @@
<?php $this->partial ('aside_configure'); ?>
<?php $this->partial('aside_configure'); ?>
<div class="post">
<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
<form method="post" action="<?php echo _url('configure', 'sharing'); ?>"
data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a>
<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" /></div></div>'
data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
app/views/entry/bookmark.phtml
+8 -8
View File
@@ -1,16 +1,16 @@
<?php
header('Content-Type: application/json; charset=UTF-8');
if (Minz_Request::param ('is_favorite', true)) {
Minz_Request::_param ('is_favorite', 0);
if (Minz_Request::param('is_favorite', true)) {
Minz_Request::_param('is_favorite', 0);
} else {
Minz_Request::_param ('is_favorite', 1);
Minz_Request::_param('is_favorite', 1);
}
$url = Minz_Url::display (array (
'c' => Minz_Request::controllerName (),
'a' => Minz_Request::actionName (),
'params' => Minz_Request::params (),
$url = Minz_Url::display(array(
'c' => Minz_Request::controllerName(),
'a' => Minz_Request::actionName(),
'params' => Minz_Request::params(),
));
echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => _i(Minz_Request::param ('is_favorite') ? 'non-starred' : 'starred')));
echo json_encode(array('url' => str_ireplace('&amp;', '&', $url), 'icon' => _i(Minz_Request::param('is_favorite') ? 'non-starred' : 'starred')));
app/views/entry/read.phtml
+8 -8
View File
@@ -1,16 +1,16 @@
<?php
header('Content-Type: application/json; charset=UTF-8');
if (Minz_Request::param ('is_read', true)) {
Minz_Request::_param ('is_read', 0);
if (Minz_Request::param('is_read', true)) {
Minz_Request::_param('is_read', 0);
} else {
Minz_Request::_param ('is_read', 1);
Minz_Request::_param('is_read', 1);
}
$url = Minz_Url::display (array (
'c' => Minz_Request::controllerName (),
'a' => Minz_Request::actionName (),
'params' => Minz_Request::params (),
$url = Minz_Url::display(array(
'c' => Minz_Request::controllerName(),
'a' => Minz_Request::actionName(),
'params' => Minz_Request::params(),
));
echo json_encode (array ('url' => str_ireplace ('&amp;', '&', $url), 'icon' => _i(Minz_Request::param ('is_read') ? 'unread' : 'read')));
echo json_encode(array('url' => str_ireplace('&amp;', '&', $url), 'icon' => _i(Minz_Request::param('is_read') ? 'unread' : 'read')));
app/views/helpers/feed/update.phtml
+20 -20
View File
@@ -1,28 +1,28 @@
<div class="post">
<h1><?php echo $this->feed->name (); ?></h1>
<h1><?php echo $this->feed->name(); ?></h1>
<div>
<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id ()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
<a href="<?php echo _url('index', 'index', 'get', 'f_' . $this->feed->id()); ?>"><?php echo _i('link'); ?> <?php echo _t('filter'); ?></a>
<?php echo _t('or'); ?>
<a href="<?php echo _url('stats', 'repartition', 'id', $this->feed->id()); ?>"><?php echo _i('stats'); ?> <?php echo _t('stats'); ?></a>
</div>
<p><?php echo $this->feed->description (); ?></p>
<p><?php echo $this->feed->description(); ?></p>
<?php $nbEntries = $this->feed->nbEntries (); ?>
<?php $nbEntries = $this->feed->nbEntries(); ?>
<?php if ($this->feed->inError ()) { ?>
<?php if ($this->feed->inError()) { ?>
<p class="alert alert-error"><span class="alert-head"><?php echo _t('damn'); ?></span> <?php echo _t('feed_in_error'); ?></p>
<?php } elseif ($nbEntries === 0) { ?>
<p class="alert alert-warn"><?php echo _t('feed_empty'); ?></p>
<?php } ?>
<form method="post" action="<?php echo _url ('subscription', 'feed', 'id', $this->feed->id ()); ?>" autocomplete="off">
<form method="post" action="<?php echo _url('subscription', 'feed', 'id', $this->feed->id()); ?>" autocomplete="off">
<legend><?php echo _t('informations'); ?></legend>
<div class="form-group">
<label class="group-name" for="name"><?php echo _t('title'); ?></label>
<div class="group-controls">
<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name () ; ?>" />
<input type="text" name="name" id="name" class="extend" value="<?php echo $this->feed->name() ; ?>" />
</div>
</div>
<div class="form-group">
@@ -35,8 +35,8 @@
<label class="group-name" for="website"><?php echo _t('website_url'); ?></label>
<div class="group-controls">
<div class="stick">
<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website (); ?>" />
<a class="btn" target="_blank" href="<?php echo $this->feed->website (); ?>"><?php echo _i('link'); ?></a>
<input type="text" name="website" id="website" class="extend" value="<?php echo $this->feed->website(); ?>" />
<a class="btn" target="_blank" href="<?php echo $this->feed->website(); ?>"><?php echo _i('link'); ?></a>
</div>
</div>
</div>
@@ -44,11 +44,11 @@
<label class="group-name" for="url"><?php echo _t('feed_url'); ?></label>
<div class="group-controls">
<div class="stick">
<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url (); ?>" />
<a class="btn" target="_blank" href="<?php echo $this->feed->url (); ?>"><?php echo _i('link'); ?></a>
<input type="text" name="url" id="url" class="extend" value="<?php echo $this->feed->url(); ?>" />
<a class="btn" target="_blank" href="<?php echo $this->feed->url(); ?>"><?php echo _i('link'); ?></a>
</div>
<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url (); ?>"><?php echo _t('feed_validator'); ?></a>
<a class="btn" target="_blank" href="http://validator.w3.org/feed/check.cgi?url=<?php echo $this->feed->url(); ?>"><?php echo _t('feed_validator'); ?></a>
</div>
</div>
<div class="form-group">
@@ -56,8 +56,8 @@
<div class="group-controls">
<select name="category" id="category">
<?php foreach ($this->categories as $cat) { ?>
<option value="<?php echo $cat->id (); ?>"<?php echo $cat->id ()== $this->feed->category () ? ' selected="selected"' : ''; ?>>
<?php echo $cat->name (); ?>
<option value="<?php echo $cat->id(); ?>"<?php echo $cat->id()== $this->feed->category() ? ' selected="selected"' : ''; ?>>
<?php echo $cat->name(); ?>
</option>
<?php } ?>
</select>
@@ -67,7 +67,7 @@
<label class="group-name" for="priority"><?php echo _t('show_in_all_flux'); ?></label>
<div class="group-controls">
<label class="checkbox" for="priority">
<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority () > 0 ? ' checked="checked"' : ''; ?> />
<input type="checkbox" name="priority" id="priority" value="10"<?php echo $this->feed->priority() > 0 ? ' checked="checked"' : ''; ?> />
<?php echo _t('yes'); ?>
</label>
</div>
@@ -78,7 +78,7 @@
<button class="btn btn-important"><?php echo _t('save'); ?></button>
<button class="btn btn-attention confirm"
data-str-confirm="<?php echo _t('confirm_action_feed_cat'); ?>"
formaction="<?php echo _url('feed', 'delete', 'id', $this->feed->id ()); ?>"
formaction="<?php echo _url('feed', 'delete', 'id', $this->feed->id()); ?>"
formmethod="post"><?php echo _t('delete'); ?></button>
</div>
</div>
@@ -89,7 +89,7 @@
<div class="group-controls">
<div class="stick">
<input type="text" value="<?php echo _t('number_articles', $nbEntries); ?>" disabled="disabled" />
<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->feed->id ()); ?>">
<a class="btn" href="<?php echo _url('feed', 'actualize', 'id', $this->feed->id()); ?>">
<?php echo _i('refresh'); ?> <?php echo _t('actualize'); ?>
</a>
</div>
@@ -129,12 +129,12 @@
<div class="form-group form-actions">
<div class="group-controls">
<button class="btn btn-important"><?php echo _t('save'); ?></button>
<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo Minz_Url::display (array ('c' => 'feed', 'a' => 'truncate', 'params' => array ('id' => $this->feed->id ()))); ?>"><?php echo _t('truncate'); ?></button>
<button class="btn btn-attention confirm" formmethod="post" formaction="<?php echo _url('feed', 'truncate', 'id', $this->feed->id()); ?>"><?php echo _t('truncate'); ?></button>
</div>
</div>
<legend><?php echo _t('login_configuration'); ?></legend>
<?php $auth = $this->feed->httpAuth (false); ?>
<?php $auth = $this->feed->httpAuth(false); ?>
<div class="form-group">
<label class="group-name" for="http_user"><?php echo _t('http_username'); ?></label>
<div class="group-controls">
@@ -159,7 +159,7 @@
<div class="form-group">
<label class="group-name" for="path_entries"><?php echo _t('css_path_on_website'); ?></label>
<div class="group-controls">
<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries (); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
<input type="text" name="path_entries" id="path_entries" class="extend" value="<?php echo $this->feed->pathEntries(); ?>" placeholder="<?php echo _t('blank_to_disable'); ?>" />
<?php echo _i('help'); ?> <?php echo _t('retrieve_truncated_feeds'); ?>
</div>
</div>
app/views/helpers/logs_pagination.phtml
+8 -8
View File
@@ -1,7 +1,7 @@
<?php
$c = Minz_Request::controllerName ();
$a = Minz_Request::actionName ();
$params = Minz_Request::params ();
$c = Minz_Request::controllerName();
$a = Minz_Request::actionName();
$params = Minz_Request::params();
?>
<?php if ($this->nbPage > 1) { ?>
@@ -9,14 +9,14 @@
<?php $params[$getteur] = 1; ?>
<li class="item pager-first">
<?php if ($this->currentPage > 1) { ?>
<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('first'); ?></a>
<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">« <?php echo _t('first'); ?></a>
<?php } ?>
</li>
<?php $params[$getteur] = $this->currentPage - 1; ?>
<li class="item pager-previous">
<?php if ($this->currentPage > 1) { ?>
<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('previous'); ?></a>
<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>">‹ <?php echo _t('previous'); ?></a>
<?php } ?>
</li>
@@ -24,7 +24,7 @@
<?php if($i > 0 && $i <= $this->nbPage) { ?>
<?php if ($i != $this->currentPage) { ?>
<?php $params[$getteur] = $i; ?>
<li class="item pager-item"><a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo $i; ?></a></li>
<li class="item pager-item"><a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo $i; ?></a></li>
<?php } else { ?>
<li class="item pager-current"><?php echo $i; ?></li>
<?php } ?>
@@ -34,13 +34,13 @@
<?php $params[$getteur] = $this->currentPage + 1; ?>
<li class="item pager-next">
<?php if ($this->currentPage < $this->nbPage) { ?>
<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('next'); ?> ›</a>
<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('next'); ?> ›</a>
<?php } ?>
</li>
<?php $params[$getteur] = $this->nbPage; ?>
<li class="item pager-last">
<?php if ($this->currentPage < $this->nbPage) { ?>
<a href="<?php echo Minz_Url::display (array ('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('last'); ?> »</a>
<a href="<?php echo Minz_Url::display(array('c' => $c, 'a' => $a, 'params' => $params)); ?>"><?php echo _t('last'); ?> »</a>
<?php } ?>
</li>
</ul>
app/views/helpers/view/global_view.phtml
+8 -8
View File
@@ -1,4 +1,4 @@
<?php $this->partial ('nav_menu'); ?>
<?php $this->partial('nav_menu'); ?>
<?php if (!empty($this->entries)) { ?>
<div id="stream" class="global categories">
@@ -13,21 +13,21 @@
}
foreach ($this->cat_aside as $cat) {
$feeds = $cat->feeds ();
if (!empty ($feeds)) {
$feeds = $cat->feeds();
if (!empty($feeds)) {
?>
<div class="box-category">
<div class="category">
<a data-unread="<?php echo formatNumber($cat->nbNotRead()); ?>" class="btn" href="<?php $arUrl['params']['get'] = 'c_' . $cat->id (); echo Minz_Url::display($arUrl); ?>">
<a data-unread="<?php echo formatNumber($cat->nbNotRead()); ?>" class="btn" href="<?php $arUrl['params']['get'] = 'c_' . $cat->id(); echo Minz_Url::display($arUrl); ?>">
<?php echo $cat->name(); ?>
</a>
</div>
<ul class="feeds">
<?php foreach ($feeds as $feed) { ?>
<?php $not_read = $feed->nbNotRead (); ?>
<li id="f_<?php echo $feed->id (); ?>" class="item<?php echo $feed->inError () ? ' error' : ''; ?><?php echo $feed->nbEntries () == 0 ? ' empty' : ''; ?>">
<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" />
<a class="feed" data-unread="<?php echo formatNumber($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority (); ?>" href="<?php $arUrl['params']['get'] = 'f_' . $feed->id(); echo Minz_Url::display($arUrl); ?>">
<?php $not_read = $feed->nbNotRead(); ?>
<li id="f_<?php echo $feed->id(); ?>" class="item<?php echo $feed->inError() ? ' error' : ''; ?><?php echo $feed->nbEntries() == 0 ? ' empty' : ''; ?>">
<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" />
<a class="feed" data-unread="<?php echo formatNumber($feed->nbNotRead()); ?>" data-priority="<?php echo $feed->priority(); ?>" href="<?php $arUrl['params']['get'] = 'f_' . $feed->id(); echo Minz_Url::display($arUrl); ?>">
<?php echo $feed->name(); ?>
</a>
</li>
app/views/helpers/view/normal_view.phtml
+30 -30
View File
@@ -1,7 +1,7 @@
<?php
$this->partial ('aside_flux');
$this->partial ('nav_menu');
$this->partial('aside_flux');
$this->partial('nav_menu');
if (!empty($this->entries)) {
$display_today = true;
@@ -30,72 +30,72 @@ if (!empty($this->entries)) {
<div id="stream" class="normal<?php echo $hidePosts ? ' hide_posts' : ''; ?>"><?php
?><div id="new-article">
<a href="<?php echo Minz_Url::display ($this->url); ?>"><?php echo _t('new_article'); ?></a>
<a href="<?php echo Minz_Url::display($this->url); ?>"><?php echo _t('new_article'); ?></a>
</div><?php
foreach ($this->entries as $item) {
if ($display_today && $item->isDay (FreshRSS_Days::TODAY, $this->today)) {
if ($display_today && $item->isDay(FreshRSS_Days::TODAY, $this->today)) {
?><div class="day" id="day_today"><?php
echo _t('today');
?><span class="date"> — <?php echo timestamptodate (time (), false); ?></span><?php
?><span class="date"> — <?php echo timestamptodate(time(), false); ?></span><?php
?><span class="name"><?php echo $this->currentName; ?></span><?php
?></div><?php
$display_today = false;
}
if ($display_yesterday && $item->isDay (FreshRSS_Days::YESTERDAY, $this->today)) {
if ($display_yesterday && $item->isDay(FreshRSS_Days::YESTERDAY, $this->today)) {
?><div class="day" id="day_yesterday"><?php
echo _t('yesterday');
?><span class="date"> — <?php echo timestamptodate (time () - 86400, false); ?></span><?php
?><span class="date"> — <?php echo timestamptodate(time() - 86400, false); ?></span><?php
?><span class="name"><?php echo $this->currentName; ?></span><?php
?></div><?php
$display_yesterday = false;
}
if ($display_others && $item->isDay (FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
if ($display_others && $item->isDay(FreshRSS_Days::BEFORE_YESTERDAY, $this->today)) {
?><div class="day" id="day_before_yesterday"><?php
echo _t('before_yesterday');
?><span class="name"><?php echo $this->currentName; ?></span><?php
?></div><?php
$display_others = false;
}
?><div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
?><div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
<ul class="horizontal-list flux_header"><?php
if ($this->loginOk) {
if ($topline_read) {
?><li class="item manage"><?php
$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id ()));
$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
if ($item->isRead()) {
$arUrl['params']['is_read'] = 0;
}
?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
?></li><?php
}
if ($topline_favorite) {
?><li class="item manage"><?php
$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id ()));
$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
if ($item->isFavorite()) {
$arUrl['params']['is_favorite'] = 0;
}
?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
?></li><?php
}
}
$feed = FreshRSS_CategoryDAO::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 ($feed == null) {
$feed = $item->feed(true);
if ($feed == null) {
$feed = FreshRSS_Feed::example();
}
}
?><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>
<li class="item title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></li>
<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date (); ?> </li><?php } ?>
<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
?><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>
<li class="item title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></li>
<?php if ($topline_date) { ?><li class="item date"><?php echo $item->date(); ?> </li><?php } ?>
<?php if ($topline_link) { ?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php } ?>
</ul>
<div class="flux_content">
<div class="content <?php echo $content_width; ?>">
<h1 class="title"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo $item->title (); ?></a></h1>
<h1 class="title"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo $item->title(); ?></a></h1>
<?php
$author = $item->author();
echo $author != '' ? '<div class="author">' . _t('by_author', $author) . '</div>' : '',
@@ -106,32 +106,32 @@ if (!empty($this->entries)) {
if ($this->loginOk) {
if ($bottomline_read) {
?><li class="item manage"><?php
$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id ()));
$arUrl = array('c' => 'entry', 'a' => 'read', 'params' => array('id' => $item->id()));
if ($item->isRead()) {
$arUrl['params']['is_read'] = 0;
}
?><a class="read" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
echo _i($item->isRead () ? 'read' : 'unread'); ?></a><?php
echo _i($item->isRead() ? 'read' : 'unread'); ?></a><?php
?></li><?php
}
if ($bottomline_favorite) {
?><li class="item manage"><?php
$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id ()));
$arUrl = array('c' => 'entry', 'a' => 'bookmark', 'params' => array('id' => $item->id()));
if ($item->isFavorite()) {
$arUrl['params']['is_favorite'] = 0;
}
?><a class="bookmark" href="<?php echo Minz_Url::display($arUrl); ?>"><?php
echo _i($item->isFavorite () ? 'starred' : 'non-starred'); ?></a><?php
echo _i($item->isFavorite() ? 'starred' : 'non-starred'); ?></a><?php
?></li><?php
}
} ?>
<li class="item"><?php
if ($bottomline_sharing) {
$link = urlencode ($item->link ());
$title = urlencode ($item->title () . ' · ' . $feed->name ());
$link = urlencode($item->link());
$title = urlencode($item->title() . ' · ' . $feed->name());
?><div class="dropdown">
<div id="dropdown-share-<?php echo $item->id ();?>" class="dropdown-target"></div>
<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id ();?>">
<div id="dropdown-share-<?php echo $item->id();?>" class="dropdown-target"></div>
<a class="dropdown-toggle" href="#dropdown-share-<?php echo $item->id();?>">
<?php echo _i('share'); ?>
<?php echo _t('share'); ?>
</a>
@@ -168,10 +168,10 @@ if (!empty($this->entries)) {
</li><?php
}
if ($bottomline_date) {
?><li class="item date"><?php echo $item->date (); ?></li><?php
?><li class="item date"><?php echo $item->date(); ?></li><?php
}
if ($bottomline_link) {
?><li class="item link"><a target="_blank" href="<?php echo $item->link (); ?>"><?php echo _i('link'); ?></a></li><?php
?><li class="item link"><a target="_blank" href="<?php echo $item->link(); ?>"><?php echo _i('link'); ?></a></li><?php
} ?>
</ul>
</div>
@@ -181,7 +181,7 @@ if (!empty($this->entries)) {
<?php $this->renderHelper('pagination'); ?>
</div>
<?php $this->partial ('nav_entries'); ?>
<?php $this->partial('nav_entries'); ?>
<?php } else { ?>
<div id="stream" class="prompt alert alert-warn normal">
app/views/helpers/view/reader_view.phtml
+7 -7
View File
@@ -1,5 +1,5 @@
<?php
$this->partial ('nav_menu');
$this->partial('nav_menu');
if (!empty($this->entries)) {
$lazyload = $this->conf->lazyload;
@@ -9,17 +9,17 @@ if (!empty($this->entries)) {
<div id="stream" class="reader">
<?php foreach ($this->entries as $item) { ?>
<div class="flux<?php echo !$item->isRead () ? ' not_read' : ''; ?><?php echo $item->isFavorite () ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id (); ?>">
<div class="flux<?php echo !$item->isRead() ? ' not_read' : ''; ?><?php echo $item->isFavorite() ? ' favorite' : ''; ?>" id="flux_<?php echo $item->id(); ?>">
<div class="flux_content">
<div class="content <?php echo $content_width; ?>">
<?php
$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);
$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 (); ?>">
<img class="favicon" src="<?php echo $feed->favicon (); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span>
<a href="<?php echo $item->link(); ?>">
<img class="favicon" src="<?php echo $feed->favicon(); ?>" alt="✇" /> <span><?php echo $feed->name(); ?></span>
</a>
<h1 class="title"><?php echo $item->title (); ?></h1>
<h1 class="title"><?php echo $item->title(); ?></h1>
<div class="author"><?php
$author = $item->author();
app/views/helpers/view/rss_view.phtml
+7 -7
View File
@@ -6,22 +6,22 @@
<description><?php echo _t('rss_feeds_of', $this->rss_title); ?></description>
<pubDate><?php echo date('D, d M Y H:i:s O'); ?></pubDate>
<lastBuildDate><?php echo gmdate('D, d M Y H:i:s'); ?> GMT</lastBuildDate>
<atom:link href="<?php echo Minz_Url::display ($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />
<atom:link href="<?php echo Minz_Url::display($this->url, 'html', true); ?>" rel="self" type="application/rss+xml" />
<?php
foreach ($this->entries as $item) {
?>
<item>
<title><?php echo $item->title (); ?></title>
<link><?php echo $item->link (); ?></link>
<?php $author = $item->author (); ?>
<title><?php echo $item->title(); ?></title>
<link><?php echo $item->link(); ?></link>
<?php $author = $item->author(); ?>
<?php if ($author != '') { ?>
<dc:creator><?php echo $author; ?></dc:creator>
<?php } ?>
<description><![CDATA[<?php
echo $item->content ();
echo $item->content();
?>]]></description>
<pubDate><?php echo date('D, d M Y H:i:s O', $item->date (true)); ?></pubDate>
<guid isPermaLink="false"><?php echo $item->id (); ?></guid>
<pubDate><?php echo date('D, d M Y H:i:s O', $item->date(true)); ?></pubDate>
<guid isPermaLink="false"><?php echo $item->id(); ?></guid>
</item>
<?php } ?>
app/views/index/index.phtml
+9 -9
View File
@@ -1,25 +1,25 @@
<?php
$output = Minz_Request::param ('output', 'normal');
$output = Minz_Request::param('output', 'normal');
if ($this->loginOk || Minz_Configuration::allowAnonymous()) {
if ($output === 'normal') {
$this->renderHelper ('view/normal_view');
$this->renderHelper('view/normal_view');
} elseif ($output === 'reader') {
$this->renderHelper ('view/reader_view');
$this->renderHelper('view/reader_view');
} elseif ($output === 'global') {
$this->renderHelper ('view/global_view');
$this->renderHelper('view/global_view');
} elseif ($output === 'rss') {
$this->renderHelper ('view/rss_view');
$this->renderHelper('view/rss_view');
} else {
Minz_Request::_param ('output', 'normal');
Minz_Request::_param('output', 'normal');
$output = 'normal';
$this->renderHelper ('view/normal_view');
$this->renderHelper('view/normal_view');
}
} elseif ($output === 'rss') {
// token has already been checked in the controller so we can show the view
$this->renderHelper ('view/rss_view');
$this->renderHelper('view/rss_view');
} else {
// Normally, it should not happen, but log it anyway
Minz_Log::record ('Something is wrong in ' . __FILE__ . ' line ' . __LINE__, Minz_Log::ERROR);
Minz_Log::record('Something is wrong in ' . __FILE__ . ' line ' . __LINE__, Minz_Log::ERROR);
}
app/views/index/login.phtml
+1 -1
View File
@@ -1 +1 @@
<?php print_r ($this->res); ?>
<?php print_r($this->res); ?>
app/views/index/logs.phtml
+7 -7
View File
@@ -1,23 +1,23 @@
<div class="post content">
<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
<h1><?php echo _t('logs'); ?></h1>
<form method="post" action="<?php echo _url ('index', 'logs'); ?>"><p>
<form method="post" action="<?php echo _url('index', 'logs'); ?>"><p>
<input type="hidden" name="clearLogs" />
<button type="submit" class="btn"><?php echo _t('clear_logs'); ?></button>
</p></form>
<?php $items = $this->logsPaginator->items (); ?>
<?php $items = $this->logsPaginator->items(); ?>
<?php if (!empty ($items)) { ?>
<?php if (!empty($items)) { ?>
<div class="logs">
<?php $this->logsPaginator->render ('logs_pagination.phtml', 'page'); ?>
<?php $this->logsPaginator->render('logs_pagination.phtml', 'page'); ?>
<?php foreach ($items as $log) { ?>
<div class="log <?php echo $log->level (); ?>"><span class="date"><?php echo @date ('Y-m-d H:i:s', @strtotime ($log->date ())); ?></span><?php echo htmlspecialchars ($log->info (), ENT_NOQUOTES, 'UTF-8'); ?></div>
<div class="log <?php echo $log->level(); ?>"><span class="date"><?php echo @date('Y-m-d H:i:s', @strtotime($log->date())); ?></span><?php echo htmlspecialchars($log->info(), ENT_NOQUOTES, 'UTF-8'); ?></div>
<?php } ?>
<?php $this->logsPaginator->render ('logs_pagination.phtml','page'); ?>
<?php $this->logsPaginator->render('logs_pagination.phtml','page'); ?>
</div>
<?php } else { ?>
<p class="alert alert-warn"><?php echo _t('logs_empty'); ?></p>
app/views/stats/index.phtml
+17 -17
View File
@@ -1,38 +1,38 @@
<?php $this->partial('aside_stats'); ?>
<div class="post">
<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t ('back_to_rss_feeds'); ?></a>
<a href="<?php echo _url('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
<h1><?php echo _t ('stats_main'); ?></h1>
<h1><?php echo _t('stats_main'); ?></h1>
<div class="stat half">
<h2><?php echo _t ('stats_entry_repartition'); ?></h2>
<h2><?php echo _t('stats_entry_repartition'); ?></h2>
<table>
<thead>
<tr>
<th> </th>
<th><?php echo _t ('main_stream'); ?></th>
<th><?php echo _t ('all_feeds'); ?></th>
<th><?php echo _t('main_stream'); ?></th>
<th><?php echo _t('all_feeds'); ?></th>
</tr>
</thead>
<tbody>
<tr>
<th><?php echo _t ('status_total'); ?></th>
<th><?php echo _t('status_total'); ?></th>
<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['total']); ?></td>
<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['total']); ?></td>
</tr>
<tr>
<th><?php echo _t ('status_read'); ?></th>
<th><?php echo _t('status_read'); ?></th>
<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['read']); ?></td>
<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['read']); ?></td>
</tr>
<tr>
<th><?php echo _t ('status_unread'); ?></th>
<th><?php echo _t('status_unread'); ?></th>
<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['unread']); ?></td>
<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['unread']); ?></td>
</tr>
<tr>
<th><?php echo _t ('status_favorites'); ?></th>
<th><?php echo _t('status_favorites'); ?></th>
<td class="numeric"><?php echo formatNumber($this->repartition['main_stream']['favorite']); ?></td>
<td class="numeric"><?php echo formatNumber($this->repartition['all_feeds']['favorite']); ?></td>
</tr>
@@ -41,14 +41,14 @@
</div><!--
--><div class="stat half">
<h2><?php echo _t ('stats_top_feed'); ?></h2>
<h2><?php echo _t('stats_top_feed'); ?></h2>
<table>
<thead>
<tr>
<th><?php echo _t ('feed'); ?></th>
<th><?php echo _t ('category'); ?></th>
<th><?php echo _t ('stats_entry_count'); ?></th>
<th><?php echo _t ('stats_percent_of_total'); ?></th>
<th><?php echo _t('feed'); ?></th>
<th><?php echo _t('category'); ?></th>
<th><?php echo _t('stats_entry_count'); ?></th>
<th><?php echo _t('stats_percent_of_total'); ?></th>
</tr>
</thead>
<tbody>
@@ -65,18 +65,18 @@
</div>
<div class="stat">
<h2><?php echo _t ('stats_entry_per_day'); ?></h2>
<h2><?php echo _t('stats_entry_per_day'); ?></h2>
<div id="statsEntryPerDay" style="height: 300px"></div>
</div>
<div class="stat half">
<h2><?php echo _t ('stats_feed_per_category'); ?></h2>
<h2><?php echo _t('stats_feed_per_category'); ?></h2>
<div id="statsFeedPerCategory" style="height: 300px"></div>
<div id="statsFeedPerCategoryLegend"></div>
</div><!--
--><div class="stat half">
<h2><?php echo _t ('stats_entry_per_category'); ?></h2>
<h2><?php echo _t('stats_entry_per_category'); ?></h2>
<div id="statsEntryPerCategory" style="height: 300px"></div>
<div id="statsEntryPerCategoryLegend"></div>
</div>
app/views/users/index.phtml
+1 -1
View File
@@ -164,7 +164,7 @@
<label class="group-name" for="new_user_language"><?php echo _t('language'); ?></label>
<div class="group-controls">
<select name="new_user_language" id="new_user_language">
<?php $languages = $this->conf->availableLanguages (); ?>
<?php $languages = $this->conf->availableLanguages(); ?>
<?php foreach ($languages as $short => $lib) { ?>
<option value="<?php echo $short; ?>"<?php echo $this->conf->language === $short ? ' selected="selected"' : ''; ?>><?php echo $lib; ?></option>
<?php } ?>