+ ?>
+
+ ?>
diff --git a/app/views/helpers/index/normal/entry_header.phtml b/app/views/helpers/index/normal/entry_header.phtml
index 784a440a099..58fa10ad029 100644
--- a/app/views/helpers/index/normal/entry_header.phtml
+++ b/app/views/helpers/index/normal/entry_header.phtml
@@ -1,71 +1,105 @@
topline_read;
- $topline_favorite = FreshRSS_Context::$user_conf->topline_favorite;
- $topline_thumbnail = FreshRSS_Context::$user_conf->topline_thumbnail;
- $topline_summary = FreshRSS_Context::$user_conf->topline_summary;
- $topline_display_authors = FreshRSS_Context::$user_conf->topline_display_authors;
- $topline_date = FreshRSS_Context::$user_conf->topline_date;
- $topline_link = FreshRSS_Context::$user_conf->topline_link;
- $lazyload = FreshRSS_Context::$user_conf->lazyload;
-?>
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/helpers/index/normal/entry_share_menu.phtml b/app/views/helpers/index/normal/entry_share_menu.phtml
new file mode 100644
index 00000000000..6877dd94a4c
--- /dev/null
+++ b/app/views/helpers/index/normal/entry_share_menu.phtml
@@ -0,0 +1,40 @@
+
+
diff --git a/app/views/helpers/index/tags.phtml b/app/views/helpers/index/tags.phtml
new file mode 100644
index 00000000000..ffb2d6f7268
--- /dev/null
+++ b/app/views/helpers/index/tags.phtml
@@ -0,0 +1,50 @@
+entry === null) {
+ return;
+ }
+ [$firstTags,$remainingTags] = $this->entry->tagsFormattingHelper();
+?>
+
diff --git a/app/views/helpers/javascript_vars.phtml b/app/views/helpers/javascript_vars.phtml
index 232068da1f9..252421e5410 100644
--- a/app/views/helpers/javascript_vars.phtml
+++ b/app/views/helpers/javascript_vars.phtml
@@ -1,68 +1,99 @@
mark_when;
-$s = FreshRSS_Context::$user_conf->shortcuts;
-$extData = Minz_ExtensionManager::callHook('js_vars', []);
-echo htmlspecialchars(json_encode(array(
- 'context' => array(
+declare(strict_types=1);
+/** @var FreshRSS_View $this */
+$mark = FreshRSS_Context::userConf()->mark_when;
+$s = FreshRSS_Context::userConf()->shortcuts;
+$extData = Minz_ExtensionManager::callHook(Minz_HookType::JsVars, []);
+$canView = FreshRSS_Auth::hasAccess() || FreshRSS_Context::systemConf()->allow_anonymous;
+echo json_encode([
+ 'context' => [
'anonymous' => !FreshRSS_Auth::hasAccess(),
+ 'admin' => FreshRSS_Auth::hasAccess('admin'),
+ 'suppress_csp_warning' => FreshRSS_Context::systemConf()->suppress_csp_warning,
'auto_remove_article' => !!FreshRSS_Context::isAutoRemoveAvailable(),
- 'hide_posts' => !(FreshRSS_Context::$user_conf->display_posts || Minz_Request::actionName() === 'reader'),
- 'display_order' => Minz_Request::param('order', FreshRSS_Context::$user_conf->sort_order),
- 'display_categories' => FreshRSS_Context::$user_conf->display_categories,
+ 'hide_posts' => !(FreshRSS_Context::userConf()->display_posts || Minz_Request::actionName() === 'reader'),
+ 'display_order' => Minz_Request::paramString('order') ?: FreshRSS_Context::userConf()->sort_order,
+ 'sort' => FreshRSS_Context::$sort,
+ 'display_categories' => FreshRSS_Context::userConf()->display_categories,
+ 'show_title_unread' => FreshRSS_Context::userConf()->show_title_unread,
'auto_mark_article' => !!$mark['article'],
'auto_mark_site' => !!$mark['site'],
'auto_mark_scroll' => !!$mark['scroll'],
- 'auto_load_more' => !!FreshRSS_Context::$user_conf->auto_load_more,
- 'auto_actualize_feeds' => !!Minz_Session::param('actualize_feeds', false),
- 'does_lazyload' => !!FreshRSS_Context::$user_conf->lazyload ,
- 'sides_close_article' => !!FreshRSS_Context::$user_conf->sides_close_article,
+ 'auto_mark_focus' => !!$mark['focus'],
+ 'auto_load_more' => FreshRSS_Context::userConf()->auto_load_more && FreshRSS_Context::$sort !== 'rand',
+ 'auto_actualize_feeds' => Minz_Session::paramBoolean('actualize_feeds'),
+ 'nb_parallel_refresh' => max(1, FreshRSS_Context::systemConf()->nb_parallel_refresh),
+ 'does_lazyload' => FreshRSS_Context::userConf()->lazyload && !Minz_Request::is('index', 'reader'), // TODO: currently no lazy-loading is being done in reader view
+ 'sides_close_article' => !!FreshRSS_Context::userConf()->sides_close_article,
+ 'sidebar_hidden_by_default' => !!FreshRSS_Context::userConf()->sidebar_hidden_by_default,
'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
- 'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
- 'auth_type' => FreshRSS_Context::$system_conf->auth_type,
+ 'html5_enable_notif' => FreshRSS_Context::userConf()->html5_enable_notif,
+ 'html5_notif_timeout' => FreshRSS_Context::userConf()->html5_notif_timeout,
+ 'closeNotification' => [
+ 'good' => FreshRSS_Context::userConf()->good_notification_timeout * 1000,
+ 'bad' => FreshRSS_Context::userConf()->bad_notification_timeout * 1000,
+ 'mouseLeave' => 3000,
+ ],
+ 'auth_type' => FreshRSS_Context::systemConf()->auth_type,
'current_view' => Minz_Request::actionName(),
'csrf' => FreshRSS_Auth::csrfToken(),
- ),
- 'shortcuts' => array(
- 'mark_read' => @$s['mark_read'],
- 'mark_favorite' => @$s['mark_favorite'],
- 'go_website' => @$s['go_website'],
- 'prev_entry' => @$s['prev_entry'],
- 'next_entry' => @$s['next_entry'],
- 'next_unread_entry' => @$s['next_unread_entry'],
- 'skip_prev_entry' => @$s['skip_prev_entry'],
- 'skip_next_entry' => @$s['skip_next_entry'],
- 'first_entry' => @$s['first_entry'],
- 'last_entry' => @$s['last_entry'],
- 'collapse_entry' => @$s['collapse_entry'],
- 'load_more' => @$s['load_more'],
- 'auto_share' => @$s['auto_share'],
- 'focus_search' => @$s['focus_search'],
- 'user_filter' => @$s['user_filter'],
- 'help' => @$s['help'],
- 'close_dropdown' => @$s['close_dropdown'],
- 'normal_view' => @$s['normal_view'],
- 'global_view' => @$s['global_view'],
- 'reading_view' => @$s['reading_view'],
- 'rss_view' => @$s['rss_view'],
- 'toggle_media' => @$s['toggle_media'],
- ),
- 'urls' => array(
+ 'mtime' => [
+ 'extra.js' => @filemtime(PUBLIC_PATH . '/scripts/extra.js'),
+ 'feed.js' => @filemtime(PUBLIC_PATH . '/scripts/feed.js'),
+ ],
+ 'send_referrer_allowlist' => $canView ? FreshRSS_Context::userConf()->send_referrer_allowlist : [],
+ 'max_favicon_upload_size' => FreshRSS_Context::systemConf()->limits['max_favicon_upload_size'],
+ 'version' => FRESHRSS_VERSION,
+ ],
+ 'shortcuts' => [
+ 'actualize' => $s['actualize'] ?? '',
+ 'mark_read' => $s['mark_read'] ?? '',
+ 'mark_favorite' => $s['mark_favorite'] ?? '',
+ 'go_website' => $s['go_website'] ?? '',
+ 'prev_entry' => $s['prev_entry'] ?? '',
+ 'next_entry' => $s['next_entry'] ?? '',
+ 'next_unread_entry' => $s['next_unread_entry'] ?? '',
+ 'skip_prev_entry' => $s['skip_prev_entry'] ?? '',
+ 'skip_next_entry' => $s['skip_next_entry'] ?? '',
+ 'first_entry' => $s['first_entry'] ?? '',
+ 'last_entry' => $s['last_entry'] ?? '',
+ 'collapse_entry' => $s['collapse_entry'] ?? '',
+ 'load_more' => $s['load_more'] ?? '',
+ 'mylabels' => $s['mylabels'] ?? '',
+ 'auto_share' => $s['auto_share'] ?? '',
+ 'focus_search' => $s['focus_search'] ?? '',
+ 'user_filter' => $s['user_filter'] ?? '',
+ 'help' => $s['help'] ?? '',
+ 'close_menus' => $s['close_menus'] ?? '',
+ 'normal_view' => $s['normal_view'] ?? '',
+ 'global_view' => $s['global_view'] ?? '',
+ 'reading_view' => $s['reading_view'] ?? '',
+ 'rss_view' => $s['rss_view'] ?? '',
+ 'toggle_media' => $s['toggle_media'] ?? '',
+ 'toggle_aside' => $s['toggle_aside'] ?? '',
+ ],
+ 'urls' => [
'index' => _url('index', 'index'),
- 'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
- 'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
+ 'login' => Minz_Url::display(['c' => 'auth', 'a' => 'login'], 'php'),
+ 'logout' => Minz_Url::display(['c' => 'auth', 'a' => 'logout'], 'php'),
'help' => FRESHRSS_WIKI,
- ),
- 'i18n' => array(
+ 'shortcuts' => Minz_Url::display(['c' => 'configure', 'a' => 'shortcut'], 'php'),
+ ],
+ 'i18n' => [
'confirmation_default' => _t('gen.js.confirm_action'),
+ 'confirm_exit_slider' => _t('gen.js.confirm_exit_slider'),
'notif_title_articles' => _t('gen.js.feedback.title_new_articles'),
- 'notif_body_articles' => _t('gen.js.feedback.body_new_articles'),
'notif_request_failed' => _t('gen.js.feedback.request_failed'),
'category_empty' => _t('gen.js.category_empty'),
- 'language' => FreshRSS_Context::$user_conf->language,
- ),
- 'icons' => array(
+ 'labels_empty' => _t('gen.js.labels_empty'),
+ 'favicon_size_exceeded' => _t('feedback.sub.feed.favicon.too_large', format_bytes(FreshRSS_Context::systemConf()->limits['max_favicon_upload_size'])),
+ 'language' => FreshRSS_Context::userConf()->language,
+ 'unsafe_csp_header' => _t('gen.js.unsafe_csp_header'),
+ ],
+ 'icons' => [
'read' => rawurlencode(_i('read')),
'unread' => rawurlencode(_i('unread')),
- ),
+ 'spinner' => '../themes/icons/spinner.svg',
+ ],
'extensions' => $extData,
-), JSON_UNESCAPED_UNICODE), ENT_NOQUOTES, 'UTF-8');
+], JSON_UNESCAPED_UNICODE | JSON_HEX_TAG | JSON_HEX_AMP);
diff --git a/app/views/helpers/logs_pagination.phtml b/app/views/helpers/logs_pagination.phtml
old mode 100755
new mode 100644
index e740741734b..66600bea020
--- a/app/views/helpers/logs_pagination.phtml
+++ b/app/views/helpers/logs_pagination.phtml
@@ -1,47 +1,67 @@
-
nbPage > 1) { ?>
-
diff --git a/app/views/helpers/stream-footer.phtml b/app/views/helpers/stream-footer.phtml
new file mode 100644
index 00000000000..7656c7e408b
--- /dev/null
+++ b/app/views/helpers/stream-footer.phtml
@@ -0,0 +1,74 @@
+ 'entry',
+ 'a' => 'read',
+ 'params' => [
+ 'get' => FreshRSS_Context::currentGet(),
+ 'nextGet' => FreshRSS_Context::$next_get,
+ 'idMax' => FreshRSS_Context::$id_max,
+ 'search' => FreshRSS_Context::$search->toString(),
+ 'state' => FreshRSS_Context::$state,
+ 'sort' => FreshRSS_Context::$sort,
+ 'order' => FreshRSS_Context::$order,
+ 'from' => Minz_Request::paramStringNull('from') ?? Minz_Request::actionName(),
+ ],
+ ];
+
+ $hasAccess = FreshRSS_Auth::hasAccess();
+ if ($hasAccess) {
+?>
+