Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
This commit is contained in:
Sarven Capadisli
commit
b5d9d0562a
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');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
@ -345,7 +345,12 @@ class ShowgroupAction extends GroupDesignAction
|
||||||
'method' => 'timeline',
|
'method' => 'timeline',
|
||||||
'argument' => $this->group->nickname.'.atom')),
|
'argument' => $this->group->nickname.'.atom')),
|
||||||
sprintf(_('Notice feed for %s group (Atom)'),
|
sprintf(_('Notice feed for %s group (Atom)'),
|
||||||
$this->group->nickname)));
|
$this->group->nickname)),
|
||||||
|
new Feed(Feed::FOAF,
|
||||||
|
common_local_url('foafgroup',
|
||||||
|
array('nickname' => $this->group->nickname)),
|
||||||
|
sprintf(_('FOAF for %s group'),
|
||||||
|
$this->group->nickname)));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -241,6 +241,10 @@ class Router
|
||||||
array('nickname' => '[a-zA-Z0-9]+'));
|
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',
|
$m->connect('group/:nickname/blocked',
|
||||||
array('action' => 'blockedfromgroup'),
|
array('action' => 'blockedfromgroup'),
|
||||||
array('nickname' => '[a-zA-Z0-9]+'));
|
array('nickname' => '[a-zA-Z0-9]+'));
|
||||||
|
|
|
||||||
|
|
@ -1,72 +0,0 @@
|
||||||
/* Copyright (c) 2006-2007 Mathias Bank (http://www.mathias-bank.de)
|
|
||||||
* Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
|
|
||||||
* and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
|
|
||||||
*
|
|
||||||
* Version 2.1
|
|
||||||
*
|
|
||||||
* Thanks to
|
|
||||||
* Hinnerk Ruemenapf - http://hinnerk.ruemenapf.de/ for bug reporting and fixing.
|
|
||||||
* Tom Leonard for some improvements
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
jQuery.fn.extend({
|
|
||||||
/**
|
|
||||||
* Returns get parameters.
|
|
||||||
*
|
|
||||||
* If the desired param does not exist, null will be returned
|
|
||||||
*
|
|
||||||
* To get the document params:
|
|
||||||
* @example value = $(document).getUrlParam("paramName");
|
|
||||||
*
|
|
||||||
* To get the params of a html-attribut (uses src attribute)
|
|
||||||
* @example value = $('#imgLink').getUrlParam("paramName");
|
|
||||||
*/
|
|
||||||
getUrlParam: function(strParamName){
|
|
||||||
strParamName = escape(unescape(strParamName));
|
|
||||||
|
|
||||||
var returnVal = new Array();
|
|
||||||
var qString = null;
|
|
||||||
|
|
||||||
if ($(this).attr("nodeName")=="#document") {
|
|
||||||
//document-handler
|
|
||||||
|
|
||||||
if (window.location.search.search(strParamName) > -1 ){
|
|
||||||
|
|
||||||
qString = window.location.search.substr(1,window.location.search.length).split("&");
|
|
||||||
}
|
|
||||||
|
|
||||||
} else if ($(this).attr("src")!="undefined") {
|
|
||||||
|
|
||||||
var strHref = $(this).attr("src")
|
|
||||||
if ( strHref.indexOf("?") > -1 ){
|
|
||||||
var strQueryString = strHref.substr(strHref.indexOf("?")+1);
|
|
||||||
qString = strQueryString.split("&");
|
|
||||||
}
|
|
||||||
} else if ($(this).attr("href")!="undefined") {
|
|
||||||
|
|
||||||
var strHref = $(this).attr("href")
|
|
||||||
if ( strHref.indexOf("?") > -1 ){
|
|
||||||
var strQueryString = strHref.substr(strHref.indexOf("?")+1);
|
|
||||||
qString = strQueryString.split("&");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (qString==null) return null;
|
|
||||||
|
|
||||||
|
|
||||||
for (var i=0;i<qString.length; i++){
|
|
||||||
if (escape(unescape(qString[i].split("=")[0])) == strParamName){
|
|
||||||
returnVal.push(qString[i].split("=")[1]);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
if (returnVal.length==0) return null;
|
|
||||||
else if (returnVal.length==1) return returnVal[0];
|
|
||||||
else return returnVal;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
@ -30,19 +30,20 @@ RealtimeUpdate = {
|
||||||
|
|
||||||
receive: function(data)
|
receive: function(data)
|
||||||
{
|
{
|
||||||
id = data.id;
|
setTimeout(function() {
|
||||||
|
id = data.id;
|
||||||
|
|
||||||
// Don't add it if it already exists
|
// Don't add it if it already exists
|
||||||
//
|
if ($("#notice-"+id).length > 0) {
|
||||||
if ($("#notice-"+id).length > 0) {
|
return;
|
||||||
return;
|
}
|
||||||
}
|
|
||||||
|
var noticeItem = RealtimeUpdate.makeNoticeItem(data);
|
||||||
var noticeItem = RealtimeUpdate.makeNoticeItem(data);
|
$("#notices_primary .notices").prepend(noticeItem);
|
||||||
$("#notices_primary .notices").prepend(noticeItem);
|
$("#notices_primary .notice:first").css({display:"none"});
|
||||||
$("#notices_primary .notice:first").css({display:"none"});
|
$("#notices_primary .notice:first").fadeIn(1000);
|
||||||
$("#notices_primary .notice:first").fadeIn(1000);
|
NoticeReply();
|
||||||
NoticeReply();
|
}, 500);
|
||||||
},
|
},
|
||||||
|
|
||||||
makeNoticeItem: function(data)
|
makeNoticeItem: function(data)
|
||||||
|
|
@ -125,14 +126,17 @@ RealtimeUpdate = {
|
||||||
|
|
||||||
addPopup: function(url, timeline, iconurl)
|
addPopup: function(url, timeline, iconurl)
|
||||||
{
|
{
|
||||||
$('#content').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
|
$('#notices_primary').css({'position':'relative'});
|
||||||
|
$('#notices_primary').prepend('<button id="realtime_timeline" title="Pop up in a window">Pop up</button>');
|
||||||
|
|
||||||
$('#realtime_timeline').css({
|
$('#realtime_timeline').css({
|
||||||
'margin':'0 0 18px 0',
|
'margin':'0 0 11px 0',
|
||||||
'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
|
'background':'transparent url('+ iconurl + ') no-repeat 0% 30%',
|
||||||
'padding':'0 0 0 20px',
|
'padding':'0 0 0 20px',
|
||||||
'display':'block',
|
'display':'block',
|
||||||
'float':'right',
|
'position':'absolute',
|
||||||
|
'top':'-20px',
|
||||||
|
'right':'0',
|
||||||
'border':'none',
|
'border':'none',
|
||||||
'cursor':'pointer',
|
'cursor':'pointer',
|
||||||
'color':$("a").css("color"),
|
'color':$("a").css("color"),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user