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

Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

Browse Source
This commit is contained in:
Robin Millette 2009-04-17 16:47:18 +00:00
commit 2eb1eb8683
8 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/grouprss.php
View File

@ -34,7 +34,7 @@ if (!defined('LACONICA')) {
require_once INSTALLDIR.'/lib/rssaction.php'; require_once INSTALLDIR.'/lib/rssaction.php';
define('MEMBERS_PER_SECTION', 81); define('MEMBERS_PER_SECTION', 27);
/** /**
* Group RSS feed * Group RSS feed

4
actions/showgroup.php
View File

@ -35,7 +35,7 @@ if (!defined('LACONICA')) {
require_once INSTALLDIR.'/lib/noticelist.php'; require_once INSTALLDIR.'/lib/noticelist.php';
require_once INSTALLDIR.'/lib/feedlist.php'; require_once INSTALLDIR.'/lib/feedlist.php';
define('MEMBERS_PER_SECTION', 81); define('MEMBERS_PER_SECTION', 27);
/** /**
* Group main page * Group main page
@ -361,7 +361,7 @@ class ShowgroupAction extends Action
$this->element('p', null, _('(None)')); $this->element('p', null, _('(None)'));
} }
if ($cnt == MEMBERS_PER_SECTION) { if ($cnt > MEMBERS_PER_SECTION) {
$this->element('a', array('href' => common_local_url('groupmembers', $this->element('a', array('href' => common_local_url('groupmembers',
array('nickname' => $this->group->nickname))), array('nickname' => $this->group->nickname))),
_('All members')); _('All members'));

28
js/util.js
View File

@ -166,28 +166,36 @@ $(document).ready(function(){
$("#notice_action-submit").addClass("disabled"); $("#notice_action-submit").addClass("disabled");
return true; return true;
}, },
success: function(xml) { if ($("#error", xml).length > 0 || $("#command_result", xml).length > 0) { success: function(xml) { if ($("#error", xml).length > 0) {
var result = document._importNode($("p", xml).get(0), true); var result = document._importNode($("p", xml).get(0), true);
result = result.textContent || result.innerHTML; result = result.textContent || result.innerHTML;
alert(result); alert(result);
} }
else { else {
$("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true)); if ($("#command_result", xml).length > 0) {
var result = document._importNode($("p", xml).get(0), true);
result = result.textContent || result.innerHTML;
alert(result);
}
else {
$("#notices_primary .notices").prepend(document._importNode($("li", xml).get(0), true));
counter();
$("#notices_primary .notice:first").css({display:"none"});
$("#notices_primary .notice:first").fadeIn(2500);
NoticeHover();
NoticeReply();
}
$("#notice_data-text").val(""); $("#notice_data-text").val("");
counter();
$("#notices_primary .notice:first").css({display:"none"});
$("#notices_primary .notice:first").fadeIn(2500);
NoticeHover();
NoticeReply();
} }
$("#form_notice").removeClass("processing"); $("#form_notice").removeClass("processing");
$("#notice_action-submit").removeAttr("disabled"); $("#notice_action-submit").removeAttr("disabled");
$("#notice_action-submit").removeClass("disabled"); $("#notice_action-submit").removeClass("disabled");
} }
}; };
$("#form_notice").ajaxForm(PostNotice); if (document.body.id != 'inbox' && document.body.id != 'outbox') {
$("#form_notice").each(addAjaxHidden); $("#form_notice").ajaxForm(PostNotice);
$("#form_notice").each(addAjaxHidden);
}
NoticeHover(); NoticeHover();
NoticeReply(); NoticeReply();
}); });

2
lib/twitterapi.php
View File

@ -418,7 +418,7 @@ class TwitterapiAction extends Action
function date_twitter($dt) function date_twitter($dt)
{ {
$t = strtotime($dt); $t = strtotime($dt);
return date("D M d G:i:s O Y", $t); return date("D M d H:i:s O Y", $t);
} }
// XXX: Candidate for a general utility method somewhere? // XXX: Candidate for a general utility method somewhere?

7
scripts/jabberqueuehandler.php
View File

@ -54,6 +54,13 @@ class JabberQueueHandler extends XmppQueueHandler
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);

7
scripts/publicqueuehandler.php
View File

@ -52,6 +52,13 @@ class PublicQueueHandler extends XmppQueueHandler
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);

7
scripts/xmppconfirmhandler.php
View File

@ -140,6 +140,13 @@ class XmppConfirmHandler extends XmppQueueHandler
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);

7
scripts/xmppdaemon.php
View File

@ -321,6 +321,13 @@ class XMPPDaemon extends Daemon
} }
} }
// Abort immediately if xmpp is not enabled, otherwise the daemon chews up
// lots of CPU trying to connect to unconfigured servers
if (common_config('xmpp','enabled')==false) {
print "Aborting daemon - xmpp is disabled\n";
exit();
}
ini_set("max_execution_time", "0"); ini_set("max_execution_time", "0");
ini_set("max_input_time", "0"); ini_set("max_input_time", "0");
set_time_limit(0); set_time_limit(0);