eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

configuration option to bust frames or not

Browse Source
This commit is contained in:
Evan Prodromou 2011-03-17 11:31:43 -04:00
parent 64925a275e
commit a430540155
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -1139,6 +1139,9 @@ ssl: Whether to use SSL for JavaScript files. Default is null, which means
sslserver: SSL server to use when page is HTTPS-encrypted. If sslserver: SSL server to use when page is HTTPS-encrypted. If
unspecified, site ssl server and so on will be used. unspecified, site ssl server and so on will be used.
sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted. sslpath: If sslserver if defined, path to use when page is HTTPS-encrypted.
bustframes: If true, all web pages will break out of framesets. If false,
can comfortably live in a frame or iframe... probably. Default
to true.
xmpp xmpp
---- ----

4
lib/action.php
View File

@ -298,7 +298,9 @@ class Action extends HTMLOutputter // lawsuit
$this->script('util.min.js'); $this->script('util.min.js');
$this->showScriptMessages(); $this->showScriptMessages();
// Frame-busting code to avoid clickjacking attacks. // Frame-busting code to avoid clickjacking attacks.
$this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }'); if (common_config('javascript', 'bustframes')) {
$this->inlineScript('if (window.top !== window.self) { window.top.location.href = window.self.location.href; }');
}
Event::handle('EndShowStatusNetScripts', array($this)); Event::handle('EndShowStatusNetScripts', array($this));
Event::handle('EndShowLaconicaScripts', array($this)); Event::handle('EndShowLaconicaScripts', array($this));
} }

3
lib/default.php
View File

@ -154,7 +154,8 @@ $default =
'javascript' => 'javascript' =>
array('server' => null, array('server' => null,
'path'=> null, 'path'=> null,
'ssl' => null), 'ssl' => null,
'bustframes' => true),
'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins) 'local' => // To override path/server for themes in 'local' dir (not currently applied to local plugins)
array('server' => null, array('server' => null,
'dir' => null, 'dir' => null,