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 testing

Browse Source
This commit is contained in:
Brion Vibber 2010-02-23 00:52:47 +00:00
commit 870e556faa
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/OStatus/js/ostatus.js
View File

@ -63,11 +63,10 @@ SN.U.DialogBox = {
f.show(); f.show();
} }
else { else {
a[0].href = (a[0].href.match(/[\\?]/) === null) ? a[0].href+'?' : a[0].href+'&';
$.ajax({ $.ajax({
type: 'GET', type: 'GET',
dataType: 'xml', dataType: 'xml',
url: a[0].href+'ajax=1', url: a[0].href + ((a[0].href.match(/[\\?]/) === null)?'?':'&') + 'ajax=1',
beforeSend: function(formData) { beforeSend: function(formData) {
a.addClass('processing'); a.addClass('processing');
}, },

6
plugins/OStatus/lib/magicsig.php
View File

@ -58,7 +58,9 @@ class MagicsigRsaSha256
$params['public_key'] = $keypair->getPublicKey(); $params['public_key'] = $keypair->getPublicKey();
$params['private_key'] = $keypair->getPrivateKey(); $params['private_key'] = $keypair->getPrivateKey();
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
$this->keypair = new Crypt_RSA($params); $this->keypair = new Crypt_RSA($params);
PEAR::popErrorHandling();
} }
@ -79,6 +81,8 @@ class MagicsigRsaSha256
public function fromString($text) public function fromString($text)
{ {
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
// remove whitespace // remove whitespace
$text = preg_replace('/\s+/', '', $text); $text = preg_replace('/\s+/', '', $text);
@ -87,7 +91,6 @@ class MagicsigRsaSha256
return false; return false;
} }
$mod = base64_url_decode($matches[1]); $mod = base64_url_decode($matches[1]);
$exp = base64_url_decode($matches[2]); $exp = base64_url_decode($matches[2]);
if ($matches[4]) { if ($matches[4]) {
@ -110,6 +113,7 @@ class MagicsigRsaSha256
} }
$this->keypair = new Crypt_RSA($params); $this->keypair = new Crypt_RSA($params);
PEAR::popErrorHandling();
} }
public function getName() public function getName()