We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 870e556f authored by Brion Vibber's avatar Brion Vibber

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

parents d410df04 caad5859
......@@ -63,11 +63,10 @@ SN.U.DialogBox = {
f.show();
}
else {
a[0].href = (a[0].href.match(/[\\?]/) === null) ? a[0].href+'?' : a[0].href+'&';
$.ajax({
type: 'GET',
dataType: 'xml',
url: a[0].href+'ajax=1',
url: a[0].href + ((a[0].href.match(/[\\?]/) === null)?'?':'&') + 'ajax=1',
beforeSend: function(formData) {
a.addClass('processing');
},
......
......@@ -57,8 +57,10 @@ class MagicsigRsaSha256
$keypair = new Crypt_RSA_KeyPair($key_length);
$params['public_key'] = $keypair->getPublicKey();
$params['private_key'] = $keypair->getPrivateKey();
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
$this->keypair = new Crypt_RSA($params);
PEAR::popErrorHandling();
}
......@@ -79,6 +81,8 @@ class MagicsigRsaSha256
public function fromString($text)
{
PEAR::pushErrorHandling(PEAR_ERROR_RETURN);
// remove whitespace
$text = preg_replace('/\s+/', '', $text);
......@@ -86,7 +90,6 @@ class MagicsigRsaSha256
if (!preg_match('/RSA\.([^\.]+)\.([^\.]+)(.([^\.]+))?/', $text, $matches)) {
return false;
}
$mod = base64_url_decode($matches[1]);
$exp = base64_url_decode($matches[2]);
......@@ -110,6 +113,7 @@ class MagicsigRsaSha256
}
$this->keypair = new Crypt_RSA($params);
PEAR::popErrorHandling();
}
public function getName()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment