diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facebookaction.php | 3 | ||||
| -rw-r--r-- | lib/facebookutil.php | 7 | ||||
| -rw-r--r-- | lib/grouplist.php | 6 | ||||
| -rw-r--r-- | lib/profilelist.php | 19 |
4 files changed, 30 insertions, 5 deletions
diff --git a/lib/facebookaction.php b/lib/facebookaction.php index a12c7d6f9..63ac66250 100644 --- a/lib/facebookaction.php +++ b/lib/facebookaction.php @@ -122,8 +122,7 @@ class FacebookAction extends Action // Add a timestamp to the file so Facebook cache wont ignore our changes $ts = filemtime(INSTALLDIR.'/js/facebookapp.js'); - $this->element('script', array('type' => 'text/javascript', - 'src' => common_path('js/facebookapp.js') . '?ts=' . $ts)); + $this->element('script', array('src' => common_path('js/facebookapp.js') . '?ts=' . $ts)); } /** diff --git a/lib/facebookutil.php b/lib/facebookutil.php index 8454590d6..beab51366 100644 --- a/lib/facebookutil.php +++ b/lib/facebookutil.php @@ -32,11 +32,12 @@ function getFacebookNotices($since) 'FROM notice ' . 'JOIN foreign_link ' . 'WHERE notice.profile_id = foreign_link.user_id ' . - 'AND foreign_link.service = 2 ' . - 'ORDER BY notice.created DESC'; + 'AND foreign_link.service = 2'; // XXX: What should the limit be? - return Notice::getStreamDirect($qry, 0, 100, 0, 0, null, $since); + //static function getStreamDirect($qry, $offset, $limit, $since_id, $before_id, $order, $since) { + + return Notice::getStreamDirect($qry, 0, 1000, 0, 0, null, $since); } function getFacebook() diff --git a/lib/grouplist.php b/lib/grouplist.php index 629bdd05d..4c448e250 100644 --- a/lib/grouplist.php +++ b/lib/grouplist.php @@ -158,6 +158,9 @@ class GroupList extends Widget $this->out->elementEnd('div'); if ($user) { + $this->out->elementStart('div', 'entity_actions'); + $this->out->elementStart('ul'); + $this->out->elementStart('li', 'entity_subscribe'); # XXX: special-case for user looking at own # subscriptions page if ($user->isMember($this->group)) { @@ -167,6 +170,9 @@ class GroupList extends Widget $jf = new JoinForm($this->out, $this->group); $jf->show(); } + $this->out->elementEnd('li'); + $this->out->elementEnd('ul'); + $this->out->elementEnd('div'); } $this->out->elementEnd('li'); diff --git a/lib/profilelist.php b/lib/profilelist.php index 499d74f7b..6e14c0b69 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -191,9 +191,14 @@ class ProfileList extends Widget $this->out->elementEnd('div'); + $this->out->elementStart('div', 'entity_actions'); + + $this->out->elementStart('ul'); + if ($user && $user->id != $this->profile->id) { # XXX: special-case for user looking at own # subscriptions page + $this->out->elementStart('li', 'entity_subscribe'); if ($user->isSubscribed($this->profile)) { $usf = new UnsubscribeForm($this->out, $this->profile); $usf->show(); @@ -201,8 +206,18 @@ class ProfileList extends Widget $sf = new SubscribeForm($this->out, $this->profile); $sf->show(); } + $this->out->elementEnd('li'); + $this->out->elementStart('li', 'entity_block'); + if ($user && $user->id == $this->owner->id) { + $this->showBlockForm(); + } + $this->out->elementEnd('li'); } + $this->out->elementEnd('ul'); + + $this->out->elementEnd('div'); + $this->out->elementEnd('li'); } @@ -217,4 +232,8 @@ class ProfileList extends Widget { return htmlspecialchars($text); } + + function showBlockForm() + { + } } |