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

Some adjustments to allow the Facebook app work with Laconica 0.8

Browse Source
This commit is contained in:
Zach Copley 2009-05-26 23:21:10 +00:00
parent 0664be924f
commit 69a656af22
2 changed files with 110 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/facebookhome.php
View File

@ -115,7 +115,7 @@ class FacebookhomeAction extends FacebookAction
$flink->foreign_id = $this->fbuid; $flink->foreign_id = $this->fbuid;
$flink->service = FACEBOOK_SERVICE; $flink->service = FACEBOOK_SERVICE;
$flink->created = common_sql_now(); $flink->created = common_sql_now();
$flink->set_flags(true, false, false); $flink->set_flags(true, false, false, false);
$flink_id = $flink->insert(); $flink_id = $flink->insert();

132
lib/facebookaction.php
View File

@ -98,9 +98,9 @@ class FacebookAction extends Action
// Add a timestamp to the file so Facebook cache wont ignore our changes // Add a timestamp to the file so Facebook cache wont ignore our changes
$ts = filemtime(INSTALLDIR.'/theme/base/css/display.css'); $ts = filemtime(INSTALLDIR.'/theme/base/css/display.css');
$this->element('link', array('rel' => 'stylesheet', $this->element('link', array('rel' => 'stylesheet',
'type' => 'text/css', 'type' => 'text/css',
'href' => theme_path('css/display.css', 'base') . '?ts=' . $ts)); 'href' => theme_path('css/display.css', 'base') . '?ts=' . $ts));
$theme = common_config('site', 'theme'); $theme = common_config('site', 'theme');
@ -278,7 +278,7 @@ class FacebookAction extends Action
$this->element('a', $this->element('a',
array('href' => common_local_url('register')), _('Register')); array('href' => common_local_url('register')), _('Register'));
$this->text($loginmsg_part2); $this->text($loginmsg_part2);
$this->elementEnd('p'); $this->elementEnd('p');
$this->elementEnd('dd'); $this->elementEnd('dd');
$this->elementEnd('dl'); $this->elementEnd('dl');
@ -317,7 +317,7 @@ class FacebookAction extends Action
$this->elementEnd('ul'); $this->elementEnd('ul');
$this->submit('submit', _('Login')); $this->submit('submit', _('Login'));
$this->elementEnd('fieldset'); $this->elementEnd('fieldset');
$this->elementEnd('form'); $this->elementEnd('form');
$this->elementStart('p'); $this->elementStart('p');
@ -336,65 +336,65 @@ class FacebookAction extends Action
// Need to include inline CSS for styling the Profile box // Need to include inline CSS for styling the Profile box
$app_props = $this->facebook->api_client->Admin_getAppProperties(array('icon_url')); $app_props = $this->facebook->api_client->Admin_getAppProperties(array('icon_url'));
$icon_url = $app_props['icon_url']; $icon_url = $app_props['icon_url'];
$style = '<style> $style = '<style>
.entry-title *, .entry-title *,
.entry-content * { .entry-content * {
font-size:14px; font-size:14px;
font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif; font-family:"Lucida Sans Unicode", "Lucida Grande", sans-serif;
} }
.entry-title a, .entry-title a,
.entry-content a { .entry-content a {
color:#002E6E; color:#002E6E;
} }
.entry-title .vcard .photo { .entry-title .vcard .photo {
float:left; float:left;
display:inline; display:inline;
margin-right:11px; margin-right:11px;
margin-bottom:11px margin-bottom:11px
} }
.entry-title { .entry-title {
margin-bottom:11px; margin-bottom:11px;
} }
.entry-title p.entry-content { .entry-title p.entry-content {
display:inline; display:inline;
margin-left:5px; margin-left:5px;
} }
div.entry-content { div.entry-content {
clear:both; clear:both;
} }
div.entry-content dl, div.entry-content dl,
div.entry-content dt, div.entry-content dt,
div.entry-content dd { div.entry-content dd {
display:inline; display:inline;
text-transform:lowercase; text-transform:lowercase;
} }
div.entry-content dd, div.entry-content dd,
div.entry-content .device dt { div.entry-content .device dt {
margin-left:0; margin-left:0;
margin-right:5px; margin-right:5px;
} }
div.entry-content dl.timestamp dt, div.entry-content dl.timestamp dt,
div.entry-content dl.response dt { div.entry-content dl.response dt {
display:none; display:none;
} }
div.entry-content dd a { div.entry-content dd a {
display:inline-block; display:inline-block;
} }
#facebook_laconica_app { #facebook_laconica_app {
text-indent:-9999px; text-indent:-9999px;
height:16px; height:16px;
width:16px; width:16px;
display:block; display:block;
background:url('.$icon_url.') no-repeat 0 0; background:url('.$icon_url.') no-repeat 0 0;
float:right; float:right;
} }
</style>'; </style>';
$this->xw->openMemory(); $this->xw->openMemory();
@ -646,48 +646,16 @@ class FacebookNoticeListItem extends NoticeListItem
function show() function show()
{ {
$this->showStart(); $this->showStart();
$this->showNotice();
$this->showNoticeInfo();
$this->out->elementStart('div', 'entry-title'); // XXX: Need to update to show attachements and controls
$this->showAuthor();
$this->showContent();
$this->out->elementEnd('div');
$this->out->elementStart('div', 'entry-content');
$this->showNoticeLink();
$this->showNoticeSource();
$this->showReplyTo();
$this->out->elementEnd('div');
$this->showEnd(); $this->showEnd();
} }
function showNoticeLink()
{
$noticeurl = common_local_url('shownotice',
array('notice' => $this->notice->id));
// XXX: we need to figure this out better. Is this right?
if (strcmp($this->notice->uri, $noticeurl) != 0 &&
preg_match('/^http/', $this->notice->uri)) {
$noticeurl = $this->notice->uri;
}
$this->out->elementStart('dl', 'timestamp');
$this->out->element('dt', null, _('Published'));
$this->out->elementStart('dd', null);
$this->out->elementStart('a', array('rel' => 'bookmark',
'href' => $noticeurl));
$dt = common_date_iso8601($this->notice->created);
$this->out->element('abbr', array('class' => 'published',
'title' => $dt),
common_date_string($this->notice->created));
$this->out->elementEnd('a');
$this->out->elementEnd('dd');
$this->out->elementEnd('dl');
}
} }
class FacebookProfileBoxNotice extends FacebookNoticeListItem class FacebookProfileBoxNotice extends FacebookNoticeListItem
{ {
@ -706,28 +674,16 @@ class FacebookProfileBoxNotice extends FacebookNoticeListItem
/** /**
* Recipe function for displaying a single notice in the * Recipe function for displaying a single notice in the
* Facebook App's Profile * Facebook App profile notice box
* *
* @return void * @return void
*/ */
function show() function show()
{ {
$this->showNotice();
$this->out->elementStart('div', 'entry-title'); $this->showNoticeInfo();
$this->showAuthor();
$this->showContent();
$this->out->elementEnd('div');
$this->out->elementStart('div', 'entry-content');
$this->showNoticeLink();
$this->showNoticeSource();
$this->showReplyTo();
$this->out->elementEnd('div');
$this->showAppLink(); $this->showAppLink();
} }
function showAppLink() function showAppLink()