friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

protocol revision, send dfrn_confirm binary items as hex

This commit is contained in:
Mike Macgirvin 2010-10-11 03:16:25 -07:00
parent dcb7bc5e71
commit eafd225bdd
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/ajaxupload.js
View File

@ -160,8 +160,7 @@
left : box.left + 'px', left : box.left + 'px',
top : box.top + 'px', top : box.top + 'px',
width : from.offsetWidth + 'px', width : from.offsetWidth + 'px',
height : from.offsetHeight + 'px', height : from.offsetHeight + 'px'
cursor : 'pointer'
}); });
to.title = from.title; to.title = from.title;
@ -385,7 +384,9 @@
// in Internet Explorer // in Internet Explorer
'direction' : 'ltr', 'direction' : 'ltr',
//Max zIndex supported by Opera 9.0-9.2 //Max zIndex supported by Opera 9.0-9.2
'zIndex': 2147483583 'zIndex': 2147483583,
'cursor' : 'pointer'
}); });
// Make sure that element opacity exists. // Make sure that element opacity exists.

12
mod/dfrn_confirm.php
View File

@ -98,17 +98,19 @@ function dfrn_confirm_post(&$a) {
$result = ''; $result = '';
openssl_private_encrypt($dfrn_id,$result,$a->user['prvkey']); openssl_private_encrypt($dfrn_id,$result,$a->user['prvkey']);
$params['dfrn_id'] = $result; $params['dfrn_id'] = bin2hex($result);
$params['public_key'] = $public_key; $params['public_key'] = $public_key;
$my_url = $a->get_baseurl() . '/profile/' . $a->user['nickname']; $my_url = $a->get_baseurl() . '/profile/' . $a->user['nickname'];
openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey);
$params['source_url'] = bin2hex($params['source_url']);
if($aes_allow && function_exists('openssl_encrypt')) { if($aes_allow && function_exists('openssl_encrypt')) {
openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey); openssl_public_encrypt($src_aes_key, $params['aes_key'], $site_pubkey);
$params['public_key'] = openssl_encrypt($public_key,'AES-256-CBC',$src_aes_key); $params['aes_key'] = bin2hex($params['aes_key']);
$params['public_key'] = bin2hex(openssl_encrypt($public_key,'AES-256-CBC',$src_aes_key));
} }
$params['dfrn_version'] = '2.0'; $params['dfrn_version'] = '2.0';
@ -288,9 +290,9 @@ function dfrn_confirm_post(&$a) {
// We are processing an external confirmation to an introduction created by our user. // We are processing an external confirmation to an introduction created by our user.
$public_key = $_POST['public_key']; $public_key = $_POST['public_key'];
$dfrn_id = $_POST['dfrn_id']; $dfrn_id = hex2bin($_POST['dfrn_id']);
$source_url = $_POST['source_url']; $source_url = hex2bin($_POST['source_url']);
$aes_key = $_POST['aes_key']; $aes_key = hex2bin($_POST['aes_key']);
$duplex = $_POST['duplex']; $duplex = $_POST['duplex'];
$version_id = $_POST['dfrn_version']; $version_id = $_POST['dfrn_version'];

2
view/theme/default/style.css
View File

@ -85,7 +85,7 @@ blockquote:before {
#wall-image-upload, #wall-image-upload,
#profile-upload-wrapper, #profile-upload-wrapper,
#wall-image-upload-div, #wall-image-upload-div,
.focus { .hover, .focus {
cursor: pointer; cursor: pointer;
} }