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

Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Browse Source 
* '0.8.x' of git@gitorious.org:laconica/dev:
  null for both args in conversation
  no limit on conversation stream
  fixed limit for conversations
  only show subscribe button in profile list for local users
  move peoplesearchresults class to action/peoplesearch
  only show subscription controls to owner
This commit is contained in:
Zach Copley 2009-07-03 15:42:55 -07:00
commit 2881b553fe
6 changed files with 66 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/conversation.php
View File

@ -31,6 +31,9 @@ if (!defined('LACONICA')) {
exit(1);
}
// XXX: not sure how to do paging yet,
// so set a 60-notice limit
require_once INSTALLDIR.'/lib/noticelist.php';
/**
@ -107,7 +110,7 @@ class ConversationAction extends Action
function showContent()
{
$notices = Notice::conversationStream($this->id, null);
$notices = Notice::conversationStream($this->id, null, null);
$ct = new ConversationTree($notices, $this);

44
actions/peoplesearch.php
View File

@ -87,3 +87,47 @@ class PeoplesearchAction extends SearchAction
}
}
/**
* People search results class
*
* Derivative of ProfileList with specialization for highlighting search terms.
*
* @category Widget
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* @see PeoplesearchAction
*/
class PeopleSearchResults extends ProfileList
{
var $terms = null;
var $pattern = null;
function __construct($profile, $terms, $action)
{
parent::__construct($profile, $action);
$this->terms = array_map('preg_quote',
array_map('htmlspecialchars', $terms));
$this->pattern = '/('.implode('|',$terms).')/i';
}
function newProfileItem($profile)
{
return new PeopleSearchResultItem($profile, $this->action);
}
}
class PeopleSearchResultItem extends ProfileListItem
{
function highlight($text)
{
return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
}
}

3
actions/subscriptions.php
View File

@ -159,7 +159,10 @@ class SubscriptionsListItem extends SubscriptionListItem
$this->showBio();
$this->showTags();
// Relevant portion!
$cur = common_current_user();
if (!empty($cur) && $cur->id == $this->owner->id) {
$this->showOwnerControls();
}
$this->endProfile();
}

1
classes/Notice.php
View File

@ -1187,6 +1187,7 @@ class Notice extends Memcached_DataObject
if (empty($cache) ||
$since_id != 0 || $max_id != 0 || (!is_null($since) && $since > 0) ||
is_null($limit) ||
($offset + $limit) > NOTICE_CACHE_WINDOW) {
return call_user_func_array($fn, array_merge($args, array($offset, $limit, $since_id,
$max_id, $since)));

80
lib/peoplesearchresults.php
View File

@ -1,80 +0,0 @@
<?php
/**
* People search results class
*
* PHP version 5
*
* @category Widget
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* Laconica - a distributed open-source microblogging tool
* Copyright (C) 2008, 2009, Control Yourself, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
if (!defined('LACONICA')) {
exit(1);
}
require_once INSTALLDIR.'/lib/profilelist.php';
/**
* People search results class
*
* Derivative of ProfileList with specialization for highlighting search terms.
*
* @category Widget
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Robin Millette <millette@controlyourself.ca>
* @license http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
* @link http://laconi.ca/
*
* @see PeoplesearchAction
*/
class PeopleSearchResults extends ProfileList
{
var $terms = null;
var $pattern = null;
function __construct($profile, $terms, $action)
{
parent::__construct($profile, $action);
$this->terms = array_map('preg_quote',
array_map('htmlspecialchars', $terms));
$this->pattern = '/('.implode('|',$terms).')/i';
}
function newProfileItem($profile)
{
return new PeopleSearchResultItem($profile, $this->action);
}
}
class PeopleSearchResultItem extends ProfileListItem
{
function highlight($text)
{
return preg_replace($this->pattern, '<strong>\\1</strong>', htmlspecialchars($text));
}
}

5
lib/profilelist.php
View File

@ -243,6 +243,10 @@ class ProfileListItem extends Widget
$user = common_current_user();
if (!empty($user) && $this->profile->id != $user->id) {
// Is it a local user? can't remote sub from a list
// XXX: make that possible!
$other = User::staticGet('id', $this->profile->id);
if (!empty($other)) {
$this->out->elementStart('li', 'entity_subscribe');
if ($user->isSubscribed($this->profile)) {
$usf = new UnsubscribeForm($this->out, $this->profile);
@ -254,6 +258,7 @@ class ProfileListItem extends Widget
$this->out->elementEnd('li');
}
}
}
function endActions()
{