GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

This commit is contained in:
Brion Vibber 2010-02-01 10:30:45 -08:00
parent 85544d369d fba4153346
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;

140
js/jquery.form.js
View File

@ -1,14 +1,12 @@
/* /*
* jQuery Form Plugin * jQuery Form Plugin
* version: 2.17 (06-NOV-2008) * version: 2.36 (07-NOV-2009)
* @requires jQuery v1.2.2 or later * @requires jQuery v1.2.6 or later
* *
* Examples and documentation at: http://malsup.com/jquery/form/ * Examples and documentation at: http://malsup.com/jquery/form/
* Dual licensed under the MIT and GPL licenses: * Dual licensed under the MIT and GPL licenses:
* http://www.opensource.org/licenses/mit-license.php * http://www.opensource.org/licenses/mit-license.php
* http://www.gnu.org/licenses/gpl.html * http://www.gnu.org/licenses/gpl.html
*
* Revision: $Id$
*/ */
;(function($) { ;(function($) {
@ -55,9 +53,17 @@ $.fn.ajaxSubmit = function(options) {
if (typeof options == 'function') if (typeof options == 'function')
options = { success: options }; options = { success: options };
var url = $.trim(this.attr('action'));
if (url) {
// clean url (don't include hash vaue)
url = (url.match(/^([^#]+)/)||[])[1];
}
url = url || window.location.href || '';
options = $.extend({ options = $.extend({
url: this.attr('action') || window.location.toString(), url: url,
type: this.attr('method') || 'GET' type: this.attr('method') || 'GET',
iframeSrc: /^https/i.test(window.location.href || '') ? 'javascript:false' : 'about:blank'
}, options || {}); }, options || {});
// hook for manipulating the form data before it is extracted; // hook for manipulating the form data before it is extracted;
@ -81,7 +87,7 @@ $.fn.ajaxSubmit = function(options) {
for (var n in options.data) { for (var n in options.data) {
if(options.data[n] instanceof Array) { if(options.data[n] instanceof Array) {
for (var k in options.data[n]) for (var k in options.data[n])
a.push( { name: n, value: options.data[n][k] } ) a.push( { name: n, value: options.data[n][k] } );
} }
else else
a.push( { name: n, value: options.data[n] } ); a.push( { name: n, value: options.data[n] } );
@ -136,11 +142,16 @@ $.fn.ajaxSubmit = function(options) {
if (files[j]) if (files[j])
found = true; found = true;
var multipart = false;
// var mp = 'multipart/form-data';
// multipart = ($form.attr('enctype') == mp || $form.attr('encoding') == mp);
// options.iframe allows user to force iframe mode // options.iframe allows user to force iframe mode
if (options.iframe || found) { // 06-NOV-09: now defaulting to iframe mode if file input is detected
if ((files.length && options.iframe !== false) || options.iframe || found || multipart) {
// hack to fix Safari hang (thanks to Tim Molendijk for this) // hack to fix Safari hang (thanks to Tim Molendijk for this)
// see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d // see: http://groups.google.com/group/jquery-dev/browse_thread/thread/36395b7ab510dd5d
if ($.browser.safari && options.closeKeepAlive) if (options.closeKeepAlive)
$.get(options.closeKeepAlive, fileUpload); $.get(options.closeKeepAlive, fileUpload);
else else
fileUpload(); fileUpload();
@ -163,14 +174,12 @@ $.fn.ajaxSubmit = function(options) {
} }
var opts = $.extend({}, $.ajaxSettings, options); var opts = $.extend({}, $.ajaxSettings, options);
var s = jQuery.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts); var s = $.extend(true, {}, $.extend(true, {}, $.ajaxSettings), opts);
var id = 'jqFormIO' + (new Date().getTime()); var id = 'jqFormIO' + (new Date().getTime());
var $io = $('<iframe id="' + id + '" name="' + id + '" />'); var $io = $('<iframe id="' + id + '" name="' + id + '" src="'+ opts.iframeSrc +'" />');
var io = $io[0]; var io = $io[0];
if ($.browser.msie || $.browser.opera)
io.src = 'javascript:false;document.write("");';
$io.css({ position: 'absolute', top: '-1000px', left: '-1000px' }); $io.css({ position: 'absolute', top: '-1000px', left: '-1000px' });
var xhr = { // mock object var xhr = { // mock object
@ -184,7 +193,7 @@ $.fn.ajaxSubmit = function(options) {
setRequestHeader: function() {}, setRequestHeader: function() {},
abort: function() { abort: function() {
this.aborted = 1; this.aborted = 1;
$io.attr('src','about:blank'); // abort op in progress $io.attr('src', opts.iframeSrc); // abort op in progress
} }
}; };
@ -194,7 +203,7 @@ $.fn.ajaxSubmit = function(options) {
if (g) $.event.trigger("ajaxSend", [xhr, opts]); if (g) $.event.trigger("ajaxSend", [xhr, opts]);
if (s.beforeSend && s.beforeSend(xhr, s) === false) { if (s.beforeSend && s.beforeSend(xhr, s) === false) {
s.global && jQuery.active--; s.global && $.active--;
return; return;
} }
if (xhr.aborted) if (xhr.aborted)
@ -221,11 +230,13 @@ $.fn.ajaxSubmit = function(options) {
setTimeout(function() { setTimeout(function() {
// make sure form attrs are set // make sure form attrs are set
var t = $form.attr('target'), a = $form.attr('action'); var t = $form.attr('target'), a = $form.attr('action');
$form.attr({
target: id, // update form attrs in IE friendly way
method: 'POST', form.setAttribute('target',id);
action: opts.url if (form.getAttribute('method') != 'POST')
}); form.setAttribute('method', 'POST');
if (form.getAttribute('action') != opts.url)
form.setAttribute('action', opts.url);
// ie borks in some cases when setting encoding // ie borks in some cases when setting encoding
if (! options.skipEncodingOverride) { if (! options.skipEncodingOverride) {
@ -255,18 +266,19 @@ $.fn.ajaxSubmit = function(options) {
} }
finally { finally {
// reset attrs and remove "extra" input elements // reset attrs and remove "extra" input elements
$form.attr('action', a); form.setAttribute('action',a);
t ? $form.attr('target', t) : $form.removeAttr('target'); t ? form.setAttribute('target', t) : $form.removeAttr('target');
$(extraInputs).remove(); $(extraInputs).remove();
} }
}, 10); }, 10);
var domCheckCount = 50;
function cb() { function cb() {
if (cbInvoked++) return; if (cbInvoked++) return;
io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false); io.detachEvent ? io.detachEvent('onload', cb) : io.removeEventListener('load', cb, false);
var operaHack = 0;
var ok = true; var ok = true;
try { try {
if (timedOut) throw 'timeout'; if (timedOut) throw 'timeout';
@ -275,14 +287,19 @@ $.fn.ajaxSubmit = function(options) {
doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document; doc = io.contentWindow ? io.contentWindow.document : io.contentDocument ? io.contentDocument : io.document;
if (doc.body == null && !operaHack && $.browser.opera) { var isXml = opts.dataType == 'xml' || doc.XMLDocument || $.isXMLDoc(doc);
// In Opera 9.2.x the iframe DOM is not always traversable when log('isXml='+isXml);
// the onload callback fires so we give Opera 100ms to right itself if (!isXml && (doc.body == null || doc.body.innerHTML == '')) {
operaHack = 1; if (--domCheckCount) {
cbInvoked--; // in some browsers (Opera) the iframe DOM is not always traversable when
// the onload callback fires, so we loop a bit to accommodate
cbInvoked = 0;
setTimeout(cb, 100); setTimeout(cb, 100);
return; return;
} }
log('Could not access iframe DOM after 50 tries.');
return;
}
xhr.responseText = doc.body ? doc.body.innerHTML : null; xhr.responseText = doc.body ? doc.body.innerHTML : null;
xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc; xhr.responseXML = doc.XMLDocument ? doc.XMLDocument : doc;
@ -292,8 +309,16 @@ $.fn.ajaxSubmit = function(options) {
}; };
if (opts.dataType == 'json' || opts.dataType == 'script') { if (opts.dataType == 'json' || opts.dataType == 'script') {
// see if user embedded response in textarea
var ta = doc.getElementsByTagName('textarea')[0]; var ta = doc.getElementsByTagName('textarea')[0];
xhr.responseText = ta ? ta.value : xhr.responseText; if (ta)
xhr.responseText = ta.value;
else {
// account for browsers injecting pre around json response
var pre = doc.getElementsByTagName('pre')[0];
if (pre)
xhr.responseText = pre.innerHTML;
}
} }
else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) { else if (opts.dataType == 'xml' && !xhr.responseXML && xhr.responseText != null) {
xhr.responseXML = toXml(xhr.responseText); xhr.responseXML = toXml(xhr.responseText);
@ -353,37 +378,39 @@ $.fn.ajaxForm = function(options) {
return this.ajaxFormUnbind().bind('submit.form-plugin', function() { return this.ajaxFormUnbind().bind('submit.form-plugin', function() {
$(this).ajaxSubmit(options); $(this).ajaxSubmit(options);
return false; return false;
}).each(function() { }).bind('click.form-plugin', function(e) {
// store options in hash var target = e.target;
$(":submit,input:image", this).bind('click.form-plugin',function(e) { var $el = $(target);
var form = this.form; if (!($el.is(":submit,input:image"))) {
form.clk = this; // is this a child element of the submit el? (ex: a span within a button)
if (this.type == 'image') { var t = $el.closest(':submit');
if (t.length == 0)
return;
target = t[0];
}
var form = this;
form.clk = target;
if (target.type == 'image') {
if (e.offsetX != undefined) { if (e.offsetX != undefined) {
form.clk_x = e.offsetX; form.clk_x = e.offsetX;
form.clk_y = e.offsetY; form.clk_y = e.offsetY;
} else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin } else if (typeof $.fn.offset == 'function') { // try to use dimensions plugin
var offset = $(this).offset(); var offset = $el.offset();
form.clk_x = e.pageX - offset.left; form.clk_x = e.pageX - offset.left;
form.clk_y = e.pageY - offset.top; form.clk_y = e.pageY - offset.top;
} else { } else {
form.clk_x = e.pageX - this.offsetLeft; form.clk_x = e.pageX - target.offsetLeft;
form.clk_y = e.pageY - this.offsetTop; form.clk_y = e.pageY - target.offsetTop;
} }
} }
// clear form vars // clear form vars
setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 10); setTimeout(function() { form.clk = form.clk_x = form.clk_y = null; }, 100);
});
}); });
}; };
// ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm // ajaxFormUnbind unbinds the event handlers that were bound by ajaxForm
$.fn.ajaxFormUnbind = function() { $.fn.ajaxFormUnbind = function() {
this.unbind('submit.form-plugin'); return this.unbind('submit.form-plugin click.form-plugin');
return this.each(function() {
$(":submit,input:image", this).unbind('click.form-plugin');
});
}; };
/** /**
@ -411,8 +438,10 @@ $.fn.formToArray = function(semantic) {
if (semantic && form.clk && el.type == "image") { if (semantic && form.clk && el.type == "image") {
// handle image inputs on the fly when semantic == true // handle image inputs on the fly when semantic == true
if(!el.disabled && form.clk == el) if(!el.disabled && form.clk == el) {
a.push({name: n, value: $(el).val()});
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y}); a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
}
continue; continue;
} }
@ -426,12 +455,10 @@ $.fn.formToArray = function(semantic) {
} }
if (!semantic && form.clk) { if (!semantic && form.clk) {
// input type=='image' are not found in elements array! handle them here // input type=='image' are not found in elements array! handle it here
var inputs = form.getElementsByTagName("input"); var $input = $(form.clk), input = $input[0], n = input.name;
for(var i=0, max=inputs.length; i < max; i++) { if (n && !input.disabled && input.type == 'image') {
var input = inputs[i]; a.push({name: n, value: $input.val()});
var n = input.name;
if(n && !input.disabled && input.type == "image" && form.clk == input)
a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y}); a.push({name: n+'.x', value: form.clk_x}, {name: n+'.y', value: form.clk_y});
} }
} }
@ -539,8 +566,9 @@ $.fieldValue = function(el, successful) {
for(var i=(one ? index : 0); i < max; i++) { for(var i=(one ? index : 0); i < max; i++) {
var op = ops[i]; var op = ops[i];
if (op.selected) { if (op.selected) {
// extra pain for IE... var v = op.value;
var v = $.browser.msie && !(op.attributes['value'].specified) ? op.text : op.value; if (!v) // extra pain for IE...
v = (op.attributes && op.attributes['value'] && !(op.attributes['value'].specified)) ? op.text : op.value;
if (one) return v; if (one) return v;
a.push(v); a.push(v);
} }
@ -570,7 +598,7 @@ $.fn.clearForm = function() {
$.fn.clearFields = $.fn.clearInputs = function() { $.fn.clearFields = $.fn.clearInputs = function() {
return this.each(function() { return this.each(function() {
var t = this.type, tag = this.tagName.toLowerCase(); var t = this.type, tag = this.tagName.toLowerCase();
if (t == 'file' || t == 'text' || t == 'password' || tag == 'textarea') if (t == 'text' || t == 'password' || tag == 'textarea')
this.value = ''; this.value = '';
else if (t == 'checkbox' || t == 'radio') else if (t == 'checkbox' || t == 'radio')
this.checked = false; this.checked = false;
@ -597,7 +625,7 @@ $.fn.resetForm = function() {
$.fn.enable = function(b) { $.fn.enable = function(b) {
if (b == undefined) b = true; if (b == undefined) b = true;
return this.each(function() { return this.each(function() {
this.disabled = !b this.disabled = !b;
}); });
}; };

6203
js/jquery.js vendored
View File

File diff suppressed because it is too large Load Diff

162
js/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

132
js/util.js
View File

@ -143,20 +143,18 @@ var SN = { // StatusNet
SN.U.Counter(form); SN.U.Counter(form);
}, },
FormXHR: function(f) { FormXHR: function(form) {
if (jQuery.data(f[0], "ElementData") === undefined) {
jQuery.data(f[0], "ElementData", {Bind:'submit'});
f.bind('submit', function(e) {
form_id = $(this)[0].id;
$.ajax({ $.ajax({
type: 'POST', type: 'POST',
dataType: 'xml', dataType: 'xml',
url: $(this)[0].action, url: form.attr('action'),
data: $(this).serialize() + '&ajax=1', data: form.serialize() + '&ajax=1',
beforeSend: function(xhr) { beforeSend: function(xhr) {
$('#'+form_id).addClass(SN.C.S.Processing); form
$('#'+form_id+' .submit').addClass(SN.C.S.Disabled); .addClass(SN.C.S.Processing)
$('#'+form_id+' .submit').attr(SN.C.S.Disabled, SN.C.S.Disabled); .find('.submit')
.addClass(SN.C.S.Disabled)
.attr(SN.C.S.Disabled, SN.C.S.Disabled);
}, },
error: function (xhr, textStatus, errorThrown) { error: function (xhr, textStatus, errorThrown) {
alert(errorThrown || textStatus); alert(errorThrown || textStatus);
@ -164,66 +162,66 @@ var SN = { // StatusNet
success: function(data, textStatus) { success: function(data, textStatus) {
if (typeof($('form', data)[0]) != 'undefined') { if (typeof($('form', data)[0]) != 'undefined') {
form_new = document._importNode($('form', data)[0], true); form_new = document._importNode($('form', data)[0], true);
$('#'+form_id).replaceWith(form_new); form.replaceWith(form_new);
$('#'+form_new.id).each(function() { SN.U.FormXHR($(this)); });
} }
else { else {
$('#'+form_id).replaceWith(document._importNode($('p', data)[0], true)); form.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();
} }

10
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[] = 'sms';
}
if (Event::hasHandler('HandleQueuedNotice')) {
$transports[] = 'plugin';
}
$transports = $allTransports;
$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";
}