Merge branch '0.9.x' into schema
This commit is contained in:
Evan Prodromou
commit
a41ed1a66a
24
EVENTS.txt
24
EVENTS.txt
|
|
@ -87,6 +87,12 @@ StartShowContentBlock: Showing before the content container
|
|||
EndShowContentBlock: Showing after the content container
|
||||
- $action: the current action
|
||||
|
||||
StartShowAside: Showing before the Aside container
|
||||
- $action: the current action
|
||||
|
||||
EndShowAside: Showing after the Aside container
|
||||
- $action: the current action
|
||||
|
||||
StartNoticeSave: before inserting a notice (good place for content filters)
|
||||
- $notice: notice being saved (no ID or URI)
|
||||
|
||||
|
|
@ -170,12 +176,6 @@ StartShowBody: called before showing the <body> element and children
|
|||
EndShowBody: called after showing the <body> element (and </body>)
|
||||
- $action: action object being shown
|
||||
|
||||
StartHeadChildren: called before showing the children of <head> element (after <head> tag)
|
||||
- $action: action object being shown
|
||||
|
||||
EndHeadChildren: called after showing the children of <head> element (before </head>)
|
||||
- $action: action object being shown
|
||||
|
||||
StartPersonalGroupNav: beginning of personal group nav menu
|
||||
- $action: action object being shown
|
||||
|
||||
|
|
@ -200,6 +200,12 @@ StartShowExportData: just before showing the <div> with export data (feeds)
|
|||
EndShowExportData: just after showing the <div> with export data (feeds)
|
||||
- $action: action object being shown
|
||||
|
||||
StartShowNoticeItem: just before showing the notice item
|
||||
- $action: action object being shown
|
||||
|
||||
EndShowNoticeItem: just after showing the notice item
|
||||
- $action: action object being shown
|
||||
|
||||
StartShowPageNotice: just before showing the page notice (instructions or error)
|
||||
- $action: action object being shown
|
||||
|
||||
|
|
@ -271,3 +277,9 @@ GetValidDaemons: Just before determining which daemons to run
|
|||
|
||||
HandleQueuedNotice: Handle a queued notice at queue time (or immediately if no queue)
|
||||
- &$notice: notice to handle
|
||||
|
||||
StartShowHeadElements: Right after the <head> tag
|
||||
- $action: the current action
|
||||
|
||||
EndShowHeadElements: Right before the </head> tag; put <script>s here if you need them in <head>
|
||||
- $action: the current action
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ class AllrssAction extends Rss10Action
|
|||
$this->clientError(_('No such user.'));
|
||||
return false;
|
||||
} else {
|
||||
$this->notices = $this->getNotices($this->limit);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -160,6 +160,7 @@ class ApiAction extends Action
|
|||
|
||||
static $bareauth = array('statuses/user_timeline',
|
||||
'statuses/friends_timeline',
|
||||
'statuses/home_timeline',
|
||||
'statuses/friends',
|
||||
'statuses/replies',
|
||||
'statuses/mentions',
|
||||
|
|
|
|||
|
|
@ -362,13 +362,13 @@ class AvatarsettingsAction extends AccountSettingsAction
|
|||
$profile = $user->getProfile();
|
||||
|
||||
$avatar = $profile->getOriginalAvatar();
|
||||
$avatar->delete();
|
||||
if($avatar) $avatar->delete();
|
||||
$avatar = $profile->getAvatar(AVATAR_PROFILE_SIZE);
|
||||
$avatar->delete();
|
||||
if($avatar) $avatar->delete();
|
||||
$avatar = $profile->getAvatar(AVATAR_STREAM_SIZE);
|
||||
$avatar->delete();
|
||||
if($avatar) $avatar->delete();
|
||||
$avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
|
||||
$avatar->delete();
|
||||
if($avatar) $avatar->delete();
|
||||
|
||||
$this->showForm(_('Avatar deleted.'), true);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -32,15 +32,45 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
require_once INSTALLDIR.'/lib/deleteaction.php';
|
||||
|
||||
class DeletenoticeAction extends DeleteAction
|
||||
class DeletenoticeAction extends Action
|
||||
{
|
||||
var $error = null;
|
||||
var $user = null;
|
||||
var $notice = null;
|
||||
var $profile = null;
|
||||
var $user_profile = null;
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
||||
$this->user = common_current_user();
|
||||
$notice_id = $this->trimmed('notice');
|
||||
$this->notice = Notice::staticGet($notice_id);
|
||||
|
||||
if (!$this->notice) {
|
||||
common_user_error(_('No such notice.'));
|
||||
exit;
|
||||
}
|
||||
|
||||
$this->profile = $this->notice->getProfile();
|
||||
$this->user_profile = $this->user->getProfile();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
|
||||
if (!common_logged_in()) {
|
||||
common_user_error(_('Not logged in.'));
|
||||
exit;
|
||||
} else if ($this->notice->profile_id != $this->user_profile->id &&
|
||||
!$this->user->hasRight(Right::deleteOthersNotice)) {
|
||||
common_user_error(_('Can\'t delete this notice.'));
|
||||
exit;
|
||||
}
|
||||
// XXX: Ajax!
|
||||
|
||||
if ($_SERVER['REQUEST_METHOD'] == 'POST') {
|
||||
|
|
|
|||
|
|
@ -250,7 +250,6 @@ class EditgroupAction extends GroupDesignAction
|
|||
$this->group->homepage = $homepage;
|
||||
$this->group->description = $description;
|
||||
$this->group->location = $location;
|
||||
$this->group->created = common_sql_now();
|
||||
|
||||
$result = $this->group->update($orig);
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,7 @@ class FavoritesrssAction extends Rss10Action
|
|||
$this->clientError(_('No such user.'));
|
||||
return false;
|
||||
} else {
|
||||
$this->notices = $this->getNotices($this->limit);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
173
actions/foafgroup.php
Normal file
173
actions/foafgroup.php
Normal file
|
|
@ -0,0 +1,173 @@
|
|||
<?php
|
||||
/*
|
||||
* StatusNet the distributed open-source microblogging tool
|
||||
* Copyright (C) 2008, 2009, StatusNet, 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/>.
|
||||
*
|
||||
* @category Mail
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @author Toby Inkster <mail@tobyinkster.co.uk>
|
||||
* @copyright 2009 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
|
||||
|
||||
class FoafGroupAction extends Action
|
||||
{
|
||||
function isReadOnly($args)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
||||
$nickname_arg = $this->arg('nickname');
|
||||
|
||||
if (empty($nickname_arg)) {
|
||||
$this->clientError(_('No such group.'), 404);
|
||||
return false;
|
||||
}
|
||||
|
||||
$this->nickname = common_canonical_nickname($nickname_arg);
|
||||
|
||||
// Permanent redirect on non-canonical nickname
|
||||
|
||||
if ($nickname_arg != $this->nickname) {
|
||||
common_redirect(common_local_url('foafgroup',
|
||||
array('nickname' => $this->nickname)),
|
||||
301);
|
||||
return false;
|
||||
}
|
||||
|
||||
$this->group = User_group::staticGet('nickname', $this->nickname);
|
||||
|
||||
if (!$this->group) {
|
||||
$this->clientError(_('No such group.'), 404);
|
||||
return false;
|
||||
}
|
||||
|
||||
common_set_returnto($this->selfUrl());
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
|
||||
header('Content-Type: application/rdf+xml');
|
||||
|
||||
$this->startXML();
|
||||
$this->elementStart('rdf:RDF', array('xmlns:rdf' =>
|
||||
'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
|
||||
'xmlns:dcterms' =>
|
||||
'http://purl.org/dc/terms/',
|
||||
'xmlns:sioc' =>
|
||||
'http://rdfs.org/sioc/ns#',
|
||||
'xmlns:foaf' =>
|
||||
'http://xmlns.com/foaf/0.1/',
|
||||
'xmlns:statusnet' =>
|
||||
'http://status.net/ont/',
|
||||
'xmlns' => 'http://xmlns.com/foaf/0.1/'));
|
||||
|
||||
$this->showPpd(common_local_url('foafgroup', array('nickname' => $this->nickname)), $this->group->permalink());
|
||||
|
||||
$this->elementStart('Group', array('rdf:about' =>
|
||||
$this->group->permalink()));
|
||||
if ($this->group->fullname) {
|
||||
$this->element('name', null, $this->group->fullname);
|
||||
}
|
||||
if ($this->group->description) {
|
||||
$this->element('dcterms:description', null, $this->group->description);
|
||||
}
|
||||
if ($this->group->nickname) {
|
||||
$this->element('dcterms:identifier', null, $this->group->nickname);
|
||||
$this->element('nick', null, $this->group->nickname);
|
||||
}
|
||||
foreach ($this->group->getAliases() as $alias) {
|
||||
$this->element('nick', null, $alias);
|
||||
}
|
||||
if ($this->group->homeUrl()) {
|
||||
$this->element('weblog', array('rdf:resource' => $this->group->homeUrl()));
|
||||
}
|
||||
if ($this->group->homepage) {
|
||||
$this->element('page', array('rdf:resource' => $this->group->homepage));
|
||||
}
|
||||
if ($this->group->homepage_logo) {
|
||||
$this->element('depiction', array('rdf:resource' => $this->group->homepage_logo));
|
||||
}
|
||||
|
||||
$members = $this->group->getMembers();
|
||||
$member_details = array();
|
||||
while ($members->fetch()) {
|
||||
$member_uri = common_local_url('userbyid', array('id'=>$members->id));
|
||||
$member_details[$member_uri] = array(
|
||||
'nickname' => $members->nickname
|
||||
);
|
||||
$this->element('member', array('rdf:resource' => $member_uri));
|
||||
}
|
||||
|
||||
$admins = $this->group->getAdmins();
|
||||
while ($admins->fetch()) {
|
||||
$admin_uri = common_local_url('userbyid', array('id'=>$admins->id));
|
||||
$member_details[$admin_uri]['is_admin'] = true;
|
||||
$this->element('statusnet:groupAdmin', array('rdf:resource' => $admin_uri));
|
||||
}
|
||||
|
||||
$this->elementEnd('Group');
|
||||
|
||||
ksort($member_details);
|
||||
foreach ($member_details as $uri => $details) {
|
||||
if ($details['is_admin'])
|
||||
{
|
||||
$this->elementStart('Agent', array('rdf:about' => $uri));
|
||||
$this->element('nick', null, $details['nickname']);
|
||||
$this->elementStart('holdsAccount');
|
||||
$this->elementStart('sioc:User', array('rdf:about'=>$uri.'#acct'));
|
||||
$this->elementStart('sioc:has_function');
|
||||
$this->elementStart('statusnet:GroupAdminRole');
|
||||
$this->element('sioc:scope', array('rdf:resource' => $this->group->permalink()));
|
||||
$this->elementEnd('statusnet:GroupAdminRole');
|
||||
$this->elementEnd('sioc:has_function');
|
||||
$this->elementEnd('sioc:User');
|
||||
$this->elementEnd('holdsAccount');
|
||||
$this->elementEnd('Agent');
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->element('Agent', array(
|
||||
'foaf:nick' => $details['nickname'],
|
||||
'rdf:about' => $uri,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
$this->elementEnd('rdf:RDF');
|
||||
$this->endXML();
|
||||
}
|
||||
|
||||
function showPpd($foaf_url, $person_uri)
|
||||
{
|
||||
$this->elementStart('Document', array('rdf:about' => $foaf_url));
|
||||
$this->element('primaryTopic', array('rdf:resource' => $person_uri));
|
||||
$this->elementEnd('Document');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -104,6 +104,7 @@ class groupRssAction extends Rss10Action
|
|||
return false;
|
||||
}
|
||||
|
||||
$this->notices = $this->getNotices($this->limit);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -255,13 +255,6 @@ class NewnoticeAction extends Action
|
|||
$notice = Notice::saveNew($user->id, $content_shortened, 'web', 1,
|
||||
($replyto == 'false') ? null : $replyto);
|
||||
|
||||
if (is_string($notice)) {
|
||||
if (isset($filename)) {
|
||||
$this->deleteFile($filename);
|
||||
}
|
||||
$this->clientError($notice);
|
||||
}
|
||||
|
||||
if (isset($mimetype)) {
|
||||
$this->attachFile($notice, $fileRecord);
|
||||
}
|
||||
|
|
@ -433,13 +426,14 @@ class NewnoticeAction extends Action
|
|||
$content = $this->trimmed('status_textarea');
|
||||
if (!$content) {
|
||||
$replyto = $this->trimmed('replyto');
|
||||
$inreplyto = $this->trimmed('inreplyto');
|
||||
$profile = Profile::staticGet('nickname', $replyto);
|
||||
if ($profile) {
|
||||
$content = '@' . $profile->nickname . ' ';
|
||||
}
|
||||
}
|
||||
|
||||
$notice_form = new NoticeForm($this, '', $content);
|
||||
$notice_form = new NoticeForm($this, '', $content, null, $inreplyto);
|
||||
$notice_form->show();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -49,6 +49,20 @@ require_once INSTALLDIR.'/lib/rssaction.php';
|
|||
*/
|
||||
class PublicrssAction extends Rss10Action
|
||||
{
|
||||
/**
|
||||
* Read arguments and initialize members
|
||||
*
|
||||
* @param array $args Arguments from $_REQUEST
|
||||
* @return boolean success
|
||||
*/
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
$this->notices = $this->getNotices($this->limit);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Initialization.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ class RepliesrssAction extends Rss10Action
|
|||
$this->clientError(_('No such user.'));
|
||||
return false;
|
||||
} else {
|
||||
$this->notices = $this->getNotices($this->limit);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -345,6 +345,11 @@ class ShowgroupAction extends GroupDesignAction
|
|||
'method' => 'timeline',
|
||||
'argument' => $this->group->nickname.'.atom')),
|
||||
sprintf(_('Notice feed for %s group (Atom)'),
|
||||
$this->group->nickname)),
|
||||
new Feed(Feed::FOAF,
|
||||
common_local_url('foafgroup',
|
||||
array('nickname' => $this->group->nickname)),
|
||||
sprintf(_('FOAF for %s group'),
|
||||
$this->group->nickname)));
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -378,8 +378,13 @@ class ShowstreamAction extends ProfileAction
|
|||
$this->showEmptyListMessage();
|
||||
}
|
||||
|
||||
$args = array('nickname' => $this->user->nickname);
|
||||
if (!empty($this->tag))
|
||||
{
|
||||
$args['tag'] = $this->tag;
|
||||
}
|
||||
$this->pagination($this->page>1, $cnt>NOTICES_PER_PAGE, $this->page,
|
||||
'showstream', array('nickname' => $this->user->nickname));
|
||||
'showstream', $args);
|
||||
}
|
||||
|
||||
function showAnonymousMessage()
|
||||
|
|
|
|||
|
|
@ -293,6 +293,105 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
|
|||
}
|
||||
}
|
||||
|
||||
function join($args, $apidata)
|
||||
{
|
||||
parent::handle($args);
|
||||
|
||||
common_debug("in groups api action");
|
||||
|
||||
$this->auth_user = $apidata['user'];
|
||||
$group = $this->get_group($apidata['api_arg'], $apidata);
|
||||
|
||||
if (empty($group)) {
|
||||
$this->clientError('Not Found', 404, $apidata['content-type']);
|
||||
return false;
|
||||
}
|
||||
|
||||
if($this->auth_user->isMember($group)){
|
||||
$this->clientError(_('You are already a member of that group'), $code = 403);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (Group_block::isBlocked($group, $this->auth_user->getProfile())) {
|
||||
$this->clientError(_('You have been blocked from that group by the admin.'), 403);
|
||||
return false;
|
||||
}
|
||||
|
||||
$member = new Group_member();
|
||||
|
||||
$member->group_id = $group->id;
|
||||
$member->profile_id = $this->auth_user->id;
|
||||
$member->created = common_sql_now();
|
||||
|
||||
$result = $member->insert();
|
||||
|
||||
if (!$result) {
|
||||
common_log_db_error($member, 'INSERT', __FILE__);
|
||||
$this->serverError(sprintf(_('Could not join user %s to group %s'),
|
||||
$this->auth_user->nickname, $group->nickname));
|
||||
}
|
||||
|
||||
switch($apidata['content-type']) {
|
||||
case 'xml':
|
||||
$this->show_single_xml_group($group);
|
||||
break;
|
||||
case 'json':
|
||||
$this->show_single_json_group($group);
|
||||
break;
|
||||
default:
|
||||
$this->clientError(_('API method not found!'), $code = 404);
|
||||
}
|
||||
}
|
||||
|
||||
function leave($args, $apidata)
|
||||
{
|
||||
parent::handle($args);
|
||||
|
||||
common_debug("in groups api action");
|
||||
|
||||
$this->auth_user = $apidata['user'];
|
||||
$group = $this->get_group($apidata['api_arg'], $apidata);
|
||||
|
||||
if (empty($group)) {
|
||||
$this->clientError('Not Found', 404, $apidata['content-type']);
|
||||
return false;
|
||||
}
|
||||
|
||||
if(! $this->auth_user->isMember($group)){
|
||||
$this->clientError(_('You are not a member of that group'), $code = 403);
|
||||
return false;
|
||||
}
|
||||
|
||||
$member = new Group_member();
|
||||
|
||||
$member->group_id = $group->id;
|
||||
$member->profile_id = $this->auth_user->id;
|
||||
|
||||
if (!$member->find(true)) {
|
||||
$this->serverError(_('Could not find membership record.'));
|
||||
return;
|
||||
}
|
||||
|
||||
$result = $member->delete();
|
||||
|
||||
if (!$result) {
|
||||
common_log_db_error($member, 'INSERT', __FILE__);
|
||||
$this->serverError(sprintf(_('Could not remove user %s to group %s'),
|
||||
$this->auth_user->nickname, $group->nickname));
|
||||
}
|
||||
|
||||
switch($apidata['content-type']) {
|
||||
case 'xml':
|
||||
$this->show_single_xml_group($group);
|
||||
break;
|
||||
case 'json':
|
||||
$this->show_single_json_group($group);
|
||||
break;
|
||||
default:
|
||||
$this->clientError(_('API method not found!'), $code = 404);
|
||||
}
|
||||
}
|
||||
|
||||
function is_member($args, $apidata)
|
||||
{
|
||||
parent::handle($args);
|
||||
|
|
@ -326,4 +425,29 @@ require_once INSTALLDIR.'/lib/twitterapi.php';
|
|||
$this->clientError(_('API method not found!'), $code = 404);
|
||||
}
|
||||
}
|
||||
|
||||
function create($args, $apidata)
|
||||
{
|
||||
die("todo");
|
||||
}
|
||||
|
||||
function update($args, $apidata)
|
||||
{
|
||||
die("todo");
|
||||
}
|
||||
|
||||
function update_group_logo($args, $apidata)
|
||||
{
|
||||
die("todo");
|
||||
}
|
||||
|
||||
function destroy($args, $apidata)
|
||||
{
|
||||
die("todo");
|
||||
}
|
||||
|
||||
function tag($args, $apidata)
|
||||
{
|
||||
die("todo");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -297,11 +297,6 @@ class TwitapistatusesAction extends TwitterapiAction
|
|||
html_entity_decode($status, ENT_NOQUOTES, 'UTF-8'),
|
||||
$source, 1, $reply_to);
|
||||
|
||||
if (is_string($notice)) {
|
||||
$this->serverError($notice);
|
||||
return;
|
||||
}
|
||||
|
||||
common_broadcast_notice($notice);
|
||||
$apidata['api_arg'] = $notice->id;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ require_once(INSTALLDIR.'/lib/rssaction.php');
|
|||
|
||||
class UserrssAction extends Rss10Action
|
||||
{
|
||||
var $user = null;
|
||||
var $tag = null;
|
||||
|
||||
function prepare($args)
|
||||
|
|
@ -39,6 +38,7 @@ class UserrssAction extends Rss10Action
|
|||
$this->clientError(_('No such user.'));
|
||||
return false;
|
||||
} else {
|
||||
$this->notices = $this->getNotices($this->limit);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
|
@ -64,7 +64,6 @@ class UserrssAction extends Rss10Action
|
|||
|
||||
function getNotices($limit=0)
|
||||
{
|
||||
|
||||
$user = $this->user;
|
||||
|
||||
if (is_null($user)) {
|
||||
|
|
|
|||
|
|
@ -94,7 +94,13 @@ class File extends Memcached_DataObject
|
|||
$file_redir = File_redirection::staticGet('url', $given_url);
|
||||
if (empty($file_redir)) {
|
||||
$redir_data = File_redirection::where($given_url);
|
||||
if (is_array($redir_data)) {
|
||||
$redir_url = $redir_data['url'];
|
||||
} elseif (is_string($redir_data)) {
|
||||
$redir_url = $redir_data;
|
||||
} else {
|
||||
throw new ServerException("Can't process url '$given_url'");
|
||||
}
|
||||
// TODO: max field length
|
||||
if ($redir_url === $given_url || strlen($redir_url) > 255) {
|
||||
$x = File::saveNew($redir_data, $given_url);
|
||||
|
|
|
|||
|
|
@ -79,6 +79,9 @@ class File_redirection extends Memcached_DataObject
|
|||
}
|
||||
}
|
||||
|
||||
if(strpos($short_url,'://') === false){
|
||||
return $short_url;
|
||||
}
|
||||
$curlh = File_redirection::_commonCurl($short_url, $redirs);
|
||||
// Don't include body in output
|
||||
curl_setopt($curlh, CURLOPT_NOBODY, true);
|
||||
|
|
|
|||
|
|
@ -153,30 +153,30 @@ class Notice extends Memcached_DataObject
|
|||
$final = common_shorten_links($content);
|
||||
|
||||
if (Notice::contentTooLong($final)) {
|
||||
common_log(LOG_INFO, 'Rejecting notice that is too long.');
|
||||
return _('Problem saving notice. Too long.');
|
||||
throw new ClientException(_('Problem saving notice. Too long.'));
|
||||
}
|
||||
|
||||
if (!$profile) {
|
||||
common_log(LOG_ERR, 'Problem saving notice. Unknown user.');
|
||||
return _('Problem saving notice. Unknown user.');
|
||||
throw new ClientException(_('Problem saving notice. Unknown user.'));
|
||||
}
|
||||
|
||||
if (common_config('throttle', 'enabled') && !Notice::checkEditThrottle($profile_id)) {
|
||||
common_log(LOG_WARNING, 'Excessive posting by profile #' . $profile_id . '; throttled.');
|
||||
return _('Too many notices too fast; take a breather and post again in a few minutes.');
|
||||
throw new ClientException(_('Too many notices too fast; take a breather '.
|
||||
'and post again in a few minutes.'));
|
||||
}
|
||||
|
||||
if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
|
||||
common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
|
||||
return _('Too many duplicate messages too quickly; take a breather and post again in a few minutes.');
|
||||
throw new ClientException(_('Too many duplicate messages too quickly;'.
|
||||
' take a breather and post again in a few minutes.'));
|
||||
}
|
||||
|
||||
$banned = common_config('profile', 'banned');
|
||||
|
||||
if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
|
||||
common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
|
||||
return _('You are banned from posting notices on this site.');
|
||||
throw new ClientException(_('You are banned from posting notices on this site.'));
|
||||
}
|
||||
|
||||
$notice = new Notice();
|
||||
|
|
@ -222,7 +222,7 @@ class Notice extends Memcached_DataObject
|
|||
|
||||
if (!$id) {
|
||||
common_log_db_error($notice, 'INSERT', __FILE__);
|
||||
return _('Problem saving notice.');
|
||||
throw new ServerException(_('Problem saving notice.'));
|
||||
}
|
||||
|
||||
// Update ID-dependent columns: URI, conversation
|
||||
|
|
@ -247,7 +247,7 @@ class Notice extends Memcached_DataObject
|
|||
if ($changed) {
|
||||
if (!$notice->update($orig)) {
|
||||
common_log_db_error($notice, 'UPDATE', __FILE__);
|
||||
return _('Problem saving notice.');
|
||||
throw new ServerException(_('Problem saving notice.'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -909,7 +909,8 @@ class Notice extends Memcached_DataObject
|
|||
$qry .= '('.$id.', '.$this->id.', '.$source.", '".$this->created. "') ";
|
||||
$cnt++;
|
||||
if (rand() % NOTICE_INBOX_SOFT_LIMIT == 0) {
|
||||
Notice_inbox::gc($id);
|
||||
// FIXME: Causes lag in replicated servers
|
||||
// Notice_inbox::gc($id);
|
||||
}
|
||||
if ($cnt >= MAX_BOXCARS) {
|
||||
$inbox = new Notice_inbox();
|
||||
|
|
|
|||
|
|
@ -117,11 +117,15 @@ class User extends Memcached_DataObject
|
|||
function allowed_nickname($nickname)
|
||||
{
|
||||
// XXX: should already be validated for size, content, etc.
|
||||
static $blacklist = array('rss', 'xrds', 'doc', 'main',
|
||||
'settings', 'notice', 'user',
|
||||
'search', 'avatar', 'tag', 'tags',
|
||||
'api', 'message', 'group', 'groups',
|
||||
'local');
|
||||
|
||||
$blacklist = array();
|
||||
|
||||
//all directory and file names should be blacklisted
|
||||
$d = dir(INSTALLDIR);
|
||||
while (false !== ($entry = $d->read())) {
|
||||
$blacklist[]=$entry;
|
||||
}
|
||||
$d->close();
|
||||
$merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
|
||||
return !in_array($nickname, $merged);
|
||||
}
|
||||
|
|
@ -707,4 +711,33 @@ class User extends Memcached_DataObject
|
|||
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Does this user have the right to do X?
|
||||
*
|
||||
* With our role-based authorization, this is merely a lookup for whether the user
|
||||
* has a particular role. The implementation currently uses a switch statement
|
||||
* to determine if the user has the pre-defined role to exercise the right. Future
|
||||
* implementations may allow per-site roles, and different mappings of roles to rights.
|
||||
*
|
||||
* @param $right string Name of the right, usually a constant in class Right
|
||||
* @return boolean whether the user has the right in question
|
||||
*/
|
||||
|
||||
function hasRight($right)
|
||||
{
|
||||
$result = false;
|
||||
if (Event::handle('UserRightsCheck', array($this, $right, &$result))) {
|
||||
switch ($right)
|
||||
{
|
||||
case Right::deleteOthersNotice:
|
||||
$result = $this->hasRole('moderator');
|
||||
break;
|
||||
default:
|
||||
$result = false;
|
||||
break;
|
||||
}
|
||||
}
|
||||
return $result;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,4 +61,5 @@ VALUES
|
|||
(100113, 'T-Mobile Germany', '%s@t-mobile-sms.de', now()),
|
||||
(100114, 'Vodafone Germany', '%s@vodafone-sms.de', now()),
|
||||
(100115, 'E-Plus', '%s@smsmail.eplus.de', now()),
|
||||
(100116, 'Cellular South', '%s@csouth1.com', now());
|
||||
(100116, 'Cellular South', '%s@csouth1.com', now()),
|
||||
(100117, 'ChinaMobile (139)', '%s@139.com', now());
|
||||
|
|
|
|||
|
|
@ -2,6 +2,4 @@ A bookmarklet is a small piece of javascript code used as a bookmark. This one w
|
|||
|
||||
Drag-and-drop the following link to your bookmarks bar or right-click it and add it to your browser favorites to keep it handy.
|
||||
|
||||
<MTMarkdownOptions output='raw'>
|
||||
<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
|
||||
</MTMarkdownOptions>
|
||||
<a href="javascript:var%20d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,s=(e?e():(k)?k():(x?x.createRange().text:0)),f='http://%%site.server%%/%%site.path%%/index.php?action=newnotice',l=d.location,e=encodeURIComponent,g=f+'&status_textarea=%22'+((e(s))?e(s):e(document.title))+'%22 from '+l.href;function%20a(){if(!w.open(g,'t','toolbar=0,resizable=0,scrollbars=1,status=1,width=800,height=570')){l.href=g;}}a();void(0);">Post to %%site.name%%</a>
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ currently-implemented commands:
|
|||
* **help**: Show this help. List available Jabber/XMPP commands
|
||||
* **follow <nickname>**: Subscribe to <nickname>
|
||||
* **sub <nickname>**: Same as follow
|
||||
* **leave <nickname>**: Subscribe to <nickname>
|
||||
* **leave <nickname>**: Unsubscribe from <nickname>
|
||||
* **unsub <nickname>**: Same as leave
|
||||
* **d <nickname> <text>**: Send direct message to <nickname> with message body <text>
|
||||
* **get <nickname>**: Get last notice from <nickname>
|
||||
|
|
|
|||
|
|
@ -376,7 +376,7 @@ function Auth_OpenID_detectMathLibrary($exts)
|
|||
// Try to load dynamic modules.
|
||||
if (!$loaded) {
|
||||
foreach ($extension['modules'] as $module) {
|
||||
if (@dl($module . "." . PHP_SHLIB_SUFFIX)) {
|
||||
if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($module . "." . PHP_SHLIB_SUFFIX)) {
|
||||
$loaded = true;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -349,7 +349,7 @@ function &Auth_Yadis_getXMLParser()
|
|||
foreach ($extensions as $name => $params) {
|
||||
if (!extension_loaded($name)) {
|
||||
foreach ($params['libname'] as $libname) {
|
||||
if (@dl($libname)) {
|
||||
if (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode') && @dl($libname)) {
|
||||
$classname = $params['classname'];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ class OAuthRequest {/*{{{*/
|
|||
public function get_normalized_http_url() {/*{{{*/
|
||||
$parts = parse_url($this->http_url);
|
||||
|
||||
$port = @$parts['port'];
|
||||
$port = isset($parts['port']) ? $parts['port'] : null;
|
||||
$scheme = $parts['scheme'];
|
||||
$host = $parts['host'];
|
||||
$path = @$parts['path'];
|
||||
|
|
|
|||
|
|
@ -746,7 +746,7 @@ class PEAR
|
|||
{
|
||||
if (!extension_loaded($ext)) {
|
||||
// if either returns true dl() will produce a FATAL error, stop that
|
||||
if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1)) {
|
||||
if ((ini_get('enable_dl') != 1) || (ini_get('safe_mode') == 1) || !function_exists('dl')) {
|
||||
return false;
|
||||
}
|
||||
if (OS_WINDOWS) {
|
||||
|
|
|
|||
|
|
@ -49,7 +49,13 @@ function getPath($req)
|
|||
) {
|
||||
return $req['p'];
|
||||
} else if (array_key_exists('PATH_INFO', $_SERVER)) {
|
||||
return $_SERVER['PATH_INFO'];
|
||||
$path = $_SERVER['PATH_INFO'];
|
||||
$script = $_SERVER['SCRIPT_NAME'];
|
||||
if (substr($path, 0, mb_strlen($script)) == $script) {
|
||||
return substr($path, mb_strlen($script));
|
||||
} else {
|
||||
return $path;
|
||||
}
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
|
|
|
|||
28
install.php
28
install.php
|
|
@ -244,7 +244,7 @@ function main()
|
|||
*/
|
||||
function haveExternalLibrary($external_library)
|
||||
{
|
||||
if (isset($external_library['include']) && ! @include_once $external_library['include'] ) {
|
||||
if (isset($external_library['include']) && !haveIncludeFile($external_library['include'])) {
|
||||
return false;
|
||||
}
|
||||
if (isset($external_library['check_function']) && ! function_exists($external_library['check_function'])) {
|
||||
|
|
@ -256,6 +256,15 @@ function haveExternalLibrary($external_library)
|
|||
return true;
|
||||
}
|
||||
|
||||
// Attempt to include a PHP file and report if it worked, while
|
||||
// suppressing the annoying warning messages on failure.
|
||||
function haveIncludeFile($filename) {
|
||||
$old = error_reporting(error_reporting() & ~E_WARNING);
|
||||
$ok = include_once($filename);
|
||||
error_reporting($old);
|
||||
return $ok;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if all is ready for installation
|
||||
*
|
||||
|
|
@ -328,12 +337,19 @@ function checkPrereqs()
|
|||
*/
|
||||
function checkExtension($name)
|
||||
{
|
||||
if (!extension_loaded($name)) {
|
||||
if (!@dl($name.'.so')) {
|
||||
if (extension_loaded($name)) {
|
||||
return true;
|
||||
} elseif (function_exists('dl') && ini_get('enable_dl') && !ini_get('safe_mode')) {
|
||||
// dl will throw a fatal error if it's disabled or we're in safe mode.
|
||||
// More fun, it may not even exist under some SAPIs in 5.3.0 or later...
|
||||
$soname = $name . '.' . PHP_SHLIB_SUFFIX;
|
||||
if (PHP_SHLIB_SUFFIX == 'dll') {
|
||||
$soname = "php_" . $soname;
|
||||
}
|
||||
return @dl($soname);
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -390,7 +406,7 @@ E_O_T;
|
|||
E_O_T;
|
||||
foreach ($present_libraries as $library) {
|
||||
echo '<li>';
|
||||
if ($library['url']) {
|
||||
if (isset($library['url'])) {
|
||||
echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
|
||||
} else {
|
||||
echo htmlentities($library['name']);
|
||||
|
|
|
|||
|
|
@ -120,7 +120,6 @@ class Action extends HTMLOutputter // lawsuit
|
|||
{
|
||||
// XXX: attributes (profile?)
|
||||
$this->elementStart('head');
|
||||
if (Event::handle('StartHeadChildren', array($this))) {
|
||||
$this->showTitle();
|
||||
$this->showShortcutIcon();
|
||||
$this->showStylesheets();
|
||||
|
|
@ -129,8 +128,6 @@ class Action extends HTMLOutputter // lawsuit
|
|||
$this->showFeeds();
|
||||
$this->showDescription();
|
||||
$this->extraHead();
|
||||
Event::handle('EndHeadChildren', array($this));
|
||||
}
|
||||
$this->elementEnd('head');
|
||||
}
|
||||
|
||||
|
|
@ -528,7 +525,10 @@ class Action extends HTMLOutputter // lawsuit
|
|||
$this->showContentBlock();
|
||||
Event::handle('EndShowContentBlock', array($this));
|
||||
}
|
||||
if (Event::handle('StartShowAside', array($this))) {
|
||||
$this->showAside();
|
||||
Event::handle('EndShowAside', array($this));
|
||||
}
|
||||
$this->elementEnd('div');
|
||||
}
|
||||
|
||||
|
|
@ -879,6 +879,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||
*/
|
||||
function handle($argarray=null)
|
||||
{
|
||||
header('Vary: Accept-Encoding,Cookie');
|
||||
$lm = $this->lastModified();
|
||||
$etag = $this->etag();
|
||||
if ($etag) {
|
||||
|
|
|
|||
|
|
@ -46,11 +46,7 @@ require_once INSTALLDIR.'/lib/error.php';
|
|||
*/
|
||||
class ClientErrorAction extends ErrorAction
|
||||
{
|
||||
function __construct($message='Error', $code=400)
|
||||
{
|
||||
parent::__construct($message, $code);
|
||||
|
||||
$this->status = array(400 => 'Bad Request',
|
||||
static $status = array(400 => 'Bad Request',
|
||||
401 => 'Unauthorized',
|
||||
402 => 'Payment Required',
|
||||
403 => 'Forbidden',
|
||||
|
|
@ -68,6 +64,10 @@ class ClientErrorAction extends ErrorAction
|
|||
415 => 'Unsupported Media Type',
|
||||
416 => 'Requested Range Not Satisfiable',
|
||||
417 => 'Expectation Failed');
|
||||
|
||||
function __construct($message='Error', $code=400)
|
||||
{
|
||||
parent::__construct($message, $code);
|
||||
$this->default = 400;
|
||||
}
|
||||
|
||||
|
|
@ -91,9 +91,4 @@ class ClientErrorAction extends ErrorAction
|
|||
|
||||
$this->showPage();
|
||||
}
|
||||
|
||||
function title()
|
||||
{
|
||||
return $this->status[$this->code];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
212
lib/common.php
212
lib/common.php
|
|
@ -53,6 +53,7 @@ require_once('DB/DataObject/Cast.php'); # for dates
|
|||
if (!function_exists('gettext')) {
|
||||
require_once("php-gettext/gettext.inc");
|
||||
}
|
||||
|
||||
require_once(INSTALLDIR.'/lib/language.php');
|
||||
|
||||
// This gets included before the config file, so that admin code and plugins
|
||||
|
|
@ -93,214 +94,17 @@ if (isset($path)) {
|
|||
null;
|
||||
}
|
||||
|
||||
// default configuration, overwritten in config.php
|
||||
require_once(INSTALLDIR.'/lib/default.php');
|
||||
|
||||
$config =
|
||||
array('site' =>
|
||||
array('name' => 'Just another StatusNet microblog',
|
||||
'server' => $_server,
|
||||
'theme' => 'default',
|
||||
'path' => $_path,
|
||||
'logfile' => null,
|
||||
'logo' => null,
|
||||
'logdebug' => false,
|
||||
'fancy' => false,
|
||||
'locale_path' => INSTALLDIR.'/locale',
|
||||
'language' => 'en_US',
|
||||
'languages' => get_all_languages(),
|
||||
'email' =>
|
||||
array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
|
||||
'broughtby' => null,
|
||||
'timezone' => 'UTC',
|
||||
'broughtbyurl' => null,
|
||||
'closed' => false,
|
||||
'inviteonly' => false,
|
||||
'private' => false,
|
||||
'ssl' => 'never',
|
||||
'sslserver' => null,
|
||||
'shorturllength' => 30,
|
||||
'dupelimit' => 60, # default for same person saying the same thing
|
||||
'textlimit' => 140,
|
||||
),
|
||||
'syslog' =>
|
||||
array('appname' => 'statusnet', # for syslog
|
||||
'priority' => 'debug', # XXX: currently ignored
|
||||
'facility' => LOG_USER),
|
||||
'queue' =>
|
||||
array('enabled' => false,
|
||||
'subsystem' => 'db', # default to database, or 'stomp'
|
||||
'stomp_server' => null,
|
||||
'queue_basename' => 'statusnet',
|
||||
'stomp_username' => null,
|
||||
'stomp_password' => null,
|
||||
),
|
||||
'license' =>
|
||||
array('url' => 'http://creativecommons.org/licenses/by/3.0/',
|
||||
'title' => 'Creative Commons Attribution 3.0',
|
||||
'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
|
||||
'mail' =>
|
||||
array('backend' => 'mail',
|
||||
'params' => null),
|
||||
'nickname' =>
|
||||
array('blacklist' => array(),
|
||||
'featured' => array()),
|
||||
'profile' =>
|
||||
array('banned' => array(),
|
||||
'biolimit' => null),
|
||||
'avatar' =>
|
||||
array('server' => null,
|
||||
'dir' => INSTALLDIR . '/avatar/',
|
||||
'path' => $_path . '/avatar/'),
|
||||
'background' =>
|
||||
array('server' => null,
|
||||
'dir' => INSTALLDIR . '/background/',
|
||||
'path' => $_path . '/background/'),
|
||||
'public' =>
|
||||
array('localonly' => true,
|
||||
'blacklist' => array(),
|
||||
'autosource' => array()),
|
||||
'theme' =>
|
||||
array('server' => null,
|
||||
'dir' => null,
|
||||
'path'=> null),
|
||||
'throttle' =>
|
||||
array('enabled' => false, // whether to throttle edits; false by default
|
||||
'count' => 20, // number of allowed messages in timespan
|
||||
'timespan' => 600), // timespan for throttling
|
||||
'xmpp' =>
|
||||
array('enabled' => false,
|
||||
'server' => 'INVALID SERVER',
|
||||
'port' => 5222,
|
||||
'user' => 'update',
|
||||
'encryption' => true,
|
||||
'resource' => 'uniquename',
|
||||
'password' => 'blahblahblah',
|
||||
'host' => null, # only set if != server
|
||||
'debug' => false, # print extra debug info
|
||||
'public' => array()), # JIDs of users who want to receive the public stream
|
||||
'invite' =>
|
||||
array('enabled' => true),
|
||||
'sphinx' =>
|
||||
array('enabled' => false,
|
||||
'server' => 'localhost',
|
||||
'port' => 3312),
|
||||
'tag' =>
|
||||
array('dropoff' => 864000.0),
|
||||
'popular' =>
|
||||
array('dropoff' => 864000.0),
|
||||
'daemon' =>
|
||||
array('piddir' => '/var/run',
|
||||
'user' => false,
|
||||
'group' => false),
|
||||
'emailpost' =>
|
||||
array('enabled' => true),
|
||||
'sms' =>
|
||||
array('enabled' => true),
|
||||
'twitter' =>
|
||||
array('enabled' => true),
|
||||
'twitterbridge' =>
|
||||
array('enabled' => false),
|
||||
'integration' =>
|
||||
array('source' => 'StatusNet', # source attribute for Twitter
|
||||
'taguri' => $_server.',2009'), # base for tag URIs
|
||||
'twitter' =>
|
||||
array('consumer_key' => null,
|
||||
'consumer_secret' => null),
|
||||
'memcached' =>
|
||||
array('enabled' => false,
|
||||
'server' => 'localhost',
|
||||
'base' => null,
|
||||
'port' => 11211),
|
||||
'ping' =>
|
||||
array('notify' => array()),
|
||||
'inboxes' =>
|
||||
array('enabled' => true), # on by default for new sites
|
||||
'newuser' =>
|
||||
array('default' => null,
|
||||
'welcome' => null),
|
||||
'snapshot' =>
|
||||
array('run' => 'web',
|
||||
'frequency' => 10000,
|
||||
'reporturl' => 'http://status.net/stats/report'),
|
||||
'attachments' =>
|
||||
array('server' => null,
|
||||
'dir' => INSTALLDIR . '/file/',
|
||||
'path' => $_path . '/file/',
|
||||
'supported' => array('image/png',
|
||||
'image/jpeg',
|
||||
'image/gif',
|
||||
'image/svg+xml',
|
||||
'audio/mpeg',
|
||||
'audio/x-speex',
|
||||
'application/ogg',
|
||||
'application/pdf',
|
||||
'application/vnd.oasis.opendocument.text',
|
||||
'application/vnd.oasis.opendocument.text-template',
|
||||
'application/vnd.oasis.opendocument.graphics',
|
||||
'application/vnd.oasis.opendocument.graphics-template',
|
||||
'application/vnd.oasis.opendocument.presentation',
|
||||
'application/vnd.oasis.opendocument.presentation-template',
|
||||
'application/vnd.oasis.opendocument.spreadsheet',
|
||||
'application/vnd.oasis.opendocument.spreadsheet-template',
|
||||
'application/vnd.oasis.opendocument.chart',
|
||||
'application/vnd.oasis.opendocument.chart-template',
|
||||
'application/vnd.oasis.opendocument.image',
|
||||
'application/vnd.oasis.opendocument.image-template',
|
||||
'application/vnd.oasis.opendocument.formula',
|
||||
'application/vnd.oasis.opendocument.formula-template',
|
||||
'application/vnd.oasis.opendocument.text-master',
|
||||
'application/vnd.oasis.opendocument.text-web',
|
||||
'application/x-zip',
|
||||
'application/zip',
|
||||
'text/plain',
|
||||
'video/mpeg',
|
||||
'video/mp4',
|
||||
'video/quicktime',
|
||||
'video/mpeg'),
|
||||
'file_quota' => 5000000,
|
||||
'user_quota' => 50000000,
|
||||
'monthly_quota' => 15000000,
|
||||
'uploads' => true,
|
||||
'filecommand' => '/usr/bin/file',
|
||||
),
|
||||
'group' =>
|
||||
array('maxaliases' => 3,
|
||||
'desclimit' => null),
|
||||
'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
|
||||
'search' =>
|
||||
array('type' => 'fulltext'),
|
||||
'sessions' =>
|
||||
array('handle' => false, // whether to handle sessions ourselves
|
||||
'debug' => false), // debugging output for sessions
|
||||
'design' =>
|
||||
array('backgroundcolor' => null, // null -> 'use theme default'
|
||||
'contentcolor' => null,
|
||||
'sidebarcolor' => null,
|
||||
'textcolor' => null,
|
||||
'linkcolor' => null,
|
||||
'backgroundimage' => null,
|
||||
'disposition' => null),
|
||||
'notice' =>
|
||||
array('contentlimit' => null),
|
||||
'message' =>
|
||||
array('contentlimit' => null),
|
||||
'http' =>
|
||||
array('client' => 'curl'), // XXX: should this be the default?
|
||||
);
|
||||
// Set config values initially to default values
|
||||
|
||||
$config = $default;
|
||||
|
||||
// default configuration, overwritten in config.php
|
||||
|
||||
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
|
||||
|
||||
$config['db'] =
|
||||
array('database' => 'YOU HAVE TO SET THIS IN config.php',
|
||||
'schema_location' => INSTALLDIR . '/classes',
|
||||
'class_location' => INSTALLDIR . '/classes',
|
||||
'require_prefix' => 'classes/',
|
||||
'class_prefix' => '',
|
||||
'mirror' => null,
|
||||
'utf8' => true,
|
||||
'db_driver' => 'DB', # XXX: JanRain libs only work with DB
|
||||
'quote_identifiers' => false,
|
||||
'type' => 'mysql' );
|
||||
$config['db'] = $default['db'];
|
||||
|
||||
// Backward compatibility
|
||||
|
||||
|
|
|
|||
232
lib/default.php
Normal file
232
lib/default.php
Normal file
|
|
@ -0,0 +1,232 @@
|
|||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* Default settings for core configuration
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: 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/>.
|
||||
*
|
||||
* @category Config
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @copyright 2008-9 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
$default =
|
||||
array('site' =>
|
||||
array('name' => 'Just another StatusNet microblog',
|
||||
'server' => $_server,
|
||||
'theme' => 'default',
|
||||
'path' => $_path,
|
||||
'logfile' => null,
|
||||
'logo' => null,
|
||||
'logdebug' => false,
|
||||
'fancy' => false,
|
||||
'locale_path' => INSTALLDIR.'/locale',
|
||||
'language' => 'en_US',
|
||||
'languages' => get_all_languages(),
|
||||
'email' =>
|
||||
array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
|
||||
'broughtby' => null,
|
||||
'timezone' => 'UTC',
|
||||
'broughtbyurl' => null,
|
||||
'closed' => false,
|
||||
'inviteonly' => false,
|
||||
'private' => false,
|
||||
'ssl' => 'never',
|
||||
'sslserver' => null,
|
||||
'shorturllength' => 30,
|
||||
'dupelimit' => 60, # default for same person saying the same thing
|
||||
'textlimit' => 140,
|
||||
),
|
||||
'db' =>
|
||||
array('database' => 'YOU HAVE TO SET THIS IN config.php',
|
||||
'schema_location' => INSTALLDIR . '/classes',
|
||||
'class_location' => INSTALLDIR . '/classes',
|
||||
'require_prefix' => 'classes/',
|
||||
'class_prefix' => '',
|
||||
'mirror' => null,
|
||||
'utf8' => true,
|
||||
'db_driver' => 'DB', # XXX: JanRain libs only work with DB
|
||||
'quote_identifiers' => false,
|
||||
'type' => 'mysql' ),
|
||||
'syslog' =>
|
||||
array('appname' => 'statusnet', # for syslog
|
||||
'priority' => 'debug', # XXX: currently ignored
|
||||
'facility' => LOG_USER),
|
||||
'queue' =>
|
||||
array('enabled' => false,
|
||||
'subsystem' => 'db', # default to database, or 'stomp'
|
||||
'stomp_server' => null,
|
||||
'queue_basename' => 'statusnet',
|
||||
'stomp_username' => null,
|
||||
'stomp_password' => null,
|
||||
),
|
||||
'license' =>
|
||||
array('url' => 'http://creativecommons.org/licenses/by/3.0/',
|
||||
'title' => 'Creative Commons Attribution 3.0',
|
||||
'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'),
|
||||
'mail' =>
|
||||
array('backend' => 'mail',
|
||||
'params' => null),
|
||||
'nickname' =>
|
||||
array('blacklist' => array(),
|
||||
'featured' => array()),
|
||||
'profile' =>
|
||||
array('banned' => array(),
|
||||
'biolimit' => null),
|
||||
'avatar' =>
|
||||
array('server' => null,
|
||||
'dir' => INSTALLDIR . '/avatar/',
|
||||
'path' => $_path . '/avatar/'),
|
||||
'background' =>
|
||||
array('server' => null,
|
||||
'dir' => INSTALLDIR . '/background/',
|
||||
'path' => $_path . '/background/'),
|
||||
'public' =>
|
||||
array('localonly' => true,
|
||||
'blacklist' => array(),
|
||||
'autosource' => array()),
|
||||
'theme' =>
|
||||
array('server' => null,
|
||||
'dir' => null,
|
||||
'path'=> null),
|
||||
'throttle' =>
|
||||
array('enabled' => false, // whether to throttle edits; false by default
|
||||
'count' => 20, // number of allowed messages in timespan
|
||||
'timespan' => 600), // timespan for throttling
|
||||
'xmpp' =>
|
||||
array('enabled' => false,
|
||||
'server' => 'INVALID SERVER',
|
||||
'port' => 5222,
|
||||
'user' => 'update',
|
||||
'encryption' => true,
|
||||
'resource' => 'uniquename',
|
||||
'password' => 'blahblahblah',
|
||||
'host' => null, # only set if != server
|
||||
'debug' => false, # print extra debug info
|
||||
'public' => array()), # JIDs of users who want to receive the public stream
|
||||
'invite' =>
|
||||
array('enabled' => true),
|
||||
'sphinx' =>
|
||||
array('enabled' => false,
|
||||
'server' => 'localhost',
|
||||
'port' => 3312),
|
||||
'tag' =>
|
||||
array('dropoff' => 864000.0),
|
||||
'popular' =>
|
||||
array('dropoff' => 864000.0),
|
||||
'daemon' =>
|
||||
array('piddir' => '/var/run',
|
||||
'user' => false,
|
||||
'group' => false),
|
||||
'emailpost' =>
|
||||
array('enabled' => true),
|
||||
'sms' =>
|
||||
array('enabled' => true),
|
||||
'twitter' =>
|
||||
array('enabled' => true),
|
||||
'twitterbridge' =>
|
||||
array('enabled' => false),
|
||||
'integration' =>
|
||||
array('source' => 'StatusNet', # source attribute for Twitter
|
||||
'taguri' => $_server.',2009'), # base for tag URIs
|
||||
'twitter' =>
|
||||
array('consumer_key' => null,
|
||||
'consumer_secret' => null),
|
||||
'memcached' =>
|
||||
array('enabled' => false,
|
||||
'server' => 'localhost',
|
||||
'base' => null,
|
||||
'port' => 11211),
|
||||
'ping' =>
|
||||
array('notify' => array()),
|
||||
'inboxes' =>
|
||||
array('enabled' => true), # on by default for new sites
|
||||
'newuser' =>
|
||||
array('default' => null,
|
||||
'welcome' => null),
|
||||
'snapshot' =>
|
||||
array('run' => 'web',
|
||||
'frequency' => 10000,
|
||||
'reporturl' => 'http://status.net/stats/report'),
|
||||
'attachments' =>
|
||||
array('server' => null,
|
||||
'dir' => INSTALLDIR . '/file/',
|
||||
'path' => $_path . '/file/',
|
||||
'supported' => array('image/png',
|
||||
'image/jpeg',
|
||||
'image/gif',
|
||||
'image/svg+xml',
|
||||
'audio/mpeg',
|
||||
'audio/x-speex',
|
||||
'application/ogg',
|
||||
'application/pdf',
|
||||
'application/vnd.oasis.opendocument.text',
|
||||
'application/vnd.oasis.opendocument.text-template',
|
||||
'application/vnd.oasis.opendocument.graphics',
|
||||
'application/vnd.oasis.opendocument.graphics-template',
|
||||
'application/vnd.oasis.opendocument.presentation',
|
||||
'application/vnd.oasis.opendocument.presentation-template',
|
||||
'application/vnd.oasis.opendocument.spreadsheet',
|
||||
'application/vnd.oasis.opendocument.spreadsheet-template',
|
||||
'application/vnd.oasis.opendocument.chart',
|
||||
'application/vnd.oasis.opendocument.chart-template',
|
||||
'application/vnd.oasis.opendocument.image',
|
||||
'application/vnd.oasis.opendocument.image-template',
|
||||
'application/vnd.oasis.opendocument.formula',
|
||||
'application/vnd.oasis.opendocument.formula-template',
|
||||
'application/vnd.oasis.opendocument.text-master',
|
||||
'application/vnd.oasis.opendocument.text-web',
|
||||
'application/x-zip',
|
||||
'application/zip',
|
||||
'text/plain',
|
||||
'video/mpeg',
|
||||
'video/mp4',
|
||||
'video/quicktime',
|
||||
'video/mpeg'),
|
||||
'file_quota' => 5000000,
|
||||
'user_quota' => 50000000,
|
||||
'monthly_quota' => 15000000,
|
||||
'uploads' => true,
|
||||
'filecommand' => '/usr/bin/file',
|
||||
),
|
||||
'group' =>
|
||||
array('maxaliases' => 3,
|
||||
'desclimit' => null),
|
||||
'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
|
||||
'search' =>
|
||||
array('type' => 'fulltext'),
|
||||
'sessions' =>
|
||||
array('handle' => false, // whether to handle sessions ourselves
|
||||
'debug' => false), // debugging output for sessions
|
||||
'design' =>
|
||||
array('backgroundcolor' => null, // null -> 'use theme default'
|
||||
'contentcolor' => null,
|
||||
'sidebarcolor' => null,
|
||||
'textcolor' => null,
|
||||
'linkcolor' => null,
|
||||
'backgroundimage' => null,
|
||||
'disposition' => null),
|
||||
'notice' =>
|
||||
array('contentlimit' => null),
|
||||
'message' =>
|
||||
array('contentlimit' => null),
|
||||
'http' =>
|
||||
array('client' => 'curl'), // XXX: should this be the default?
|
||||
);
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* Base class for deleting things
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: 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/>.
|
||||
*
|
||||
* @category Personal
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @author Sarven Capadisli <csarven@status.net>
|
||||
* @copyright 2008 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
class DeleteAction extends Action
|
||||
{
|
||||
var $user = null;
|
||||
var $notice = null;
|
||||
var $profile = null;
|
||||
var $user_profile = null;
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
||||
$this->user = common_current_user();
|
||||
$notice_id = $this->trimmed('notice');
|
||||
$this->notice = Notice::staticGet($notice_id);
|
||||
|
||||
if (!$this->notice) {
|
||||
common_user_error(_('No such notice.'));
|
||||
exit;
|
||||
}
|
||||
|
||||
$this->profile = $this->notice->getProfile();
|
||||
$this->user_profile = $this->user->getProfile();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
|
||||
if (!common_logged_in()) {
|
||||
common_user_error(_('Not logged in.'));
|
||||
exit;
|
||||
} else if ($this->notice->profile_id != $this->user_profile->id) {
|
||||
common_user_error(_('Can\'t delete this notice.'));
|
||||
exit;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -325,7 +325,6 @@ class DesignSettingsAction extends AccountSettingsAction
|
|||
parent::showScripts();
|
||||
|
||||
$this->script('js/farbtastic/farbtastic.js');
|
||||
$this->script('js/farbtastic/farbtastic.go.js');
|
||||
$this->script('js/userdesign.go.js');
|
||||
|
||||
$this->autofocus('design_background-image_file');
|
||||
|
|
|
|||
|
|
@ -44,9 +44,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||
*/
|
||||
class ErrorAction extends Action
|
||||
{
|
||||
static $status = array();
|
||||
|
||||
var $code = null;
|
||||
var $message = null;
|
||||
var $status = null;
|
||||
var $default = null;
|
||||
|
||||
function __construct($message, $code, $output='php://output', $indent=true)
|
||||
|
|
@ -88,9 +89,10 @@ class ErrorAction extends Action
|
|||
*
|
||||
* @return page title
|
||||
*/
|
||||
|
||||
function title()
|
||||
{
|
||||
return $this->message;
|
||||
return self::$status[$this->code];
|
||||
}
|
||||
|
||||
function isReadOnly($args)
|
||||
|
|
|
|||
|
|
@ -468,11 +468,11 @@ class FacebookAction extends Action
|
|||
|
||||
$replyto = $this->trimmed('inreplyto');
|
||||
|
||||
try {
|
||||
$notice = Notice::saveNew($user->id, $content,
|
||||
'web', 1, ($replyto == 'false') ? null : $replyto);
|
||||
|
||||
if (is_string($notice)) {
|
||||
$this->showPage($notice);
|
||||
} catch (Exception $e) {
|
||||
$this->showPage($e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -109,11 +109,13 @@ class HTMLOutputter extends XMLOutputter
|
|||
header('Content-Type: '.$type);
|
||||
|
||||
$this->extraHeaders();
|
||||
if( ! substr($type,0,strlen('text/html'))=='text/html' ){
|
||||
// Browsers don't like it when <?xml it output for non-xhtml documents
|
||||
if (preg_match("/.*\/.*xml/", $type)) {
|
||||
// Required for XML documents
|
||||
$this->xw->startDocument('1.0', 'UTF-8');
|
||||
}
|
||||
$this->xw->writeDTD('html');
|
||||
$this->xw->writeDTD('html',
|
||||
'-//W3C//DTD XHTML 1.0 Strict//EN',
|
||||
'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd');
|
||||
|
||||
$language = $this->getLanguage();
|
||||
|
||||
|
|
|
|||
16
lib/mail.php
16
lib/mail.php
|
|
@ -551,9 +551,9 @@ function mail_notify_fave($other, $user, $notice)
|
|||
|
||||
common_init_locale($other->language);
|
||||
|
||||
$subject = sprintf(_('%s added your notice as a favorite'), $bestname);
|
||||
$subject = sprintf(_('%s (@%s) added your notice as a favorite'), $bestname, $user->nickname);
|
||||
|
||||
$body = sprintf(_("%1\$s just added your notice from %2\$s".
|
||||
$body = sprintf(_("%1\$s (@%7\$s) just added your notice from %2\$s".
|
||||
" as one of their favorites.\n\n" .
|
||||
"The URL of your notice is:\n\n" .
|
||||
"%3\$s\n\n" .
|
||||
|
|
@ -570,7 +570,8 @@ function mail_notify_fave($other, $user, $notice)
|
|||
$notice->content,
|
||||
common_local_url('showfavorites',
|
||||
array('nickname' => $user->nickname)),
|
||||
common_config('site', 'name'));
|
||||
common_config('site', 'name'),
|
||||
$user->nickname);
|
||||
|
||||
common_init_locale();
|
||||
mail_to_user($other, $subject, $body);
|
||||
|
|
@ -607,9 +608,9 @@ function mail_notify_attn($user, $notice)
|
|||
$conversationUrl = null;
|
||||
}
|
||||
|
||||
$subject = sprintf(_('%s sent a notice to your attention'), $bestname);
|
||||
$subject = sprintf(_('%s (@%s) sent a notice to your attention'), $bestname, $sender->nickname);
|
||||
|
||||
$body = sprintf(_("%1\$s just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
|
||||
$body = sprintf(_("%1\$s (@%9\$s) just sent a notice to your attention (an '@-reply') on %2\$s.\n\n".
|
||||
"The notice is here:\n\n".
|
||||
"\t%3\$s\n\n" .
|
||||
"It reads:\n\n".
|
||||
|
|
@ -629,10 +630,11 @@ function mail_notify_attn($user, $notice)
|
|||
$notice->content,//%4
|
||||
$conversationUrl,//%5
|
||||
common_local_url('newnotice',
|
||||
array('replyto' => $sender->nickname)),//%6
|
||||
array('replyto' => $sender->nickname, 'inreplyto' => $notice->id)),//%6
|
||||
common_local_url('replies',
|
||||
array('nickname' => $user->nickname)),//%7
|
||||
common_local_url('emailsettings'));//%8
|
||||
common_local_url('emailsettings'), //%8
|
||||
$sender->nickname); //%9
|
||||
|
||||
common_init_locale();
|
||||
mail_to_user($user, $subject, $body);
|
||||
|
|
|
|||
|
|
@ -69,6 +69,12 @@ class NoticeForm extends Form
|
|||
|
||||
var $user = null;
|
||||
|
||||
/**
|
||||
* The notice being replied to
|
||||
*/
|
||||
|
||||
var $inreplyto = null;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
|
|
@ -77,12 +83,13 @@ class NoticeForm extends Form
|
|||
* @param string $content content to pre-fill
|
||||
*/
|
||||
|
||||
function __construct($out=null, $action=null, $content=null, $user=null)
|
||||
function __construct($out=null, $action=null, $content=null, $user=null, $inreplyto=null)
|
||||
{
|
||||
parent::__construct($out);
|
||||
|
||||
$this->action = $action;
|
||||
$this->content = $content;
|
||||
$this->inreplyto = $inreplyto;
|
||||
|
||||
if ($user) {
|
||||
$this->user = $user;
|
||||
|
|
@ -168,7 +175,7 @@ class NoticeForm extends Form
|
|||
if ($this->action) {
|
||||
$this->out->hidden('notice_return-to', $this->action, 'returnto');
|
||||
}
|
||||
$this->out->hidden('notice_in-reply-to', $this->action, 'inreplyto');
|
||||
$this->out->hidden('notice_in-reply-to', $this->inreplyto, 'inreplyto');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -178,9 +178,12 @@ class NoticeListItem extends Widget
|
|||
function show()
|
||||
{
|
||||
$this->showStart();
|
||||
if (Event::handle('StartShowNoticeItem', array($this))) {
|
||||
$this->showNotice();
|
||||
$this->showNoticeInfo();
|
||||
$this->showNoticeOptions();
|
||||
Event::handle('EndShowNoticeItem', array($this));
|
||||
}
|
||||
$this->showEnd();
|
||||
}
|
||||
|
||||
|
|
@ -261,7 +264,7 @@ class NoticeListItem extends Widget
|
|||
$attrs = array('href' => $this->profile->profileurl,
|
||||
'class' => 'url');
|
||||
if (!empty($this->profile->fullname)) {
|
||||
$attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ') ';
|
||||
$attrs['title'] = $this->profile->fullname . ' (' . $this->profile->nickname . ')';
|
||||
}
|
||||
$this->out->elementStart('a', $attrs);
|
||||
$this->showAvatar();
|
||||
|
|
@ -418,9 +421,17 @@ class NoticeListItem extends Widget
|
|||
|
||||
function showContext()
|
||||
{
|
||||
// XXX: also show context if there are replies to this notice
|
||||
if (!empty($this->notice->conversation)
|
||||
&& $this->notice->conversation != $this->notice->id) {
|
||||
$hasConversation = false;
|
||||
if( !empty($this->notice->conversation)
|
||||
&& $this->notice->conversation != $this->notice->id){
|
||||
$hasConversation = true;
|
||||
}else{
|
||||
$conversation = Notice::conversationStream($this->notice->id, 1, 1);
|
||||
if($conversation->N > 0){
|
||||
$hasConversation = true;
|
||||
}
|
||||
}
|
||||
if ($hasConversation){
|
||||
$convurl = common_local_url('conversation',
|
||||
array('id' => $this->notice->conversation));
|
||||
$this->out->element('a', array('href' => $convurl.'#notice-'.$this->notice->id,
|
||||
|
|
@ -442,7 +453,7 @@ class NoticeListItem extends Widget
|
|||
{
|
||||
if (common_logged_in()) {
|
||||
$reply_url = common_local_url('newnotice',
|
||||
array('replyto' => $this->profile->nickname));
|
||||
array('replyto' => $this->profile->nickname, 'inreplyto' => $this->notice->id));
|
||||
$this->out->elementStart('a', array('href' => $reply_url,
|
||||
'class' => 'notice_reply',
|
||||
'title' => _('Reply to this notice')));
|
||||
|
|
@ -461,7 +472,10 @@ class NoticeListItem extends Widget
|
|||
function showDeleteLink()
|
||||
{
|
||||
$user = common_current_user();
|
||||
if ($user && $this->notice->profile_id == $user->id) {
|
||||
|
||||
if (!empty($user) &&
|
||||
($this->notice->profile_id == $user->id || $user->hasRight(Right::deleteOthersNotice))) {
|
||||
|
||||
$deleteurl = common_local_url('deletenotice',
|
||||
array('notice' => $this->notice->id));
|
||||
$this->out->element('a', array('href' => $deleteurl,
|
||||
|
|
|
|||
|
|
@ -156,7 +156,6 @@ class StatusNetOAuthDataStore extends OAuthDataStore
|
|||
return $this->new_access_token($consumer);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Revoke specified OAuth token
|
||||
*
|
||||
|
|
@ -363,9 +362,7 @@ class StatusNetOAuthDataStore extends OAuthDataStore
|
|||
false,
|
||||
null,
|
||||
$omb_notice->getIdentifierURI());
|
||||
if (is_string($notice)) {
|
||||
throw new Exception($notice);
|
||||
}
|
||||
|
||||
common_broadcast_notice($notice, true);
|
||||
}
|
||||
|
||||
|
|
|
|||
50
lib/right.php
Normal file
50
lib/right.php
Normal file
|
|
@ -0,0 +1,50 @@
|
|||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* Class for user rights
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: 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/>.
|
||||
*
|
||||
* @category Authorization
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @copyright 2009 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* class for rights
|
||||
*
|
||||
* Mostly for holding the rights constants
|
||||
*
|
||||
* @category Authorization
|
||||
* @package StatusNet
|
||||
* @author Evan Prodromou <evan@status.net>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
class Right
|
||||
{
|
||||
const deleteOthersNotice = 'deleteothersnotice';
|
||||
}
|
||||
|
||||
|
|
@ -172,6 +172,10 @@ class Router
|
|||
$m->connect('notice/new?replyto=:replyto',
|
||||
array('action' => 'newnotice'),
|
||||
array('replyto' => '[A-Za-z0-9_-]+'));
|
||||
$m->connect('notice/new?replyto=:replyto&inreplyto=:inreplyto',
|
||||
array('action' => 'newnotice'),
|
||||
array('replyto' => '[A-Za-z0-9_-]+'),
|
||||
array('inreplyto' => '[0-9]+'));
|
||||
|
||||
$m->connect('notice/:notice/file',
|
||||
array('action' => 'file'),
|
||||
|
|
@ -237,6 +241,10 @@ class Router
|
|||
array('nickname' => '[a-zA-Z0-9]+'));
|
||||
}
|
||||
|
||||
$m->connect('group/:nickname/foaf',
|
||||
array('action' => 'foafgroup'),
|
||||
array('nickname' => '[a-zA-Z0-9]+'));
|
||||
|
||||
$m->connect('group/:nickname/blocked',
|
||||
array('action' => 'blockedfromgroup'),
|
||||
array('nickname' => '[a-zA-Z0-9]+'));
|
||||
|
|
|
|||
|
|
@ -78,25 +78,12 @@ class Rss10Action extends Action
|
|||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
|
||||
$this->limit = (int) $this->trimmed('limit');
|
||||
|
||||
if ($this->limit == 0) {
|
||||
$this->limit = DEFAULT_RSS_LIMIT;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a request
|
||||
*
|
||||
* @param array $args Arguments from $_REQUEST
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function handle($args)
|
||||
{
|
||||
// Parent handling, including cache check
|
||||
parent::handle($args);
|
||||
|
||||
if (common_config('site', 'private')) {
|
||||
if (!isset($_SERVER['PHP_AUTH_USER'])) {
|
||||
|
|
@ -122,8 +109,21 @@ class Rss10Action extends Action
|
|||
}
|
||||
}
|
||||
|
||||
// Get the list of notices
|
||||
$this->notices = $this->getNotices($this->limit);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a request
|
||||
*
|
||||
* @param array $args Arguments from $_REQUEST
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
|
||||
function handle($args)
|
||||
{
|
||||
// Parent handling, including cache check
|
||||
parent::handle($args);
|
||||
$this->showRss();
|
||||
}
|
||||
|
||||
|
|
@ -140,7 +140,7 @@ class Rss10Action extends Action
|
|||
}
|
||||
|
||||
/**
|
||||
* Get the notices to output in this stream
|
||||
* Get the notices to output in this stream.
|
||||
*
|
||||
* @return array an array of Notice objects sorted in reverse chron
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -55,17 +55,17 @@ require_once INSTALLDIR.'/lib/error.php';
|
|||
|
||||
class ServerErrorAction extends ErrorAction
|
||||
{
|
||||
function __construct($message='Error', $code=500)
|
||||
{
|
||||
parent::__construct($message, $code);
|
||||
|
||||
$this->status = array(500 => 'Internal Server Error',
|
||||
static $status = array(500 => 'Internal Server Error',
|
||||
501 => 'Not Implemented',
|
||||
502 => 'Bad Gateway',
|
||||
503 => 'Service Unavailable',
|
||||
504 => 'Gateway Timeout',
|
||||
505 => 'HTTP Version Not Supported');
|
||||
|
||||
function __construct($message='Error', $code=500)
|
||||
{
|
||||
parent::__construct($message, $code);
|
||||
|
||||
$this->default = 500;
|
||||
|
||||
// Server errors must be logged.
|
||||
|
|
@ -93,9 +93,4 @@ class ServerErrorAction extends ErrorAction
|
|||
|
||||
$this->showPage();
|
||||
}
|
||||
|
||||
function title()
|
||||
{
|
||||
return $this->status[$this->code];
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -936,35 +936,16 @@ class TwitterapiAction extends Action
|
|||
|
||||
function clientError($msg, $code = 400, $content_type = 'json')
|
||||
{
|
||||
|
||||
static $status = array(400 => 'Bad Request',
|
||||
401 => 'Unauthorized',
|
||||
402 => 'Payment Required',
|
||||
403 => 'Forbidden',
|
||||
404 => 'Not Found',
|
||||
405 => 'Method Not Allowed',
|
||||
406 => 'Not Acceptable',
|
||||
407 => 'Proxy Authentication Required',
|
||||
408 => 'Request Timeout',
|
||||
409 => 'Conflict',
|
||||
410 => 'Gone',
|
||||
411 => 'Length Required',
|
||||
412 => 'Precondition Failed',
|
||||
413 => 'Request Entity Too Large',
|
||||
414 => 'Request-URI Too Long',
|
||||
415 => 'Unsupported Media Type',
|
||||
416 => 'Requested Range Not Satisfiable',
|
||||
417 => 'Expectation Failed');
|
||||
|
||||
$action = $this->trimmed('action');
|
||||
|
||||
common_debug("User error '$code' on '$action': $msg", __FILE__);
|
||||
|
||||
if (!array_key_exists($code, $status)) {
|
||||
if (!array_key_exists($code, ClientErrorAction::$status)) {
|
||||
$code = 400;
|
||||
}
|
||||
|
||||
$status_string = $status[$code];
|
||||
$status_string = ClientErrorAction::$status[$code];
|
||||
|
||||
header('HTTP/1.1 '.$code.' '.$status_string);
|
||||
|
||||
if ($content_type == 'xml') {
|
||||
|
|
@ -983,6 +964,35 @@ class TwitterapiAction extends Action
|
|||
|
||||
}
|
||||
|
||||
function serverError($msg, $code = 500, $content_type = 'json')
|
||||
{
|
||||
$action = $this->trimmed('action');
|
||||
|
||||
common_debug("Server error '$code' on '$action': $msg", __FILE__);
|
||||
|
||||
if (!array_key_exists($code, ServerErrorAction::$status)) {
|
||||
$code = 400;
|
||||
}
|
||||
|
||||
$status_string = ServerErrorAction::$status[$code];
|
||||
|
||||
header('HTTP/1.1 '.$code.' '.$status_string);
|
||||
|
||||
if ($content_type == 'xml') {
|
||||
$this->init_document('xml');
|
||||
$this->elementStart('hash');
|
||||
$this->element('error', null, $msg);
|
||||
$this->element('request', null, $_SERVER['REQUEST_URI']);
|
||||
$this->elementEnd('hash');
|
||||
$this->end_document('xml');
|
||||
} else {
|
||||
$this->init_document('json');
|
||||
$error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
|
||||
print(json_encode($error_array));
|
||||
$this->end_document('json');
|
||||
}
|
||||
}
|
||||
|
||||
function init_twitter_rss()
|
||||
{
|
||||
$this->startXML();
|
||||
|
|
|
|||
31
lib/util.php
31
lib/util.php
|
|
@ -391,10 +391,10 @@ function common_render_content($text, $notice)
|
|||
{
|
||||
$r = common_render_text($text);
|
||||
$id = $notice->profile_id;
|
||||
$r = preg_replace('/(^|\s+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
|
||||
$r = preg_replace('/(^|[\s\.\,\:\;]+)@([A-Za-z0-9]{1,64})/e', "'\\1@'.common_at_link($id, '\\2')", $r);
|
||||
$r = preg_replace('/^T ([A-Z0-9]{1,64}) /e', "'T '.common_at_link($id, '\\1').' '", $r);
|
||||
$r = preg_replace('/(^|\s+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
|
||||
$r = preg_replace('/(^|\s)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
|
||||
$r = preg_replace('/(^|[\s\.\,\:\;]+)@#([A-Za-z0-9]{1,64})/e', "'\\1@#'.common_at_hash_link($id, '\\2')", $r);
|
||||
$r = preg_replace('/(^|[\s\.\,\:\;]+)!([A-Za-z0-9]{1,64})/e', "'\\1!'.common_group_link($id, '\\2')", $r);
|
||||
return $r;
|
||||
}
|
||||
|
||||
|
|
@ -442,9 +442,9 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
|
|||
')'.
|
||||
'(?:'.
|
||||
'(?:\:\d+)?'. //:port
|
||||
'(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"]*)?'. // /path
|
||||
'(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\/]*)?'. // ?query string
|
||||
'(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\/\?\#]*)?'. // #fragment
|
||||
'(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@]*)?'. // /path
|
||||
'(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"@\/]*)?'. // ?query string
|
||||
'(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\@/\?\#]*)?'. // #fragment
|
||||
')(?<![\?\.\,\#\,])'.
|
||||
')'.
|
||||
'#ixu';
|
||||
|
|
@ -522,12 +522,13 @@ function common_linkify($url) {
|
|||
|
||||
if(strpos($url, '@') !== false && strpos($url, ':') === false) {
|
||||
//url is an email address without the mailto: protocol
|
||||
return XMLStringer::estring('a', array('href' => "mailto:$url", 'rel' => 'external'), $url);
|
||||
}
|
||||
$canon = "mailto:$url";
|
||||
$longurl = "mailto:$url";
|
||||
}else{
|
||||
|
||||
$canon = File_redirection::_canonUrl($url);
|
||||
|
||||
$longurl_data = File_redirection::where($url);
|
||||
$longurl_data = File_redirection::where($canon);
|
||||
if (is_array($longurl_data)) {
|
||||
$longurl = $longurl_data['url'];
|
||||
} elseif (is_string($longurl_data)) {
|
||||
|
|
@ -535,8 +536,8 @@ function common_linkify($url) {
|
|||
} else {
|
||||
throw new ServerException("Can't linkify url '$url'");
|
||||
}
|
||||
|
||||
$attrs = array('href' => $canon, 'rel' => 'external');
|
||||
}
|
||||
$attrs = array('href' => $canon, 'title' => $longurl, 'rel' => 'external');
|
||||
|
||||
$is_attachment = false;
|
||||
$attachment_id = null;
|
||||
|
|
@ -552,12 +553,13 @@ function common_linkify($url) {
|
|||
}
|
||||
|
||||
if (!empty($f)) {
|
||||
if (isset($f->filename)) {
|
||||
if ($f->isEnclosure()) {
|
||||
$is_attachment = true;
|
||||
$attachment_id = $f->id;
|
||||
} else { // if it has OEmbed info, it's an attachment, too
|
||||
} else {
|
||||
$foe = File_oembed::staticGet('file_id', $f->id);
|
||||
if (!empty($foe)) {
|
||||
// if it has OEmbed info, it's an attachment, too
|
||||
$is_attachment = true;
|
||||
$attachment_id = $f->id;
|
||||
|
||||
|
|
@ -1393,9 +1395,6 @@ function common_shorten_url($long_url)
|
|||
$short_url_service = $reflectionObj->newInstanceArgs($_shorteners[$svc]['callInfo'][1]);
|
||||
$short_url = $short_url_service->shorten($long_url);
|
||||
|
||||
if(substr($short_url,0,7)=='http://'){
|
||||
$short_url = substr($short_url,7);
|
||||
}
|
||||
return $short_url;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,38 +1,37 @@
|
|||
$(document).ready(function(){
|
||||
$.getJSON($('address .url')[0].href+'/api/statuses/friends.json?user_id=' + current_user['id'] + '&lite=true&callback=?',
|
||||
function(friends){
|
||||
$('#notice_data-text').autocomplete(friends, {
|
||||
$('#notice_data-text').autocomplete($('address .url')[0].href+'/plugins/Autocomplete/autocomplete.json', {
|
||||
multiple: true,
|
||||
multipleSeparator: " ",
|
||||
minChars: 1,
|
||||
formatItem: function(row, i, max){
|
||||
return '@' + row.screen_name + ' (' + row.name + ')';
|
||||
row = eval("(" + row + ")");
|
||||
switch(row.type)
|
||||
{
|
||||
case 'user':
|
||||
return row.nickname + ' (' + row.fullname + ')';
|
||||
case 'group':
|
||||
return row.nickname + ' (' + row.fullname + ')';
|
||||
}
|
||||
},
|
||||
formatMatch: function(row, i, max){
|
||||
return '@' + row.screen_name;
|
||||
},
|
||||
formatResult: function(row){
|
||||
return '@' + row.screen_name;
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
$.getJSON($('address .url')[0].href+'/api/statusnet/groups/list.json?user_id=' + current_user['id'] + '&callback=?',
|
||||
function(groups){
|
||||
$('#notice_data-text').autocomplete(groups, {
|
||||
multiple: true,
|
||||
multipleSeparator: " ",
|
||||
minChars: 1,
|
||||
formatItem: function(row, i, max){
|
||||
return '!' + row.nickname + ' (' + row.fullname + ')';
|
||||
},
|
||||
formatMatch: function(row, i, max){
|
||||
return '!' + row.nickname;
|
||||
row = eval("(" + row + ")");
|
||||
switch(row.type)
|
||||
{
|
||||
case 'user':
|
||||
return row.nickname;
|
||||
case 'group':
|
||||
return row.nickname;
|
||||
}
|
||||
},
|
||||
formatResult: function(row){
|
||||
row = eval("(" + row + ")");
|
||||
switch(row.type)
|
||||
{
|
||||
case 'user':
|
||||
return '@' + row.nickname;
|
||||
case 'group':
|
||||
return '!' + row.nickname;
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
require_once(INSTALLDIR.'/plugins/Autocomplete/autocomplete.php');
|
||||
|
||||
class AutocompletePlugin extends Plugin
|
||||
{
|
||||
function __construct()
|
||||
|
|
@ -40,13 +42,6 @@ class AutocompletePlugin extends Plugin
|
|||
|
||||
function onEndShowScripts($action){
|
||||
if (common_logged_in()) {
|
||||
$current_user = common_current_user();
|
||||
$js_string = <<<EOT
|
||||
<script type="text/javascript">
|
||||
var current_user = { id: '$current_user->id' };
|
||||
</script>
|
||||
EOT;
|
||||
$action->raw($js_string);
|
||||
$action->script('plugins/Autocomplete/jquery-autocomplete/jquery.autocomplete.pack.js');
|
||||
$action->script('plugins/Autocomplete/Autocomplete.js');
|
||||
}
|
||||
|
|
@ -59,5 +54,12 @@ EOT;
|
|||
}
|
||||
}
|
||||
|
||||
function onRouterInitialized($m)
|
||||
{
|
||||
if (common_logged_in()) {
|
||||
$m->connect('plugins/Autocomplete/autocomplete.json', array('action'=>'autocomplete'));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
136
plugins/Autocomplete/autocomplete.php
Normal file
136
plugins/Autocomplete/autocomplete.php
Normal file
|
|
@ -0,0 +1,136 @@
|
|||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* List users for autocompletion
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: 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/>.
|
||||
*
|
||||
* @category Plugin
|
||||
* @package StatusNet
|
||||
* @author Craig Andrews <candrews@integralblue.com>
|
||||
* @copyright 2008-2009 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* List users for autocompletion
|
||||
*
|
||||
* This is the form for adding a new g
|
||||
*
|
||||
* @category Plugin
|
||||
* @package StatusNet
|
||||
* @author Craig Andrews <candrews@integralblue.com>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
class AutocompleteAction extends Action
|
||||
{
|
||||
private $result;
|
||||
|
||||
/**
|
||||
* Last-modified date for page
|
||||
*
|
||||
* When was the content of this page last modified? Based on notice,
|
||||
* profile, avatar.
|
||||
*
|
||||
* @return int last-modified date as unix timestamp
|
||||
*/
|
||||
function lastModified()
|
||||
{
|
||||
$max=0;
|
||||
foreach($this->users as $user){
|
||||
$max = max($max,strtotime($user->modified),strtotime($user->profile->modified));
|
||||
}
|
||||
foreach($this->groups as $group){
|
||||
$max = max($max,strtotime($group->modified));
|
||||
}
|
||||
return $max;
|
||||
}
|
||||
|
||||
/**
|
||||
* An entity tag for this page
|
||||
*
|
||||
* Shows the ETag for the page, based on the notice ID and timestamps
|
||||
* for the notice, profile, and avatar. It's weak, since we change
|
||||
* the date text "one hour ago", etc.
|
||||
*
|
||||
* @return string etag
|
||||
*/
|
||||
function etag()
|
||||
{
|
||||
return '"' . implode(':', array($this->arg('action'),
|
||||
crc32($this->arg('q')), //the actual string can have funny characters in we don't want showing up in the etag
|
||||
$this->arg('limit'),
|
||||
$this->lastModified())) . '"';
|
||||
}
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
$this->groups=array();
|
||||
$this->users=array();
|
||||
$q = $this->arg('q');
|
||||
$limit = $this->arg('limit');
|
||||
if($limit > 200) $limit=200; //prevent DOS attacks
|
||||
if(substr($q,0,1)=='@'){
|
||||
//user search
|
||||
$q=substr($q,1);
|
||||
$user = new User();
|
||||
$user->limit($limit);
|
||||
$user->whereAdd('nickname like \'' . trim($user->escape($q), '\'') . '%\'');
|
||||
$user->find();
|
||||
while($user->fetch()) {
|
||||
$profile = Profile::staticGet($user->id);
|
||||
$user->profile=$profile;
|
||||
$this->users[]=$user;
|
||||
}
|
||||
}
|
||||
if(substr($q,0,1)=='!'){
|
||||
//group search
|
||||
$q=substr($q,1);
|
||||
$group = new User_group();
|
||||
$group->limit($limit);
|
||||
$group->whereAdd('nickname like \'' . trim($group->escape($q), '\'') . '%\'');
|
||||
$group->find();
|
||||
while($group->fetch()) {
|
||||
$this->groups[]=$group;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
$results = array();
|
||||
foreach($this->users as $user){
|
||||
$results[]=array('nickname' => $user->nickname, 'fullname'=> $user->profile->fullname, 'type'=>'user');
|
||||
}
|
||||
foreach($this->groups as $group){
|
||||
$results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
|
||||
}
|
||||
foreach($results as $result) {
|
||||
print json_encode($result) . "\n";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,5 +1,7 @@
|
|||
Autocomplete allows users to autocomplete screen names in @ replies. When an "@" is typed into the notice text area, an autocomplete box is displayed populated with the user's friends' screen names.
|
||||
|
||||
Note: This plugin doesn't work if the site is in Private mode, i.e. when $config['site']['private'] is set to true.
|
||||
|
||||
Installation
|
||||
============
|
||||
Add "addPlugin('Autocomplete');" to the bottom of your config.php
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class InfiniteScrollPlugin extends Plugin
|
|||
|
||||
function onEndShowScripts($action)
|
||||
{
|
||||
$action->script('plugins/InfiniteScroll/jquery.infinitescroll.min.js');
|
||||
$action->script('plugins/InfiniteScroll/jquery.infinitescroll.js');
|
||||
$action->script('plugins/InfiniteScroll/infinitescroll.js');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
jQuery(document).ready(function($){
|
||||
$('notices_primary').infinitescroll({
|
||||
debug: true,
|
||||
infiniteScroll : false,
|
||||
nextSelector : "li.nav_next a",
|
||||
loadingImg : $('address .url')[0].href+'plugins/InfiniteScroll/ajax-loader.gif',
|
||||
text : "<em>Loading the next set of posts...</em>",
|
||||
|
|
@ -12,4 +13,3 @@ jQuery(document).ready(function($){
|
|||
NoticeAttachments();
|
||||
});
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -92,14 +92,14 @@
|
|||
|
||||
if (props.isDuringAjax || props.isInvalidPage || props.isDone) return;
|
||||
|
||||
if ( !isNearBottom(opts,props) ) return;
|
||||
if ( opts.infiniteScroll && !isNearBottom(opts,props) ) return;
|
||||
|
||||
// we dont want to fire the ajax multiple times
|
||||
props.isDuringAjax = true;
|
||||
|
||||
// show the loading message and hide the previous/next links
|
||||
props.loadingMsg.appendTo( opts.contentSelector ).show();
|
||||
$( opts.navSelector ).hide();
|
||||
if(opts.infiniteScroll) $( opts.navSelector ).hide();
|
||||
|
||||
// increment the URL bit. e.g. /page/3/
|
||||
props.currPage++;
|
||||
|
|
@ -205,10 +205,19 @@
|
|||
}
|
||||
});
|
||||
|
||||
if(opts.infiniteScroll){
|
||||
// bind scroll handler to element (if its a local scroll) or window
|
||||
$(opts.localMode ? this : window)
|
||||
.bind('scroll.infscr', function(){ infscrSetup(path,opts,props,callback); } )
|
||||
.trigger('scroll.infscr'); // trigger the event, in case it's a short page
|
||||
}else{
|
||||
$(opts.nextSelector).click(
|
||||
function(){
|
||||
infscrSetup(path,opts,props,callback);
|
||||
return false;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
return this;
|
||||
|
|
@ -222,6 +231,7 @@
|
|||
$.infinitescroll = {
|
||||
defaults : {
|
||||
debug : false,
|
||||
infiniteScroll : true,
|
||||
preload : false,
|
||||
nextSelector : "div.navigation a:first",
|
||||
loadingImg : "http://www.infinite-scroll.com/loading.gif",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
// update the local timeline from a Meteor server
|
||||
//
|
||||
// Update the local timeline from a Meteor server
|
||||
// XXX: If @a is subscribed to @b, @a should get @b's notices in @a's Personal timeline.
|
||||
// Do Replies timeline.
|
||||
|
||||
var MeteorUpdater = function()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,30 +38,24 @@ if (!defined('STATUSNET')) {
|
|||
* This plugin will spoot out the correct JavaScript spell to invoke
|
||||
* Piwik Analytics on a page.
|
||||
*
|
||||
* To use this plugin please add the following three lines to your config.php
|
||||
* To use this plugin add the following to your config.php
|
||||
*
|
||||
* require_once('plugins/PiwikAnalyticsPlugin.php');
|
||||
* $pa = new PiwikAnalyticsPlugin("example.com/piwik/","id");
|
||||
* addPlugin('PiwikAnalytics', array('piwikroot' => 'example.com/piwik/',
|
||||
* 'piwikId' => 'id'));
|
||||
*
|
||||
* exchange example.com/piwik/ with the url to your piwik installation and
|
||||
* make sure you don't forget the final /
|
||||
* exchange id with the ID your statusnet installation has in your Piwik analytics
|
||||
* Replace 'example.com/piwik/' with the URL to your Piwik installation and
|
||||
* make sure you don't forget the final /.
|
||||
* Replace 'id' with the ID your statusnet installation has in your Piwik
|
||||
* analytics setup - for example '8'.
|
||||
*
|
||||
* @category Plugin
|
||||
* @package StatusNet
|
||||
* @author Tobias Diekershoff <tobias.diekershoff@gmx.net>
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*
|
||||
* @see Event
|
||||
*/
|
||||
|
||||
class PiwikAnalyticsPlugin extends Plugin
|
||||
{
|
||||
/** the base of your Piwik installation */
|
||||
var $piwikroot = null;
|
||||
public $piwikroot = null;
|
||||
/** the Piwik Id of your statusnet installation */
|
||||
var $piwikId = null;
|
||||
public $piwikId = null;
|
||||
|
||||
/**
|
||||
* constructor
|
||||
|
|
@ -73,7 +67,7 @@ class PiwikAnalyticsPlugin extends Plugin
|
|||
function __construct($root=null, $id=null)
|
||||
{
|
||||
$this->piwikroot = $root;
|
||||
$this->piwikid = $id;
|
||||
$this->piwikId = $id;
|
||||
parent::__construct();
|
||||
}
|
||||
|
||||
|
|
@ -96,7 +90,7 @@ document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/ja
|
|||
</script>
|
||||
<script type="text/javascript">
|
||||
try {
|
||||
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 4);
|
||||
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", {$this->piwikId});
|
||||
piwikTracker.trackPageView();
|
||||
piwikTracker.enableLinkTracking();
|
||||
} catch( err ) {}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ if (!defined('STATUSNET')) {
|
|||
exit(1);
|
||||
}
|
||||
|
||||
define('DEFAULT_HUB','http://2pubsubhubbub.appspot.com');
|
||||
define('DEFAULT_HUB','http://pubsubhubbub.appspot.com');
|
||||
|
||||
require_once(INSTALLDIR.'/plugins/PubSubHubBub/publisher.php');
|
||||
|
||||
|
|
@ -59,7 +59,7 @@ class PubSubHubBubPlugin extends Plugin
|
|||
$action->element('atom:link',array('rel'=>'hub','href'=>$this->hub),null);
|
||||
}
|
||||
|
||||
function onEndNoticeSave($notice){
|
||||
function onHandleQueuedNotice($notice){
|
||||
$publisher = new Publisher($this->hub);
|
||||
|
||||
$feeds = array();
|
||||
|
|
|
|||
|
|
@ -50,6 +50,11 @@ class RealtimePlugin extends Plugin
|
|||
protected $favorurl = null;
|
||||
protected $deleteurl = null;
|
||||
|
||||
/**
|
||||
* When it's time to initialize the plugin, calculate and
|
||||
* pass the URLs we need.
|
||||
*/
|
||||
|
||||
function onInitializePlugin()
|
||||
{
|
||||
$this->replyurl = common_local_url('newnotice');
|
||||
|
|
@ -57,29 +62,26 @@ class RealtimePlugin extends Plugin
|
|||
// FIXME: need to find a better way to pass this pattern in
|
||||
$this->deleteurl = common_local_url('deletenotice',
|
||||
array('notice' => '0000000000'));
|
||||
return true;
|
||||
}
|
||||
|
||||
function onEndShowScripts($action)
|
||||
{
|
||||
$path = null;
|
||||
$timeline = $this->_getTimeline($action);
|
||||
|
||||
switch ($action->trimmed('action')) {
|
||||
case 'public':
|
||||
$path = array('public');
|
||||
break;
|
||||
case 'tag':
|
||||
$tag = $action->trimmed('tag');
|
||||
if (!empty($tag)) {
|
||||
$path = array('tag', $tag);
|
||||
// If there's not a timeline on this page,
|
||||
// just return true
|
||||
|
||||
if (empty($timeline)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$base = $action->selfUrl();
|
||||
if (mb_strstr($base, '?')) {
|
||||
$url = $base . '&realtime=1';
|
||||
} else {
|
||||
return true;
|
||||
$url = $base . '?realtime=1';
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
|
||||
$timeline = $this->_pathToChannel($path);
|
||||
|
||||
$scripts = $this->_getScripts();
|
||||
|
||||
|
|
@ -95,10 +97,22 @@ class RealtimePlugin extends Plugin
|
|||
$user_id = 0;
|
||||
}
|
||||
|
||||
if ($action->boolean('realtime')) {
|
||||
$realtimeUI = ' RealtimeUpdate.initPopupWindow();';
|
||||
}
|
||||
else {
|
||||
$iconurl = common_path('plugins/Realtime/icon_external.gif');
|
||||
$realtimeUI = ' RealtimeUpdate.addPopup("'.$url.'", "'.$timeline.'", "'. $iconurl .'");';
|
||||
}
|
||||
|
||||
$action->elementStart('script', array('type' => 'text/javascript'));
|
||||
$action->raw("$(document).ready(function() { ");
|
||||
$action->raw($this->_updateInitialize($timeline, $user_id));
|
||||
$action->raw(" });");
|
||||
|
||||
$script = ' $(document).ready(function() { '.
|
||||
$realtimeUI.
|
||||
$this->_updateInitialize($timeline, $user_id).
|
||||
'}); ';
|
||||
$action->raw($script);
|
||||
|
||||
$action->elementEnd('script');
|
||||
|
||||
return true;
|
||||
|
|
@ -108,13 +122,23 @@ class RealtimePlugin extends Plugin
|
|||
{
|
||||
$paths = array();
|
||||
|
||||
// XXX: Add other timelines; this is just for the public one
|
||||
// Add to the author's timeline
|
||||
|
||||
$user = User::staticGet('id', $notice->profile_id);
|
||||
|
||||
if (!empty($user)) {
|
||||
$paths[] = array('showstream', $user->nickname);
|
||||
}
|
||||
|
||||
// Add to the public timeline
|
||||
|
||||
if ($notice->is_local ||
|
||||
($notice->is_local == 0 && !common_config('public', 'localonly'))) {
|
||||
$paths[] = array('public');
|
||||
}
|
||||
|
||||
// Add to the tags timeline
|
||||
|
||||
$tags = $this->getNoticeTags($notice);
|
||||
|
||||
if (!empty($tags)) {
|
||||
|
|
@ -123,6 +147,46 @@ class RealtimePlugin extends Plugin
|
|||
}
|
||||
}
|
||||
|
||||
// Add to inbox timelines
|
||||
// XXX: do a join
|
||||
|
||||
$inbox = new Notice_inbox();
|
||||
$inbox->notice_id = $notice->id;
|
||||
|
||||
if ($inbox->find()) {
|
||||
while ($inbox->fetch()) {
|
||||
$user = User::staticGet('id', $inbox->user_id);
|
||||
$paths[] = array('all', $user->nickname);
|
||||
}
|
||||
}
|
||||
|
||||
// Add to the replies timeline
|
||||
|
||||
$reply = new Reply();
|
||||
$reply->notice_id = $notice->id;
|
||||
|
||||
if ($reply->find()) {
|
||||
while ($reply->fetch()) {
|
||||
$user = User::staticGet('id', $reply->profile_id);
|
||||
if (!empty($user)) {
|
||||
$paths[] = array('replies', $user->nickname);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Add to the group timeline
|
||||
// XXX: join
|
||||
|
||||
$gi = new Group_inbox();
|
||||
$gi->notice_id = $notice->id;
|
||||
|
||||
if ($gi->find()) {
|
||||
while ($gi->fetch()) {
|
||||
$ug = User_group::staticGet('id', $gi->group_id);
|
||||
$paths[] = array('showgroup', $ug->nickname);
|
||||
}
|
||||
}
|
||||
|
||||
if (count($paths) > 0) {
|
||||
|
||||
$json = $this->noticeAsJson($notice);
|
||||
|
|
@ -140,6 +204,36 @@ class RealtimePlugin extends Plugin
|
|||
return true;
|
||||
}
|
||||
|
||||
function onStartShowBody($action)
|
||||
{
|
||||
$realtime = $action->boolean('realtime');
|
||||
if (!$realtime) {
|
||||
return true;
|
||||
}
|
||||
|
||||
$action->elementStart('body',
|
||||
(common_current_user()) ? array('id' => $action->trimmed('action'),
|
||||
'class' => 'user_in')
|
||||
: array('id' => $action->trimmed('action')));
|
||||
|
||||
// XXX hack to deal with JS that tries to get the
|
||||
// root url from page output
|
||||
|
||||
$action->elementStart('address');
|
||||
$action->element('a', array('class' => 'url',
|
||||
'href' => common_local_url('public')),
|
||||
'');
|
||||
$action->elementEnd('address');
|
||||
|
||||
if (common_logged_in()) {
|
||||
$action->showNoticeForm();
|
||||
}
|
||||
|
||||
$action->showContentBlock();
|
||||
$action->elementEnd('body');
|
||||
return false; // No default processing
|
||||
}
|
||||
|
||||
function noticeAsJson($notice)
|
||||
{
|
||||
// FIXME: this code should be abstracted to a neutral third
|
||||
|
|
@ -224,4 +318,41 @@ class RealtimePlugin extends Plugin
|
|||
{
|
||||
return '';
|
||||
}
|
||||
|
||||
function _getTimeline($action)
|
||||
{
|
||||
$path = null;
|
||||
$timeline = null;
|
||||
|
||||
$action_name = $action->trimmed('action');
|
||||
|
||||
switch ($action_name) {
|
||||
case 'public':
|
||||
$path = array('public');
|
||||
break;
|
||||
case 'tag':
|
||||
$tag = $action->trimmed('tag');
|
||||
if (!empty($tag)) {
|
||||
$path = array('tag', $tag);
|
||||
}
|
||||
break;
|
||||
case 'showstream':
|
||||
case 'all':
|
||||
case 'replies':
|
||||
case 'showgroup':
|
||||
$nickname = common_canonical_nickname($action->trimmed('nickname'));
|
||||
if (!empty($nickname)) {
|
||||
$path = array($action_name, $nickname);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (!empty($path)) {
|
||||
$timeline = $this->_pathToChannel($path);
|
||||
}
|
||||
|
||||
return $timeline;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
BIN
plugins/Realtime/icon_external.gif
Normal file
BIN
plugins/Realtime/icon_external.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 90 B |
|
|
@ -1,8 +1,8 @@
|
|||
// add a notice encoded as JSON into the current timeline
|
||||
//
|
||||
// TODO: i18n
|
||||
|
||||
RealtimeUpdate = {
|
||||
|
||||
_userid: 0,
|
||||
_replyurl: '',
|
||||
_favorurl: '',
|
||||
|
|
@ -14,23 +14,36 @@ RealtimeUpdate = {
|
|||
RealtimeUpdate._replyurl = replyurl;
|
||||
RealtimeUpdate._favorurl = favorurl;
|
||||
RealtimeUpdate._deleteurl = deleteurl;
|
||||
|
||||
$(window).blur(function() {
|
||||
$('#notices_primary .notice').css({
|
||||
'border-top-color':$('#notices_primary .notice:last').css('border-top-color'),
|
||||
'border-top-style':'dotted'
|
||||
});
|
||||
|
||||
$('#notices_primary .notice:first').css({
|
||||
'border-top-color':'#AAAAAA',
|
||||
'border-top-style':'solid'
|
||||
});
|
||||
});
|
||||
},
|
||||
|
||||
receive: function(data)
|
||||
{
|
||||
setTimeout(function() {
|
||||
id = data.id;
|
||||
|
||||
// Don't add it if it already exists
|
||||
|
||||
if ($("#notice-"+id).length > 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
var noticeItem = RealtimeUpdate.makeNoticeItem(data);
|
||||
$("#notices_primary .notices").prepend(noticeItem, true);
|
||||
$("#notices_primary .notices").prepend(noticeItem);
|
||||
$("#notices_primary .notice:first").css({display:"none"});
|
||||
$("#notices_primary .notice:first").fadeIn(1000);
|
||||
NoticeReply();
|
||||
}, 500);
|
||||
},
|
||||
|
||||
makeNoticeItem: function(data)
|
||||
|
|
@ -50,26 +63,15 @@ RealtimeUpdate = {
|
|||
"<p class=\"entry-content\">"+html+"</p>"+
|
||||
"</div>"+
|
||||
"<div class=\"entry-content\">"+
|
||||
"<dl class=\"timestamp\">"+
|
||||
"<dt>Published</dt>"+
|
||||
"<dd>"+
|
||||
"<a rel=\"bookmark\" href=\""+data['url']+"\" >"+
|
||||
"<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
|
||||
"<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
|
||||
"</a> "+
|
||||
"</dd>"+
|
||||
"</dl>"+
|
||||
"<dl class=\"device\">"+
|
||||
"<dt>From</dt> "+
|
||||
"<dd>"+source+"</dd>"+ // may have a link, I think
|
||||
"</dl>";
|
||||
|
||||
"<span class=\"source\">"+
|
||||
"from "+
|
||||
"<span class=\"device\">"+source+"</span>"+ // may have a link
|
||||
"</span>";
|
||||
if (data['in_reply_to_status_id']) {
|
||||
ni = ni+" <dl class=\"response\">"+
|
||||
"<dt>To</dt>"+
|
||||
"<dd>"+
|
||||
"<a href=\""+data['in_reply_to_status_url']+"\" rel=\"in-reply-to\">in reply to</a>"+
|
||||
"</dd>"+
|
||||
"</dl>";
|
||||
ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
|
||||
}
|
||||
|
||||
ni = ni+"</div>"+
|
||||
|
|
@ -96,7 +98,7 @@ RealtimeUpdate = {
|
|||
|
||||
ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
|
||||
"<fieldset>"+
|
||||
"<legend>Favor this notice</legend>"+ // XXX: i18n
|
||||
"<legend>Favor this notice</legend>"+
|
||||
"<input name=\"token-"+id+"\" type=\"hidden\" id=\"token-"+id+"\" value=\""+session_key+"\"/>"+
|
||||
"<input name=\"notice\" type=\"hidden\" id=\"notice-n"+id+"\" value=\""+id+"\"/>"+
|
||||
"<input type=\"submit\" id=\"favor-submit-"+id+"\" name=\"favor-submit-"+id+"\" class=\"submit\" value=\"Favor\" title=\"Favor this notice\"/>"+
|
||||
|
|
@ -108,13 +110,7 @@ RealtimeUpdate = {
|
|||
makeReplyLink: function(id, nickname)
|
||||
{
|
||||
var rl;
|
||||
rl = "<dl class=\"notice_reply\">"+
|
||||
"<dt>Reply to this notice</dt>"+
|
||||
"<dd>"+
|
||||
"<a href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span>"+
|
||||
"</a>"+
|
||||
"</dd>"+
|
||||
"</dl>";
|
||||
rl = "<a class=\"notice_reply\" href=\""+RealtimeUpdate._replyurl+"?replyto="+nickname+"\" title=\"Reply to this notice\">Reply <span class=\"notice_id\">"+id+"</span></a>";
|
||||
return rl;
|
||||
},
|
||||
|
||||
|
|
@ -123,13 +119,62 @@ RealtimeUpdate = {
|
|||
var dl, delurl;
|
||||
delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
|
||||
|
||||
dl = "<dl class=\"notice_delete\">"+
|
||||
"<dt>Delete this notice</dt>"+
|
||||
"<dd>"+
|
||||
"<a href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>"+
|
||||
"</dd>"+
|
||||
"</dl>";
|
||||
dl = "<a class=\"notice_delete\" href=\""+delurl+"\" title=\"Delete this notice\">Delete</a>";
|
||||
|
||||
return dl;
|
||||
},
|
||||
|
||||
addPopup: function(url, timeline, iconurl)
|
||||
{
|
||||
$('#notices_primary').css({'position':'relative'});
|
||||
$('#notices_primary').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
|
||||
|
||||
$('#realtime_timeline').css({
|
||||
'margin':'0 0 11px 0',
|
||||
'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
|
||||
'padding':'0 0 0 20px',
|
||||
'display':'block',
|
||||
'position':'absolute',
|
||||
'top':'-20px',
|
||||
'right':'0',
|
||||
'border':'none',
|
||||
'cursor':'pointer',
|
||||
'color':$("a").css("color"),
|
||||
'font-weight':'bold',
|
||||
'font-size':'1em'
|
||||
});
|
||||
|
||||
$('#realtime_timeline').click(function() {
|
||||
window.open(url,
|
||||
timeline,
|
||||
'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
|
||||
|
||||
return false;
|
||||
});
|
||||
},
|
||||
|
||||
initPopupWindow: function()
|
||||
{
|
||||
window.resizeTo(500, 550);
|
||||
$('address').hide();
|
||||
$('#content').css({'width':'93.5%'});
|
||||
|
||||
$('#form_notice').css({
|
||||
'margin':'18px 0 18px 1.795%',
|
||||
'width':'93%',
|
||||
'max-width':'451px'
|
||||
});
|
||||
|
||||
$('#form_notice label[for=notice_data-text], h1').css({'display': 'none'});
|
||||
|
||||
$('.notices li:first-child').css({'border-top-color':'transparent'});
|
||||
|
||||
$('#form_notice label[for="notice_data-attach"], #form_notice #notice_data-attach').css({'top':'0'});
|
||||
|
||||
$('#form_notice #notice_data-attach').css({
|
||||
'left':'auto',
|
||||
'right':'0'
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ Use:
|
|||
1. Get an API key from http://recaptcha.net
|
||||
|
||||
2. In config.php add:
|
||||
include_once('plugins/recaptcha.php');
|
||||
include_once('plugins/recaptcha/recaptcha.php');
|
||||
$captcha = new recaptcha(publickey, privatekey, showErrors);
|
||||
|
||||
Changelog
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ function newSub($i)
|
|||
|
||||
$to = User::staticGet('nickname', $tunic);
|
||||
|
||||
if (empty($from)) {
|
||||
if (empty($to)) {
|
||||
throw new Exception("Can't find user '$tunic'.");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -260,10 +260,11 @@ class MailerDaemon
|
|||
|
||||
function add_notice($user, $msg, $fileRecords)
|
||||
{
|
||||
try {
|
||||
$notice = Notice::saveNew($user->id, $msg, 'mail');
|
||||
if (is_string($notice)) {
|
||||
$this->log(LOG_ERR, $notice);
|
||||
return $notice;
|
||||
} catch (Exception $e) {
|
||||
$this->log(LOG_ERR, $e->getMessage());
|
||||
return $e->getMessage();
|
||||
}
|
||||
foreach($fileRecords as $fileRecord){
|
||||
$this->attachFile($notice, $fileRecord);
|
||||
|
|
|
|||
|
|
@ -323,12 +323,15 @@ class XMPPDaemon extends Daemon
|
|||
mb_strlen($content_shortened)));
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
$notice = Notice::saveNew($user->id, $content_shortened, 'xmpp');
|
||||
if (is_string($notice)) {
|
||||
$this->log(LOG_ERR, $notice);
|
||||
$this->from_site($user->jabber, $notice);
|
||||
} catch (Exception $e) {
|
||||
$this->log(LOG_ERR, $e->getMessage());
|
||||
$this->from_site($user->jabber, $e->getMessage());
|
||||
return;
|
||||
}
|
||||
|
||||
common_broadcast_notice($notice);
|
||||
$this->log(LOG_INFO,
|
||||
'Added notice ' . $notice->id . ' from user ' . $user->nickname);
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
|||
|
||||
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||
define('STATUSNET', true);
|
||||
define('LACONICA', true);
|
||||
|
||||
require_once INSTALLDIR . '/lib/common.php';
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
|||
|
||||
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||
define('STATUSNET', true);
|
||||
define('LACONICA', true);
|
||||
|
||||
require_once INSTALLDIR . '/lib/common.php';
|
||||
|
||||
|
|
@ -27,68 +28,72 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
|
|||
return array(
|
||||
array('not a link :: no way',
|
||||
'not a link :: no way'),
|
||||
array('link http://www.somesite.com/xyz/35637563@N00/52803365/ link',
|
||||
'link <a href="http://www.somesite.com/xyz/35637563@N00/52803365/" title="http://www.somesite.com/xyz/35637563@N00/52803365/" rel="external">http://www.somesite.com/xyz/35637563@N00/52803365/</a> link'),
|
||||
array('http://127.0.0.1',
|
||||
'<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
|
||||
'<a href="http://127.0.0.1/" title="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
|
||||
array('127.0.0.1',
|
||||
'<a href="http://127.0.0.1/" rel="external">127.0.0.1</a>'),
|
||||
'<a href="http://127.0.0.1/" title="http://127.0.0.1/" rel="external">127.0.0.1</a>'),
|
||||
array('127.0.0.1:99',
|
||||
'<a href="http://127.0.0.1:99/" rel="external">127.0.0.1:99</a>'),
|
||||
'<a href="http://127.0.0.1:99/" title="http://127.0.0.1:99/" rel="external">127.0.0.1:99</a>'),
|
||||
array('127.0.0.1/Name:test.php',
|
||||
'<a href="http://127.0.0.1/Name:test.php" rel="external">127.0.0.1/Name:test.php</a>'),
|
||||
'<a href="http://127.0.0.1/Name:test.php" title="http://127.0.0.1/Name:test.php" rel="external">127.0.0.1/Name:test.php</a>'),
|
||||
array('127.0.0.1/~test',
|
||||
'<a href="http://127.0.0.1/~test" rel="external">127.0.0.1/~test</a>'),
|
||||
'<a href="http://127.0.0.1/~test" title="http://127.0.0.1/~test" rel="external">127.0.0.1/~test</a>'),
|
||||
array('127.0.0.1/+test',
|
||||
'<a href="http://127.0.0.1/+test" rel="external">127.0.0.1/+test</a>'),
|
||||
'<a href="http://127.0.0.1/+test" title="http://127.0.0.1/+test" rel="external">127.0.0.1/+test</a>'),
|
||||
array('127.0.0.1/$test',
|
||||
'<a href="http://127.0.0.1/$test" rel="external">127.0.0.1/$test</a>'),
|
||||
'<a href="http://127.0.0.1/$test" title="http://127.0.0.1/$test" rel="external">127.0.0.1/$test</a>'),
|
||||
array('127.0.0.1/\'test',
|
||||
'<a href="http://127.0.0.1/\'test" rel="external">127.0.0.1/\'test</a>'),
|
||||
'<a href="http://127.0.0.1/\'test" title="http://127.0.0.1/\'test" rel="external">127.0.0.1/\'test</a>'),
|
||||
array('127.0.0.1/"test',
|
||||
'<a href="http://127.0.0.1/"test" rel="external">127.0.0.1/"test</a>'),
|
||||
'<a href="http://127.0.0.1/"test" title="http://127.0.0.1/"test" rel="external">127.0.0.1/"test</a>'),
|
||||
array('127.0.0.1/-test',
|
||||
'<a href="http://127.0.0.1/-test" rel="external">127.0.0.1/-test</a>'),
|
||||
'<a href="http://127.0.0.1/-test" title="http://127.0.0.1/-test" rel="external">127.0.0.1/-test</a>'),
|
||||
array('127.0.0.1/_test',
|
||||
'<a href="http://127.0.0.1/_test" rel="external">127.0.0.1/_test</a>'),
|
||||
'<a href="http://127.0.0.1/_test" title="http://127.0.0.1/_test" rel="external">127.0.0.1/_test</a>'),
|
||||
array('127.0.0.1/!test',
|
||||
'<a href="http://127.0.0.1/!test" rel="external">127.0.0.1/!test</a>'),
|
||||
'<a href="http://127.0.0.1/!test" title="http://127.0.0.1/!test" rel="external">127.0.0.1/!test</a>'),
|
||||
array('127.0.0.1/*test',
|
||||
'<a href="http://127.0.0.1/*test" rel="external">127.0.0.1/*test</a>'),
|
||||
'<a href="http://127.0.0.1/*test" title="http://127.0.0.1/*test" rel="external">127.0.0.1/*test</a>'),
|
||||
array('127.0.0.1/test%20stuff',
|
||||
'<a href="http://127.0.0.1/test%20stuff" rel="external">127.0.0.1/test%20stuff</a>'),
|
||||
'<a href="http://127.0.0.1/test%20stuff" title="http://127.0.0.1/test%20stuff" rel="external">127.0.0.1/test%20stuff</a>'),
|
||||
array('http://[::1]:99/test.php',
|
||||
'<a href="http://[::1]:99/test.php" rel="external">http://[::1]:99/test.php</a>'),
|
||||
'<a href="http://[::1]:99/test.php" title="http://[::1]:99/test.php" rel="external">http://[::1]:99/test.php</a>'),
|
||||
array('http://::1/test.php',
|
||||
'<a href="http://::1/test.php" rel="external">http://::1/test.php</a>'),
|
||||
'<a href="http://::1/test.php" title="http://::1/test.php" rel="external">http://::1/test.php</a>'),
|
||||
array('http://::1',
|
||||
'<a href="http://::1/" rel="external">http://::1</a>'),
|
||||
'<a href="http://::1/" title="http://::1/" rel="external">http://::1</a>'),
|
||||
array('2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php',
|
||||
'<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php</a>'),
|
||||
'<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" title="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab/test.php</a>'),
|
||||
array('[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php',
|
||||
'<a href="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" rel="external">[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php</a>'),
|
||||
'<a href="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" title="http://[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php" rel="external">[2001:4978:1b5:0:21d:e0ff:fe66:59ab]:99/test.php</a>'),
|
||||
array('2001:4978:1b5:0:21d:e0ff:fe66:59ab',
|
||||
'<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
|
||||
'<a href="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" title="http://2001:4978:1b5:0:21d:e0ff:fe66:59ab/" rel="external">2001:4978:1b5:0:21d:e0ff:fe66:59ab</a>'),
|
||||
array('http://127.0.0.1',
|
||||
'<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
|
||||
'<a href="http://127.0.0.1/" title="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
|
||||
array('example.com',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
|
||||
array('example.com',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
|
||||
array('http://example.com',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>'),
|
||||
array('http://example.com.',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>.'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>.'),
|
||||
array('/var/lib/example.so',
|
||||
'/var/lib/example.so'),
|
||||
array('example',
|
||||
'example'),
|
||||
array('user@example.com',
|
||||
'<a href="mailto:user@example.com" rel="external">user@example.com</a>'),
|
||||
'<a href="mailto:user@example.com" title="mailto:user@example.com" rel="external">user@example.com</a>'),
|
||||
array('user_name+other@example.com',
|
||||
'<a href="mailto:user_name+other@example.com" rel="external">user_name+other@example.com</a>'),
|
||||
'<a href="mailto:user_name+other@example.com" title="mailto:user_name+other@example.com" rel="external">user_name+other@example.com</a>'),
|
||||
array('mailto:user@example.com',
|
||||
'<a href="mailto:user@example.com" rel="external">mailto:user@example.com</a>'),
|
||||
'<a href="mailto:user@example.com" title="mailto:user@example.com" rel="external">mailto:user@example.com</a>'),
|
||||
array('mailto:user@example.com?subject=test',
|
||||
'<a href="mailto:user@example.com?subject=test" rel="external">mailto:user@example.com?subject=test</a>'),
|
||||
'<a href="mailto:user@example.com?subject=test" title="mailto:user@example.com?subject=test" rel="external">mailto:user@example.com?subject=test</a>'),
|
||||
array('xmpp:user@example.com',
|
||||
'<a href="xmpp:user@example.com" title="xmpp:user@example.com" rel="external">xmpp:user@example.com</a>'),
|
||||
array('#example',
|
||||
'#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('example'))) . '" rel="tag">example</a></span>'),
|
||||
array('#example.com',
|
||||
|
|
@ -96,165 +101,165 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
|
|||
array('#.net',
|
||||
'#<span class="tag"><a href="' . common_local_url('tag', array('tag' => common_canonical_tag('.net'))) . '" rel="tag">.net</a></span>'),
|
||||
array('http://example',
|
||||
'<a href="http://example/" rel="external">http://example</a>'),
|
||||
'<a href="http://example/" title="http://example/" rel="external">http://example</a>'),
|
||||
array('http://3xampl3',
|
||||
'<a href="http://3xampl3/" rel="external">http://3xampl3</a>'),
|
||||
'<a href="http://3xampl3/" title="http://3xampl3/" rel="external">http://3xampl3</a>'),
|
||||
array('http://example/',
|
||||
'<a href="http://example/" rel="external">http://example/</a>'),
|
||||
'<a href="http://example/" title="http://example/" rel="external">http://example/</a>'),
|
||||
array('http://example/path',
|
||||
'<a href="http://example/path" rel="external">http://example/path</a>'),
|
||||
'<a href="http://example/path" title="http://example/path" rel="external">http://example/path</a>'),
|
||||
array('http://example.com',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>'),
|
||||
array('https://example.com',
|
||||
'<a href="https://example.com/" rel="external">https://example.com</a>'),
|
||||
'<a href="https://example.com/" title="https://example.com/" rel="external">https://example.com</a>'),
|
||||
array('ftp://example.com',
|
||||
'<a href="ftp://example.com/" rel="external">ftp://example.com</a>'),
|
||||
'<a href="ftp://example.com/" title="ftp://example.com/" rel="external">ftp://example.com</a>'),
|
||||
array('ftps://example.com',
|
||||
'<a href="ftps://example.com/" rel="external">ftps://example.com</a>'),
|
||||
'<a href="ftps://example.com/" title="ftps://example.com/" rel="external">ftps://example.com</a>'),
|
||||
array('http://user@example.com',
|
||||
'<a href="http://user@example.com/" rel="external">http://user@example.com</a>'),
|
||||
'<a href="http://user@example.com/" title="http://user@example.com/" rel="external">http://user@example.com</a>'),
|
||||
array('http://user:pass@example.com',
|
||||
'<a href="http://user:pass@example.com/" rel="external">http://user:pass@example.com</a>'),
|
||||
'<a href="http://user:pass@example.com/" title="http://user:pass@example.com/" rel="external">http://user:pass@example.com</a>'),
|
||||
array('http://example.com:8080',
|
||||
'<a href="http://example.com:8080/" rel="external">http://example.com:8080</a>'),
|
||||
'<a href="http://example.com:8080/" title="http://example.com:8080/" rel="external">http://example.com:8080</a>'),
|
||||
array('http://example.com:8080/test.php',
|
||||
'<a href="http://example.com:8080/test.php" rel="external">http://example.com:8080/test.php</a>'),
|
||||
'<a href="http://example.com:8080/test.php" title="http://example.com:8080/test.php" rel="external">http://example.com:8080/test.php</a>'),
|
||||
array('example.com:8080/test.php',
|
||||
'<a href="http://example.com:8080/test.php" rel="external">example.com:8080/test.php</a>'),
|
||||
'<a href="http://example.com:8080/test.php" title="http://example.com:8080/test.php" rel="external">example.com:8080/test.php</a>'),
|
||||
array('http://www.example.com',
|
||||
'<a href="http://www.example.com/" rel="external">http://www.example.com</a>'),
|
||||
'<a href="http://www.example.com/" title="http://www.example.com/" rel="external">http://www.example.com</a>'),
|
||||
array('http://example.com/',
|
||||
'<a href="http://example.com/" rel="external">http://example.com/</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com/</a>'),
|
||||
array('http://example.com/path',
|
||||
'<a href="http://example.com/path" rel="external">http://example.com/path</a>'),
|
||||
'<a href="http://example.com/path" title="http://example.com/path" rel="external">http://example.com/path</a>'),
|
||||
array('http://example.com/path.html',
|
||||
'<a href="http://example.com/path.html" rel="external">http://example.com/path.html</a>'),
|
||||
'<a href="http://example.com/path.html" title="http://example.com/path.html" rel="external">http://example.com/path.html</a>'),
|
||||
array('http://example.com/path.html#fragment',
|
||||
'<a href="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
|
||||
'<a href="http://example.com/path.html#fragment" title="http://example.com/path.html#fragment" rel="external">http://example.com/path.html#fragment</a>'),
|
||||
array('http://example.com/path.php?foo=bar&bar=foo',
|
||||
'<a href="http://example.com/path.php?foo=bar&bar=foo" rel="external">http://example.com/path.php?foo=bar&bar=foo</a>'),
|
||||
'<a href="http://example.com/path.php?foo=bar&bar=foo" title="http://example.com/path.php?foo=bar&bar=foo" rel="external">http://example.com/path.php?foo=bar&bar=foo</a>'),
|
||||
array('http://example.com.',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>.'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>.'),
|
||||
array('http://müllärör.de',
|
||||
'<a href="http://müllärör.de/" rel="external">http://müllärör.de</a>'),
|
||||
'<a href="http://müllärör.de/" title="http://müllärör.de/" rel="external">http://müllärör.de</a>'),
|
||||
array('http://ﺱﺲﺷ.com',
|
||||
'<a href="http://ﺱﺲﺷ.com/" rel="external">http://ﺱﺲﺷ.com</a>'),
|
||||
'<a href="http://ﺱﺲﺷ.com/" title="http://ﺱﺲﺷ.com/" rel="external">http://ﺱﺲﺷ.com</a>'),
|
||||
array('http://сделаткартинки.com',
|
||||
'<a href="http://сделаткартинки.com/" rel="external">http://сделаткартинки.com</a>'),
|
||||
'<a href="http://сделаткартинки.com/" title="http://сделаткартинки.com/" rel="external">http://сделаткартинки.com</a>'),
|
||||
array('http://tūdaliņ.lv',
|
||||
'<a href="http://tūdaliņ.lv/" rel="external">http://tūdaliņ.lv</a>'),
|
||||
'<a href="http://tūdaliņ.lv/" title="http://tūdaliņ.lv/" rel="external">http://tūdaliņ.lv</a>'),
|
||||
array('http://brændendekærlighed.com',
|
||||
'<a href="http://brændendekærlighed.com/" rel="external">http://brændendekærlighed.com</a>'),
|
||||
'<a href="http://brændendekærlighed.com/" title="http://brændendekærlighed.com/" rel="external">http://brændendekærlighed.com</a>'),
|
||||
array('http://あーるいん.com',
|
||||
'<a href="http://あーるいん.com/" rel="external">http://あーるいん.com</a>'),
|
||||
'<a href="http://あーるいん.com/" title="http://あーるいん.com/" rel="external">http://あーるいん.com</a>'),
|
||||
array('http://예비교사.com',
|
||||
'<a href="http://예비교사.com/" rel="external">http://예비교사.com</a>'),
|
||||
'<a href="http://예비교사.com/" title="http://예비교사.com/" rel="external">http://예비교사.com</a>'),
|
||||
array('http://example.com.',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>.'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>.'),
|
||||
array('http://example.com?',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>?'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>?'),
|
||||
array('http://example.com!',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>!'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>!'),
|
||||
array('http://example.com,',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>,'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>,'),
|
||||
array('http://example.com;',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>;'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>;'),
|
||||
array('http://example.com:',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>:'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>:'),
|
||||
array('\'http://example.com\'',
|
||||
'\'<a href="http://example.com/" rel="external">http://example.com</a>\''),
|
||||
'\'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>\''),
|
||||
array('"http://example.com"',
|
||||
'"<a href="http://example.com/" rel="external">http://example.com</a>"'),
|
||||
'"<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>"'),
|
||||
array('http://example.com',
|
||||
'<a href="http://example.com/" rel="external">http://example.com</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>'),
|
||||
array('(http://example.com)',
|
||||
'(<a href="http://example.com/" rel="external">http://example.com</a>)'),
|
||||
'(<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>)'),
|
||||
array('[http://example.com]',
|
||||
'[<a href="http://example.com/" rel="external">http://example.com</a>]'),
|
||||
'[<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>]'),
|
||||
array('<http://example.com>',
|
||||
'<<a href="http://example.com/" rel="external">http://example.com</a>>'),
|
||||
'<<a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a>>'),
|
||||
array('http://example.com/path/(foo)/bar',
|
||||
'<a href="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
|
||||
'<a href="http://example.com/path/(foo)/bar" title="http://example.com/path/(foo)/bar" rel="external">http://example.com/path/(foo)/bar</a>'),
|
||||
array('http://example.com/path/[foo]/bar',
|
||||
'<a href="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
|
||||
'<a href="http://example.com/path/[foo]/bar" title="http://example.com/path/[foo]/bar" rel="external">http://example.com/path/[foo]/bar</a>'),
|
||||
array('http://example.com/path/foo/(bar)',
|
||||
'<a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
|
||||
'<a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>'),
|
||||
//Not a valid url - urls cannot contain unencoded square brackets
|
||||
array('http://example.com/path/foo/[bar]',
|
||||
'<a href="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
|
||||
'<a href="http://example.com/path/foo/[bar]" title="http://example.com/path/foo/[bar]" rel="external">http://example.com/path/foo/[bar]</a>'),
|
||||
array('Hey, check out my cool site http://example.com okay?',
|
||||
'Hey, check out my cool site <a href="http://example.com/" rel="external">http://example.com</a> okay?'),
|
||||
'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">http://example.com</a> okay?'),
|
||||
array('What about parens (e.g. http://example.com/path/foo/(bar))?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)?'),
|
||||
array('What about parens (e.g. http://example.com/path/foo/(bar)?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>?'),
|
||||
array('What about parens (e.g. http://example.com/path/foo/(bar).)?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>.)?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>.)?'),
|
||||
//Not a valid url - urls cannot contain unencoded commas
|
||||
array('What about parens (e.g. http://example.com/path/(foo,bar)?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" rel="external">http://example.com/path/(foo,bar)</a>?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" title="http://example.com/path/(foo,bar)" rel="external">http://example.com/path/(foo,bar)</a>?'),
|
||||
array('Unbalanced too (e.g. http://example.com/path/((((foo)/bar)?',
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/((((foo)/bar)" rel="external">http://example.com/path/((((foo)/bar)</a>?'),
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/((((foo)/bar)" title="http://example.com/path/((((foo)/bar)" rel="external">http://example.com/path/((((foo)/bar)</a>?'),
|
||||
array('Unbalanced too (e.g. http://example.com/path/(foo))))/bar)?',
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/(foo))))/bar" rel="external">http://example.com/path/(foo))))/bar</a>)?'),
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/(foo))))/bar" title="http://example.com/path/(foo))))/bar" rel="external">http://example.com/path/(foo))))/bar</a>)?'),
|
||||
array('Unbalanced too (e.g. http://example.com/path/foo/((((bar)?',
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/foo/((((bar)" rel="external">http://example.com/path/foo/((((bar)</a>?'),
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/foo/((((bar)" title="http://example.com/path/foo/((((bar)" rel="external">http://example.com/path/foo/((((bar)</a>?'),
|
||||
array('Unbalanced too (e.g. http://example.com/path/foo/(bar))))?',
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)))?'),
|
||||
'Unbalanced too (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">http://example.com/path/foo/(bar)</a>)))?'),
|
||||
array('example.com',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
|
||||
array('example.org',
|
||||
'<a href="http://example.org/" rel="external">example.org</a>'),
|
||||
'<a href="http://example.org/" title="http://example.org/" rel="external">example.org</a>'),
|
||||
array('example.co.uk',
|
||||
'<a href="http://example.co.uk/" rel="external">example.co.uk</a>'),
|
||||
'<a href="http://example.co.uk/" title="http://example.co.uk/" rel="external">example.co.uk</a>'),
|
||||
array('www.example.co.uk',
|
||||
'<a href="http://www.example.co.uk/" rel="external">www.example.co.uk</a>'),
|
||||
'<a href="http://www.example.co.uk/" title="http://www.example.co.uk/" rel="external">www.example.co.uk</a>'),
|
||||
array('farm1.images.example.co.uk',
|
||||
'<a href="http://farm1.images.example.co.uk/" rel="external">farm1.images.example.co.uk</a>'),
|
||||
'<a href="http://farm1.images.example.co.uk/" title="http://farm1.images.example.co.uk/" rel="external">farm1.images.example.co.uk</a>'),
|
||||
array('example.museum',
|
||||
'<a href="http://example.museum/" rel="external">example.museum</a>'),
|
||||
'<a href="http://example.museum/" title="http://example.museum/" rel="external">example.museum</a>'),
|
||||
array('example.travel',
|
||||
'<a href="http://example.travel/" rel="external">example.travel</a>'),
|
||||
'<a href="http://example.travel/" title="http://example.travel/" rel="external">example.travel</a>'),
|
||||
array('example.com.',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>.'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.'),
|
||||
array('example.com?',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>?'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>?'),
|
||||
array('example.com!',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>!'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>!'),
|
||||
array('example.com,',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>,'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>,'),
|
||||
array('example.com;',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>;'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>;'),
|
||||
array('example.com:',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>:'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>:'),
|
||||
array('\'example.com\'',
|
||||
'\'<a href="http://example.com/" rel="external">example.com</a>\''),
|
||||
'\'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>\''),
|
||||
array('"example.com"',
|
||||
'"<a href="http://example.com/" rel="external">example.com</a>"'),
|
||||
'"<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>"'),
|
||||
array('example.com',
|
||||
'<a href="http://example.com/" rel="external">example.com</a>'),
|
||||
'<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>'),
|
||||
array('(example.com)',
|
||||
'(<a href="http://example.com/" rel="external">example.com</a>)'),
|
||||
'(<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>)'),
|
||||
array('[example.com]',
|
||||
'[<a href="http://example.com/" rel="external">example.com</a>]'),
|
||||
'[<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>]'),
|
||||
array('<example.com>',
|
||||
'<<a href="http://example.com/" rel="external">example.com</a>>'),
|
||||
'<<a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>>'),
|
||||
array('Hey, check out my cool site example.com okay?',
|
||||
'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a> okay?'),
|
||||
'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a> okay?'),
|
||||
array('Hey, check out my cool site example.com.I made it.',
|
||||
'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.I made it.'),
|
||||
'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.I made it.'),
|
||||
array('Hey, check out my cool site example.com.Funny thing...',
|
||||
'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.Funny thing...'),
|
||||
'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.Funny thing...'),
|
||||
array('Hey, check out my cool site example.com.You will love it.',
|
||||
'Hey, check out my cool site <a href="http://example.com/" rel="external">example.com</a>.You will love it.'),
|
||||
'Hey, check out my cool site <a href="http://example.com/" title="http://example.com/" rel="external">example.com</a>.You will love it.'),
|
||||
array('What about parens (e.g. example.com/path/foo/(bar))?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>)?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>)?'),
|
||||
array('What about parens (e.g. example.com/path/foo/(bar)?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>?'),
|
||||
array('What about parens (e.g. example.com/path/foo/(bar).)?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>.)?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/foo/(bar)" title="http://example.com/path/foo/(bar)" rel="external">example.com/path/foo/(bar)</a>.)?'),
|
||||
array('What about parens (e.g. example.com/path/(foo,bar)?',
|
||||
'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" rel="external">example.com/path/(foo,bar)</a>?'),
|
||||
'What about parens (e.g. <a href="http://example.com/path/(foo,bar)" title="http://example.com/path/(foo,bar)" rel="external">example.com/path/(foo,bar)</a>?'),
|
||||
array('file.ext',
|
||||
'file.ext'),
|
||||
array('file.html',
|
||||
|
|
|
|||
59
tests/UserRightsTest.php
Normal file
59
tests/UserRightsTest.php
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
<?php
|
||||
|
||||
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
||||
print "This script must be run from the command line\n";
|
||||
exit();
|
||||
}
|
||||
|
||||
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||
define('STATUSNET', true);
|
||||
|
||||
require_once INSTALLDIR . '/lib/common.php';
|
||||
|
||||
class UserRightsTest extends PHPUnit_Framework_TestCase
|
||||
{
|
||||
protected $user = null;
|
||||
|
||||
function setUp()
|
||||
{
|
||||
$this->user = User::register(array('nickname' => 'userrightstestuser'));
|
||||
}
|
||||
|
||||
function tearDown()
|
||||
{
|
||||
$profile = $this->user->getProfile();
|
||||
$this->user->delete();
|
||||
$profile->delete();
|
||||
}
|
||||
|
||||
function testInvalidRole()
|
||||
{
|
||||
$this->assertFalse($this->user->hasRole('invalidrole'));
|
||||
}
|
||||
|
||||
function standardRoles()
|
||||
{
|
||||
return array('admin', 'moderator');
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider standardRoles
|
||||
*
|
||||
*/
|
||||
|
||||
function testUngrantedRole($role)
|
||||
{
|
||||
$this->assertFalse($this->user->hasRole($role));
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider standardRoles
|
||||
*
|
||||
*/
|
||||
|
||||
function testGrantedRole($role)
|
||||
{
|
||||
$this->user->grantRole($role);
|
||||
$this->assertFalse($this->user->hasRole($role));
|
||||
}
|
||||
}
|
||||
|
|
@ -484,7 +484,7 @@ height:16px;
|
|||
#form_notice .form_note {
|
||||
position:absolute;
|
||||
bottom:2px;
|
||||
right:98px;
|
||||
right:21.715%;
|
||||
z-index:9;
|
||||
}
|
||||
#form_notice .form_note dt {
|
||||
|
|
|
|||
|
|
@ -120,6 +120,10 @@ float:left;
|
|||
margin-left:11px;
|
||||
float:left;
|
||||
}
|
||||
.form_settings .form_data textarea {
|
||||
width:325px;
|
||||
}
|
||||
|
||||
.form_settings .form_data input.submit {
|
||||
margin-left:0;
|
||||
}
|
||||
|
|
@ -968,9 +972,6 @@ right:7px;
|
|||
top:47px;
|
||||
right:7px;
|
||||
}
|
||||
.notice-options .notice_reply dt {
|
||||
display:none;
|
||||
}
|
||||
|
||||
.notice-options input,
|
||||
.notice-options a {
|
||||
|
|
@ -978,13 +979,13 @@ text-indent:-9999px;
|
|||
outline:none;
|
||||
}
|
||||
|
||||
.notice-options .notice_reply a,
|
||||
.notice-options .notice_reply,
|
||||
.notice-options input.submit {
|
||||
display:block;
|
||||
border:0;
|
||||
}
|
||||
.notice-options .notice_reply a,
|
||||
.notice-options .notice_delete a {
|
||||
.notice-options .notice_reply,
|
||||
.notice-options .notice_delete {
|
||||
text-decoration:none;
|
||||
padding-left:16px;
|
||||
}
|
||||
|
|
@ -1375,6 +1376,12 @@ padding-top:160px;
|
|||
#smssettings #form_notice,
|
||||
#twittersettings #form_notice,
|
||||
#imsettings #form_notice,
|
||||
#userdesignsettings #form_notice,
|
||||
#groupdesignsettings #form_notice,
|
||||
#grouplogo #form_notice,
|
||||
#editgroup #form_notice,
|
||||
#blockedfromgroup #form_notice,
|
||||
#groupmembers #form_notice,
|
||||
#doc #form_notice,
|
||||
#usergroups #form_notice,
|
||||
#invite #form_notice,
|
||||
|
|
@ -1584,11 +1591,11 @@ background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no
|
|||
background:none;
|
||||
}
|
||||
|
||||
.notice-options .notice_reply a,
|
||||
.notice-options .notice_reply,
|
||||
.notice-options form input.submit {
|
||||
background-color:transparent;
|
||||
}
|
||||
.notice-options .notice_reply a {
|
||||
.notice-options .notice_reply {
|
||||
background:transparent url(../images/icons/icon_reply.gif) no-repeat 0 45%;
|
||||
}
|
||||
.notice-options form.form_favor input.submit {
|
||||
|
|
@ -1597,7 +1604,7 @@ background:transparent url(../images/icons/icon_favourite.gif) no-repeat 0 45%;
|
|||
.notice-options form.form_disfavor input.submit {
|
||||
background:transparent url(../images/icons/icon_disfavourite.gif) no-repeat 0 45%;
|
||||
}
|
||||
.notice-options .notice_delete a {
|
||||
.notice-options .notice_delete {
|
||||
background:transparent url(../images/icons/icon_trash.gif) no-repeat 0 45%;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user