Some adjustments to allow the Facebook app work with Laconica 0.8
This commit is contained in:
parent
0664be924f
commit
69a656af22
|
@ -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();
|
||||||
|
|
||||||
|
|
|
@ -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()
|
||||||
|
|
Loading…
Reference in New Issue
Block a user