Merge branch '0.8.x' into 0.9.x
Conflicts: actions/requesttoken.php classes/File.php install.php lib/noticeform.php
This commit is contained in:
Evan Prodromou
commit
8284b3cb82
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -433,13 +433,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();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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()
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,10 +37,10 @@ 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>
|
||||
* **last <nickname>**: Same as 'get'
|
||||
* **whois <nickname>**: Get Profile info on <nickname>
|
||||
* **fav <nickname>**: Add user's last notice as a favorite
|
||||
* **fav <nickname>**: Add user's last notice as a favorite
|
||||
|
|
|
|||
|
|
@ -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
|
|
@ -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')) {
|
||||
return false;
|
||||
}
|
||||
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']);
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
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,13 +83,14 @@ 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;
|
||||
} else {
|
||||
|
|
@ -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');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -261,7 +261,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 +418,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 +450,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')));
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
|
|
|
|||
14
lib/util.php
14
lib/util.php
|
|
@ -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';
|
||||
|
|
@ -552,12 +552,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 +1394,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;
|
||||
row = eval("(" + row + ")");
|
||||
switch(row.type)
|
||||
{
|
||||
case 'user':
|
||||
return row.nickname;
|
||||
case 'group':
|
||||
return row.nickname;
|
||||
}
|
||||
},
|
||||
formatResult: function(row){
|
||||
return '@' + row.screen_name;
|
||||
row = eval("(" + row + ")");
|
||||
switch(row.type)
|
||||
{
|
||||
case 'user':
|
||||
return '@' + row.nickname;
|
||||
case 'group':
|
||||
return '!' + row.nickname;
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
);
|
||||
$.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;
|
||||
},
|
||||
formatResult: function(row){
|
||||
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'));
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,90 @@
|
|||
<?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;
|
||||
|
||||
function prepare($args)
|
||||
{
|
||||
parent::prepare($args);
|
||||
$this->results = 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);
|
||||
$this->results[]=array('nickname' => $user->nickname, 'fullname'=> $profile->fullname, 'type'=>'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->results[]=array('nickname' => $group->nickname, 'fullname'=> $group->fullname, 'type'=>'group');
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function handle($args)
|
||||
{
|
||||
parent::handle($args);
|
||||
foreach($this->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 @@
|
|||
}
|
||||
});
|
||||
|
||||
// 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
|
||||
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,21 +1,37 @@
|
|||
// 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()
|
||||
{
|
||||
return {
|
||||
return {
|
||||
|
||||
init: function(server, port, timeline)
|
||||
{
|
||||
Meteor.callbacks["process"] = function(data) {
|
||||
RealtimeUpdate.receive(JSON.parse(data));
|
||||
};
|
||||
init: function(server, port, timeline)
|
||||
{
|
||||
Meteor.callbacks["process"] = function(data) {
|
||||
var d = JSON.parse(data);
|
||||
|
||||
Meteor.host = server;
|
||||
Meteor.port = port;
|
||||
Meteor.joinChannel(timeline, 0);
|
||||
Meteor.connect();
|
||||
}
|
||||
}
|
||||
var user_url = $('address .url')[0].href+d['user']['screen_name'];
|
||||
|
||||
var wlh = window.location.href;
|
||||
|
||||
if (wlh.indexOf('?') > 0) {
|
||||
wlh = wlh.slice(0, wlh.indexOf('?'))
|
||||
}
|
||||
|
||||
if (timeline == 'public' ||
|
||||
user_url+'/all' == wlh ||
|
||||
user_url == wlh) {
|
||||
|
||||
RealtimeUpdate.receive(d);
|
||||
}
|
||||
};
|
||||
|
||||
Meteor.host = server;
|
||||
Meteor.port = port;
|
||||
Meteor.joinChannel(timeline, 0);
|
||||
Meteor.connect();
|
||||
}
|
||||
}
|
||||
}();
|
||||
|
||||
|
|
|
|||
|
|
@ -59,9 +59,9 @@ if (!defined('STATUSNET')) {
|
|||
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
|
||||
|
|
@ -96,7 +96,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 ) {}
|
||||
|
|
@ -108,4 +108,4 @@ ENDOFPIWIK;
|
|||
$action->raw($piwikCode);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,20 +63,22 @@ class RealtimePlugin extends Plugin
|
|||
{
|
||||
$path = null;
|
||||
|
||||
switch ($action->trimmed('action')) {
|
||||
case 'public':
|
||||
$path = array('public');
|
||||
break;
|
||||
case 'tag':
|
||||
$tag = $action->trimmed('tag');
|
||||
if (!empty($tag)) {
|
||||
$path = array('tag', $tag);
|
||||
} else {
|
||||
$a = $action->trimmed('action');
|
||||
|
||||
switch ($a) {
|
||||
case 'public': case 'all': case 'replies': case 'showstream':
|
||||
$path = array($a);
|
||||
break;
|
||||
case 'tag':
|
||||
$tag = $action->trimmed('tag');
|
||||
if (!empty($tag)) {
|
||||
$path = array('tag', $tag);
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
|
||||
$timeline = $this->_pathToChannel($path);
|
||||
|
|
@ -95,10 +97,16 @@ class RealtimePlugin extends Plugin
|
|||
$user_id = 0;
|
||||
}
|
||||
|
||||
$action->script('plugins/Realtime/jquery.getUrlParam.js');
|
||||
|
||||
$action->elementStart('script', array('type' => 'text/javascript'));
|
||||
$action->raw("$(document).ready(function() { ");
|
||||
$action->raw($this->_updateInitialize($timeline, $user_id));
|
||||
$action->raw(" });");
|
||||
$action->raw('
|
||||
<!--
|
||||
$(document).ready(function() {
|
||||
' . $this->_updateInitialize($timeline, $user_id) . '
|
||||
});
|
||||
-->
|
||||
');
|
||||
$action->elementEnd('script');
|
||||
|
||||
return true;
|
||||
|
|
@ -108,11 +116,13 @@ class RealtimePlugin extends Plugin
|
|||
{
|
||||
$paths = array();
|
||||
|
||||
// XXX: Add other timelines; this is just for the public one
|
||||
// TODO: Replies timeline
|
||||
|
||||
if ($notice->is_local ||
|
||||
($notice->is_local == 0 && !common_config('public', 'localonly'))) {
|
||||
$paths[] = array('public');
|
||||
foreach (array('public', 'all', 'replies', 'showstream') as $a) {
|
||||
$paths[] = array($a);
|
||||
}
|
||||
}
|
||||
|
||||
$tags = $this->getNoticeTags($notice);
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 90 B |
|
|
@ -0,0 +1,72 @@
|
|||
/* 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;
|
||||
}
|
||||
});
|
||||
|
|
@ -1,135 +1,152 @@
|
|||
// add a notice encoded as JSON into the current timeline
|
||||
//
|
||||
$(document).ready(function() {
|
||||
if (!$(document).getUrlParam('realtime')) {
|
||||
$('#site_nav_local_views .current a').append('<button id="realtime_timeline" title="Pop this tab">↗</button>');
|
||||
|
||||
RealtimeUpdate = {
|
||||
$('#realtime_timeline').css({
|
||||
'margin':'2px 0 0 11px',
|
||||
'background':'transparent url('+$('address .url')[0].href+'/plugins/Realtime/icon_external.gif) no-repeat 45% 45%',
|
||||
'text-indent':'-9999px',
|
||||
'width':'16px',
|
||||
'height':'16px',
|
||||
'padding':'0',
|
||||
'display':'block',
|
||||
'float':'right',
|
||||
'border':'none',
|
||||
'cursor':'pointer'
|
||||
});
|
||||
|
||||
_userid: 0,
|
||||
_replyurl: '',
|
||||
_favorurl: '',
|
||||
_deleteurl: '',
|
||||
$('#realtime_timeline').click(function() {
|
||||
window.open($(this).parent('a').attr('href')+'?realtime=1',
|
||||
$(this).parent('a').attr('title'),
|
||||
'toolbar=no,resizable=yes,scrollbars=yes,status=yes');
|
||||
|
||||
init: function(userid, replyurl, favorurl, deleteurl)
|
||||
{
|
||||
RealtimeUpdate._userid = userid;
|
||||
RealtimeUpdate._replyurl = replyurl;
|
||||
RealtimeUpdate._favorurl = favorurl;
|
||||
RealtimeUpdate._deleteurl = deleteurl;
|
||||
},
|
||||
return false;
|
||||
});
|
||||
}
|
||||
else {
|
||||
window.resizeTo(575, 640);
|
||||
address = $('address');
|
||||
content = $('#content');
|
||||
$('body').html(address);
|
||||
$('address').hide();
|
||||
$('body').append(content);
|
||||
$('#content').css({'width':'92%'});
|
||||
}
|
||||
|
||||
receive: function(data)
|
||||
{
|
||||
id = data.id;
|
||||
|
||||
// Don't add it if it already exists
|
||||
// add a notice encoded as JSON into the current timeline
|
||||
//
|
||||
// TODO: i18n
|
||||
|
||||
if ($("#notice-"+id).length > 0) {
|
||||
return;
|
||||
}
|
||||
RealtimeUpdate = {
|
||||
_userid: 0,
|
||||
_replyurl: '',
|
||||
_favorurl: '',
|
||||
_deleteurl: '',
|
||||
|
||||
var noticeItem = RealtimeUpdate.makeNoticeItem(data);
|
||||
$("#notices_primary .notices").prepend(noticeItem, true);
|
||||
$("#notices_primary .notice:first").css({display:"none"});
|
||||
$("#notices_primary .notice:first").fadeIn(1000);
|
||||
NoticeReply();
|
||||
},
|
||||
init: function(userid, replyurl, favorurl, deleteurl)
|
||||
{
|
||||
RealtimeUpdate._userid = userid;
|
||||
RealtimeUpdate._replyurl = replyurl;
|
||||
RealtimeUpdate._favorurl = favorurl;
|
||||
RealtimeUpdate._deleteurl = deleteurl;
|
||||
},
|
||||
|
||||
makeNoticeItem: function(data)
|
||||
{
|
||||
user = data['user'];
|
||||
html = data['html'].replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"');
|
||||
source = data['source'].replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"');
|
||||
receive: function(data)
|
||||
{
|
||||
id = data.id;
|
||||
|
||||
ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
|
||||
"<div class=\"entry-title\">"+
|
||||
"<span class=\"vcard author\">"+
|
||||
"<a href=\""+user['profile_url']+"\" class=\"url\">"+
|
||||
"<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
|
||||
"<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
|
||||
"</a>"+
|
||||
"</span>"+
|
||||
"<p class=\"entry-content\">"+html+"</p>"+
|
||||
"</div>"+
|
||||
"<div class=\"entry-content\">"+
|
||||
"<dl class=\"timestamp\">"+
|
||||
"<dt>Published</dt>"+
|
||||
"<dd>"+
|
||||
"<a 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>";
|
||||
// Don't add it if it already exists
|
||||
|
||||
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>";
|
||||
}
|
||||
if ($("#notice-"+id).length > 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
ni = ni+"</div>"+
|
||||
"<div class=\"notice-options\">";
|
||||
var noticeItem = RealtimeUpdate.makeNoticeItem(data);
|
||||
$("#notices_primary .notices").prepend(noticeItem, true);
|
||||
$("#notices_primary .notice:first").css({display:"none"});
|
||||
$("#notices_primary .notice:first").fadeIn(1000);
|
||||
NoticeReply();
|
||||
},
|
||||
|
||||
if (RealtimeUpdate._userid != 0) {
|
||||
var input = $("form#form_notice fieldset input#token");
|
||||
var session_key = input.val();
|
||||
ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
|
||||
ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
|
||||
if (RealtimeUpdate._userid == data['user']['id']) {
|
||||
makeNoticeItem: function(data)
|
||||
{
|
||||
user = data['user'];
|
||||
html = data['html'].replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"');
|
||||
source = data['source'].replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"');
|
||||
|
||||
ni = "<li class=\"hentry notice\" id=\"notice-"+data['id']+"\">"+
|
||||
"<div class=\"entry-title\">"+
|
||||
"<span class=\"vcard author\">"+
|
||||
"<a href=\""+user['profile_url']+"\" class=\"url\">"+
|
||||
"<img src=\""+user['profile_image_url']+"\" class=\"avatar photo\" width=\"48\" height=\"48\" alt=\""+user['screen_name']+"\"/>"+
|
||||
"<span class=\"nickname fn\">"+user['screen_name']+"</span>"+
|
||||
"</a>"+
|
||||
"</span>"+
|
||||
"<p class=\"entry-content\">"+html+"</p>"+
|
||||
"</div>"+
|
||||
"<div class=\"entry-content\">"+
|
||||
"<a class=\"timestamp\" rel=\"bookmark\" href=\""+data['url']+"\" >"+
|
||||
"<abbr class=\"published\" title=\""+data['created_at']+"\">a few seconds ago</abbr>"+
|
||||
"</a> "+
|
||||
"<span class=\"source\">"+
|
||||
"from "+
|
||||
"<span class=\"device\">"+source+"</span>"+ // may have a link
|
||||
"</span>";
|
||||
if (data['in_reply_to_status_id']) {
|
||||
ni = ni+" <a class=\"response\" href=\""+data['in_reply_to_status_url']+"\">in context</a>";
|
||||
}
|
||||
|
||||
ni = ni+"</div>"+
|
||||
"<div class=\"notice-options\">";
|
||||
|
||||
if (RealtimeUpdate._userid != 0) {
|
||||
var input = $("form#form_notice fieldset input#token");
|
||||
var session_key = input.val();
|
||||
ni = ni+RealtimeUpdate.makeFavoriteForm(data['id'], session_key);
|
||||
ni = ni+RealtimeUpdate.makeReplyLink(data['id'], data['user']['screen_name']);
|
||||
if (RealtimeUpdate._userid == data['user']['id']) {
|
||||
ni = ni+RealtimeUpdate.makeDeleteLink(data['id']);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
ni = ni+"</div>"+
|
||||
"</li>";
|
||||
return ni;
|
||||
},
|
||||
ni = ni+"</div>"+
|
||||
"</li>";
|
||||
return ni;
|
||||
},
|
||||
|
||||
makeFavoriteForm: function(id, session_key)
|
||||
{
|
||||
var ff;
|
||||
makeFavoriteForm: function(id, session_key)
|
||||
{
|
||||
var ff;
|
||||
|
||||
ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
|
||||
"<fieldset>"+
|
||||
"<legend>Favor this notice</legend>"+ // XXX: i18n
|
||||
"<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\"/>"+
|
||||
"</fieldset>"+
|
||||
"</form>";
|
||||
return ff;
|
||||
},
|
||||
ff = "<form id=\"favor-"+id+"\" class=\"form_favor\" method=\"post\" action=\""+RealtimeUpdate._favorurl+"\">"+
|
||||
"<fieldset>"+
|
||||
"<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\"/>"+
|
||||
"</fieldset>"+
|
||||
"</form>";
|
||||
return ff;
|
||||
},
|
||||
|
||||
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>";
|
||||
return rl;
|
||||
},
|
||||
makeReplyLink: function(id, nickname)
|
||||
{
|
||||
var rl;
|
||||
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;
|
||||
},
|
||||
|
||||
makeDeleteLink: function(id)
|
||||
{
|
||||
var dl, delurl;
|
||||
delurl = RealtimeUpdate._deleteurl.replace("0000000000", id);
|
||||
makeDeleteLink: function(id)
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
return dl;
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -27,6 +27,8 @@ 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/" 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>'),
|
||||
array('127.0.0.1',
|
||||
|
|
|
|||
|
|
@ -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