aboutsummaryrefslogtreecommitdiff
path: root/app/FreshRSS.php
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-02-21 14:23:24 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-02-21 14:23:24 +0100
commite3dc7d46e15d97f8bd008acf3489d5e6c22b8daa (patch)
treeb7db25c8d0b5d617fa03b5584c193c5576488dea /app/FreshRSS.php
parent64ec0708a1404e1f39a5fdc0131c89b2e4038bee (diff)
CSP: Use inline JSON instead of one-time cookie
Simpler, lighter https://github.com/FreshRSS/FreshRSS/issues/1075
Diffstat (limited to 'app/FreshRSS.php')
-rw-r--r--app/FreshRSS.php58
1 files changed, 0 insertions, 58 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 8eb862aeb..a6ed2a306 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -110,66 +110,8 @@ class FreshRSS extends Minz_FrontController {
}
}
- private static function setJavascriptCookie() {
- $mark = FreshRSS_Context::$user_conf->mark_when;
- $mail = Minz_Session::param('mail', false);
- $s = FreshRSS_Context::$user_conf->shortcuts;
- $json = json_encode(array(
- 'context' => array(
- '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),
- '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 ,
- 'sticky_post' => !!FreshRSS_Context::isStickyPostEnabled(),
- 'html5_notif_timeout' => FreshRSS_Context::$user_conf->html5_notif_timeout,
- 'auth_type' => FreshRSS_Context::$system_conf->auth_type,
- 'current_user_mail' => $mail ? ('"' . $mail . '"') : null,
- 'current_view' => Minz_Request::actionName(),
- ),
- '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'],
- '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'],
- ),
- 'url' => array(
- 'index' => _url('index', 'index'),
- 'login' => Minz_Url::display(array('c' => 'auth', 'a' => 'login'), 'php'),
- 'logout' => Minz_Url::display(array('c' => 'auth', 'a' => 'logout'), 'php'),
- 'help' => FRESHRSS_WIKI,
- ),
- 'i18n' => array(
- 'confirmation_default' => _t('gen.js.confirm_action'),
- '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'),
- ),
- 'icons' => array(
- 'close' => _i('close'),
- ),
- ), JSON_UNESCAPED_UNICODE);
- setrawcookie('FreshRSS-vars', rawurlencode($json), 0, Minz_Session::getCookieDir());
- }
-
public static function preLayout() {
header("Content-Security-Policy: default-src 'self'; child-src *; img-src * data:; media-src *; style-src 'self' 'unsafe-inline'");
- self::setJavascriptCookie();
}
private function loadNotifications() {