wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x

Browse Source
This commit is contained in:
Brion Vibber 2010-02-01 10:30:45 -08:00
commit c14ac57b19
10 changed files with 5187 additions and 3268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
actions/register.php
View File

@ -303,27 +303,6 @@ class RegisterAction extends Action
return ($user !== false); return ($user !== false);
} }
// overrrided to add entry-title class
function showPageTitle() {
if (Event::handle('StartShowPageTitle', array($this))) {
$this->element('h1', array('class' => 'entry-title'), $this->title());
}
}
// overrided to add hentry, and content-inner class
function showContentBlock()
{
$this->elementStart('div', array('id' => 'content', 'class' => 'hentry'));
$this->showPageTitle();
$this->showPageNoticeBlock();
$this->elementStart('div', array('id' => 'content_inner',
'class' => 'entry-content'));
// show the actual content (forms, lists, whatever)
$this->showContent();
$this->elementEnd('div');
$this->elementEnd('div');
}
/** /**
* Instructions or a notice for the page * Instructions or a notice for the page
* *

11
classes/User.php
View File

@ -250,10 +250,6 @@ class User extends Memcached_DataObject
$user->nickname = $nickname; $user->nickname = $nickname;
if (!empty($password)) { // may not have a password for OpenID users
$user->password = common_munge_password($password, $id);
}
// Users who respond to invite email have proven their ownership of that address // Users who respond to invite email have proven their ownership of that address
if (!empty($code)) { if (!empty($code)) {
@ -286,6 +282,9 @@ class User extends Memcached_DataObject
$user->id = $id; $user->id = $id;
$user->uri = common_user_uri($user); $user->uri = common_user_uri($user);
if (!empty($password)) { // may not have a password for OpenID users
$user->password = common_munge_password($password, $id);
}
$result = $user->insert(); $result = $user->insert();
@ -945,9 +944,9 @@ class User extends Memcached_DataObject
$pr->orderBy('created'); $pr->orderBy('created');
$pr->limit(0, 1); $pr->limit(1);
if ($pr->fetch($true)) { if ($pr->find(true)) {
$owner = User::staticGet('id', $pr->profile_id); $owner = User::staticGet('id', $pr->profile_id);
} else { } else {
$owner = null; $owner = null;

1292
js/jquery.form.js
View File

File diff suppressed because it is too large Load Diff

6711
js/jquery.js vendored
View File

File diff suppressed because it is too large Load Diff

164
js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

164
js/util.js
View File

@ -143,87 +143,85 @@ var SN = { // StatusNet
SN.U.Counter(form); SN.U.Counter(form);
}, },
FormXHR: function(f) { FormXHR: function(form) {
if (jQuery.data(f[0], "ElementData") === undefined) { $.ajax({
jQuery.data(f[0], "ElementData", {Bind:'submit'}); type: 'POST',
f.bind('submit', function(e) { dataType: 'xml',
form_id = $(this)[0].id; url: form.attr('action'),
$.ajax({ data: form.serialize() + '&ajax=1',
type: 'POST', beforeSend: function(xhr) {
dataType: 'xml', form
url: $(this)[0].action, .addClass(SN.C.S.Processing)
data: $(this).serialize() + '&ajax=1', .find('.submit')
beforeSend: function(xhr) { .addClass(SN.C.S.Disabled)
$('#'+form_id).addClass(SN.C.S.Processing); .attr(SN.C.S.Disabled, SN.C.S.Disabled);
$('#'+form_id+' .submit').addClass(SN.C.S.Disabled); },
$('#'+form_id+' .submit').attr(SN.C.S.Disabled, SN.C.S.Disabled); error: function (xhr, textStatus, errorThrown) {
}, alert(errorThrown || textStatus);
error: function (xhr, textStatus, errorThrown) { },
alert(errorThrown || textStatus); success: function(data, textStatus) {
}, if (typeof($('form', data)[0]) != 'undefined') {
success: function(data, textStatus) { form_new = document._importNode($('form', data)[0], true);
if (typeof($('form', data)[0]) != 'undefined') { form.replaceWith(form_new);
form_new = document._importNode($('form', data)[0], true); }
$('#'+form_id).replaceWith(form_new); else {
$('#'+form_new.id).each(function() { SN.U.FormXHR($(this)); }); form.replaceWith(document._importNode($('p', data)[0], true));
} }
else { }
$('#'+form_id).replaceWith(document._importNode($('p', data)[0], true)); });
}
}
});
return false;
});
}
}, },
FormNoticeXHR: function(form) { FormNoticeXHR: function(form) {
var NDG, NLat, NLon, NLNS, NLID; SN.C.I.NoticeDataGeo = {};
form_id = form.attr('id'); form_id = form.attr('id');
form.append('<input type="hidden" name="ajax" value="1"/>'); form.append('<input type="hidden" name="ajax" value="1"/>');
form.ajaxForm({ form.ajaxForm({
dataType: 'xml', dataType: 'xml',
timeout: '60000', timeout: '60000',
beforeSend: function(formData) { beforeSend: function(formData) {
if ($('#'+form_id+' #'+SN.C.S.NoticeDataText)[0].value.length === 0) { if (form.find('#'+SN.C.S.NoticeDataText)[0].value.length === 0) {
form.addClass(SN.C.S.Warning); form.addClass(SN.C.S.Warning);
return false; return false;
} }
form.addClass(SN.C.S.Processing); form
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).addClass(SN.C.S.Disabled); .addClass(SN.C.S.Processing)
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).attr(SN.C.S.Disabled, SN.C.S.Disabled); .find('#'+SN.C.S.NoticeActionSubmit)
.addClass(SN.C.S.Disabled)
.attr(SN.C.S.Disabled, SN.C.S.Disabled);
NLat = $('#'+SN.C.S.NoticeLat).val(); SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val();
NLon = $('#'+SN.C.S.NoticeLon).val(); SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val();
NLNS = $('#'+SN.C.S.NoticeLocationNs).val(); SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val();
NLID = $('#'+SN.C.S.NoticeLocationId).val(); SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val();
NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked'); SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked');
cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie); cookieValue = $.cookie(SN.C.S.NoticeDataGeoCookie);
if (cookieValue !== null && cookieValue != 'disabled') { if (cookieValue !== null && cookieValue != 'disabled') {
cookieValue = JSON.parse(cookieValue); cookieValue = JSON.parse(cookieValue);
NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val(); SN.C.I.NoticeDataGeo.NLat = $('#'+SN.C.S.NoticeLat).val(cookieValue.NLat).val();
NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val(); SN.C.I.NoticeDataGeo.NLon = $('#'+SN.C.S.NoticeLon).val(cookieValue.NLon).val();
if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) { if ($('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS)) {
NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val(); SN.C.I.NoticeDataGeo.NLNS = $('#'+SN.C.S.NoticeLocationNs).val(cookieValue.NLNS).val();
NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val(); SN.C.I.NoticeDataGeo.NLID = $('#'+SN.C.S.NoticeLocationId).val(cookieValue.NLID).val();
} }
} }
if (cookieValue == 'disabled') { if (cookieValue == 'disabled') {
NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked'); SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', false).attr('checked');
} }
else { else {
NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked'); SN.C.I.NoticeDataGeo.NDG = $('#'+SN.C.S.NoticeDataGeo).attr('checked', true).attr('checked');
} }
return true; return true;
}, },
error: function (xhr, textStatus, errorThrown) { error: function (xhr, textStatus, errorThrown) {
form.removeClass(SN.C.S.Processing); form
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); .removeClass(SN.C.S.Processing)
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled, SN.C.S.Disabled); .find('#'+SN.C.S.NoticeActionSubmit)
$('#'+form_id+' .form_response').remove(); .removeClass(SN.C.S.Disabled)
.removeAttr(SN.C.S.Disabled, SN.C.S.Disabled);
form.find('.form_response').remove();
if (textStatus == 'timeout') { if (textStatus == 'timeout') {
form.append('<p class="form_response error">Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.</p>'); form.append('<p class="form_response error">Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists.</p>');
} }
@ -233,9 +231,10 @@ var SN = { // StatusNet
} }
else { else {
if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) { if (parseInt(xhr.status) === 0 || jQuery.inArray(parseInt(xhr.status), SN.C.I.HTTP20x30x) >= 0) {
$('#'+form_id).resetForm(); form
$('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); .resetForm()
SN.U.FormNoticeEnhancements($('#'+form_id)); .find('#'+SN.C.S.NoticeDataAttachSelected).remove();
SN.U.FormNoticeEnhancements(form);
} }
else { else {
form.append('<p class="form_response error">(Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.</p>'); form.append('<p class="form_response error">(Sorry! We had trouble sending your notice ('+xhr.status+' '+xhr.statusText+'). Please report the problem to the site administrator if this happens again.</p>');
@ -244,7 +243,7 @@ var SN = { // StatusNet
} }
}, },
success: function(data, textStatus) { success: function(data, textStatus) {
$('#'+form_id+' .form_response').remove(); form.find('.form_response').remove();
var result; var result;
if ($('#'+SN.C.S.Error, data).length > 0) { if ($('#'+SN.C.S.Error, data).length > 0) {
result = document._importNode($('p', data)[0], true); result = document._importNode($('p', data)[0], true);
@ -277,11 +276,11 @@ var SN = { // StatusNet
else { else {
notices.prepend(notice); notices.prepend(notice);
} }
$('#'+notice.id).css({display:'none'}); $('#'+notice.id)
$('#'+notice.id).fadeIn(2500); .css({display:'none'})
.fadeIn(2500);
SN.U.NoticeWithAttachment($('#'+notice.id)); SN.U.NoticeWithAttachment($('#'+notice.id));
SN.U.NoticeReplyTo($('#'+notice.id)); SN.U.NoticeReplyTo($('#'+notice.id));
SN.U.FormXHR($('#'+notice.id+' .form_favor'));
} }
} }
else { else {
@ -290,24 +289,26 @@ var SN = { // StatusNet
form.append('<p class="form_response success">'+result_title+'</p>'); form.append('<p class="form_response success">'+result_title+'</p>');
} }
} }
$('#'+form_id).resetForm(); form.resetForm();
$('#'+form_id+' #'+SN.C.S.NoticeInReplyTo).val(''); form.find('#'+SN.C.S.NoticeInReplyTo).val('');
$('#'+form_id+' #'+SN.C.S.NoticeDataAttachSelected).remove(); form.find('#'+SN.C.S.NoticeDataAttachSelected).remove();
SN.U.FormNoticeEnhancements($('#'+form_id)); SN.U.FormNoticeEnhancements(form);
} }
}, },
complete: function(xhr, textStatus) { complete: function(xhr, textStatus) {
form.removeClass(SN.C.S.Processing); form
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeAttr(SN.C.S.Disabled); .removeClass(SN.C.S.Processing)
$('#'+form_id+' #'+SN.C.S.NoticeActionSubmit).removeClass(SN.C.S.Disabled); .find('#'+SN.C.S.NoticeActionSubmit)
.removeAttr(SN.C.S.Disabled)
.removeClass(SN.C.S.Disabled);
$('#'+SN.C.S.NoticeLat).val(NLat); $('#'+SN.C.S.NoticeLat).val(SN.C.I.NoticeDataGeo.NLat);
$('#'+SN.C.S.NoticeLon).val(NLon); $('#'+SN.C.S.NoticeLon).val(SN.C.I.NoticeDataGeo.NLon);
if ($('#'+SN.C.S.NoticeLocationNs)) { if ($('#'+SN.C.S.NoticeLocationNs)) {
$('#'+SN.C.S.NoticeLocationNs).val(NLNS); $('#'+SN.C.S.NoticeLocationNs).val(SN.C.I.NoticeDataGeo.NLNS);
$('#'+SN.C.S.NoticeLocationId).val(NLID); $('#'+SN.C.S.NoticeLocationId).val(SN.C.I.NoticeDataGeo.NLID);
} }
$('#'+SN.C.S.NoticeDataGeo).attr('checked', NDG); $('#'+SN.C.S.NoticeDataGeo).attr('checked', SN.C.I.NoticeDataGeo.NDG);
} }
}); });
}, },
@ -350,14 +351,15 @@ var SN = { // StatusNet
}, },
NoticeFavor: function() { NoticeFavor: function() {
$('.form_favor').each(function() { SN.U.FormXHR($(this)); }); $('.form_favor').live('click', function() { SN.U.FormXHR($(this)); return false; });
$('.form_disfavor').each(function() { SN.U.FormXHR($(this)); }); $('.form_disfavor').live('click', function() { SN.U.FormXHR($(this)); return false; });
}, },
NoticeRepeat: function() { NoticeRepeat: function() {
$('.form_repeat').each(function() { $('.form_repeat').live('click', function() {
SN.U.FormXHR($(this)); SN.U.FormXHR($(this));
SN.U.NoticeRepeatConfirmation($(this)); SN.U.NoticeRepeatConfirmation($(this));
return false;
}); });
}, },
@ -639,7 +641,7 @@ var SN = { // StatusNet
NDM.bind('click', function() { NDM.bind('click', function() {
var NDMF = $('.entity_send-a-message form'); var NDMF = $('.entity_send-a-message form');
if (NDMF.length === 0) { if (NDMF.length === 0) {
$(this).addClass('processing'); $(this).addClass(SN.C.S.Processing);
$.get(NDM.attr('href'), null, function(data) { $.get(NDM.attr('href'), null, function(data) {
$('.entity_send-a-message').append(document._importNode($('form', data)[0], true)); $('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
NDMF = $('.entity_send-a-message .form_notice'); NDMF = $('.entity_send-a-message .form_notice');
@ -650,7 +652,7 @@ var SN = { // StatusNet
NDMF.hide(); NDMF.hide();
return false; return false;
}); });
NDM.removeClass('processing'); NDM.removeClass(SN.C.S.Processing);
}); });
} }
else { else {
@ -695,11 +697,11 @@ var SN = { // StatusNet
EntityActions: function() { EntityActions: function() {
if ($('body.user_in').length > 0) { if ($('body.user_in').length > 0) {
$('.form_user_subscribe').each(function() { SN.U.FormXHR($(this)); }); $('.form_user_subscribe').live('click', function() { SN.U.FormXHR($(this)); return false; });
$('.form_user_unsubscribe').each(function() { SN.U.FormXHR($(this)); }); $('.form_user_unsubscribe').live('click', function() { SN.U.FormXHR($(this)); return false; });
$('.form_group_join').each(function() { SN.U.FormXHR($(this)); }); $('.form_group_join').live('click', function() { SN.U.FormXHR($(this)); return false; });
$('.form_group_leave').each(function() { SN.U.FormXHR($(this)); }); $('.form_group_leave').live('click', function() { SN.U.FormXHR($(this)); return false; });
$('.form_user_nudge').each(function() { SN.U.FormXHR($(this)); }); $('.form_user_nudge').live('click', function() { SN.U.FormXHR($(this)); return false; });
SN.U.NewDirectMessage(); SN.U.NewDirectMessage();
} }

12
lib/util.php
View File

@ -989,9 +989,14 @@ function common_enqueue_notice($notice)
static $localTransports = array('omb', static $localTransports = array('omb',
'ping'); 'ping');
static $allTransports = array('sms', 'plugin'); $transports = array();
if (common_config('sms', 'enabled')) {
$transports = $allTransports; $transports[] = 'sms';
}
if (Event::hasHandler('HandleQueuedNotice')) {
$transports[] = 'plugin';
}
$xmpp = common_config('xmpp', 'enabled'); $xmpp = common_config('xmpp', 'enabled');
@ -999,6 +1004,7 @@ function common_enqueue_notice($notice)
$transports[] = 'jabber'; $transports[] = 'jabber';
} }
// @fixme move these checks into QueueManager and/or individual handlers
if ($notice->is_local == Notice::LOCAL_PUBLIC || if ($notice->is_local == Notice::LOCAL_PUBLIC ||
$notice->is_local == Notice::LOCAL_NONPUBLIC) { $notice->is_local == Notice::LOCAL_NONPUBLIC) {
$transports = array_merge($transports, $localTransports); $transports = array_merge($transports, $localTransports);

6
plugins/Realtime/realtimeupdate.js
View File

@ -95,9 +95,7 @@ RealtimeUpdate = {
$("#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);
SN.U.FormXHR($('#'+noticeItemID+' .form_favor'));
SN.U.NoticeReplyTo($('#'+noticeItemID)); SN.U.NoticeReplyTo($('#'+noticeItemID));
SN.U.FormXHR($('#'+noticeItemID+' .form_repeat'));
SN.U.NoticeWithAttachment($('#'+noticeItemID)); SN.U.NoticeWithAttachment($('#'+noticeItemID));
}, },
@ -132,7 +130,7 @@ RealtimeUpdate = {
user = data['user']; user = data['user'];
html = data['html'].replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"').replace(/&amp;/g,'&'); html = data['html'].replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"').replace(/&amp;/g,'&');
source = data['source'].replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"').replace(/&amp;/g,'&'); source = data['source'].replace(/&lt;/g,'<').replace(/&gt;/g,'>').replace(/&quot;/g,'"').replace(/&amp;/g,'&');
console.log(data);
ni = "<li class=\"hentry notice\" id=\"notice-"+unique+"\">"+ ni = "<li class=\"hentry notice\" id=\"notice-"+unique+"\">"+
"<div class=\"entry-title\">"+ "<div class=\"entry-title\">"+
"<span class=\"vcard author\">"+ "<span class=\"vcard author\">"+
@ -180,7 +178,7 @@ console.log(data);
ni = ni+"</div>"; ni = ni+"</div>";
"</li>"; ni = ni+"</li>";
return ni; return ni;
}, },

4
plugins/UserFlag/UserFlagPlugin.php
View File

@ -208,8 +208,8 @@ class UserFlagPlugin extends Plugin
function onEndShowScripts($action) function onEndShowScripts($action)
{ {
$action->inlineScript('if ($(".form_entity_flag").length > 0) { '. $action->inlineScript('if ($(".form_entity_flag").length > 0) { '.
'SN.U.FormXHR($(".form_entity_flag")); '. '$(".form_entity_flag").bind("click", function() {'.
'}'); 'SN.U.FormXHR($(this)); return false; }); }');
return true; return true;
} }

70
scripts/clearcache.php Normal file
View File

@ -0,0 +1,70 @@
#!/usr/bin/env php
<?php
/*
* StatusNet - the distributed open-source microblogging tool
* Copyright (C) 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/>.
*/
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
$shortoptions = "t:c:v:k:";
$helptext = <<<ENDOFHELP
USAGE: clearcache.php <args>
clears the cached object based on the args
-t table Table to look up
-c column Column to look up, default "id"
-v value Value to look up
-k key Key to look up; other args are ignored
ENDOFHELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
$karg = get_option_value('k');
if (!empty($karg)) {
$k = common_cache_key($karg);
} else {
$table = get_option_value('t');
if (empty($table)) {
die("No table or key specified\n");
}
$column = get_option_value('c');
if (empty($column)) {
$column = 'id';
}
$value = get_option_value('v');
$k = Memcached_DataObject::cacheKey($table, $column, $value);
}
print "Clearing key '$k'...";
$c = common_memcache();
if (empty($c)) {
die("Can't initialize cache object!\n");
}
$result = $c->delete($k);
if ($result) {
print "OK.\n";
} else {
print "FAIL.\n";
}