wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '0.9.x'

Browse Source
This commit is contained in:
Brion Vibber 2011-03-18 14:11:27 -07:00
commit 1fdc72f595
4 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -1148,6 +1148,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,

40
lib/noticesection.php
View File

@ -39,6 +39,8 @@ define('NOTICES_PER_SECTION', 6);
* These are the widgets that show interesting data about a person * These are the widgets that show interesting data about a person
* group, or site. * group, or site.
* *
* @todo migrate this to use a variant of NoticeList
*
* @category Widget * @category Widget
* @package StatusNet * @package StatusNet
* @author Evan Prodromou <evan@status.net> * @author Evan Prodromou <evan@status.net>
@ -97,38 +99,14 @@ class NoticeSection extends Section
$this->out->elementStart('p', 'entry-content'); $this->out->elementStart('p', 'entry-content');
$this->out->raw($notice->rendered); $this->out->raw($notice->rendered);
$notice_link_cfg = common_config('site', 'notice_link');
if ('direct' === $notice_link_cfg) {
$this->out->text(' (');
$this->out->element('a', array('href' => $notice->uri), 'see');
$this->out->text(')');
} elseif ('attachment' === $notice_link_cfg) {
if ($count = $notice->hasAttachments()) {
// link to attachment(s) pages
if (1 === $count) {
$f2p = File_to_post::staticGet('post_id', $notice->id);
$href = common_local_url('attachment', array('attachment' => $f2p->file_id));
$att_class = 'attachment';
} else {
$href = common_local_url('attachments', array('notice' => $notice->id));
$att_class = 'attachments';
}
$clip = Theme::path('images/icons/clip.png', 'base');
$this->out->elementStart('a', array('class' => $att_class, 'style' => "font-style: italic;", 'href' => $href, 'title' => "# of attachments: $count"));
$this->out->raw(" ($count&nbsp");
$this->out->element('img', array('style' => 'display: inline', 'align' => 'top', 'width' => 20, 'height' => 20, 'src' => $clip, 'alt' => 'alt'));
$this->out->text(')');
$this->out->elementEnd('a');
} else {
$this->out->text(' (');
$this->out->element('a', array('href' => $notice->uri), 'see');
$this->out->text(')');
}
}
$this->out->elementEnd('p'); $this->out->elementEnd('p');
$this->out->elementStart('div', 'entry_content');
get_class('NoticeList');
$nli = new NoticeListItem($notice, $this->out);
$nli->showNoticeLink();
$this->out->elementEnd('div');
if (!empty($notice->value)) { if (!empty($notice->value)) {
$this->out->elementStart('p'); $this->out->elementStart('p');
$this->out->text($notice->value); $this->out->text($notice->value);