diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-10-11 03:16:25 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-10-11 03:16:25 -0700 |
| commit | eafd225bdd84eae667aa933c62c32d279be2e990 (patch) | |
| tree | 5c26aef6d3cc99baf52cde30a50480ae3f30ab65 | |
| parent | dcb7bc5e718292066ac85d0a7f81c00ef7235d2f (diff) | |
| download | volse-hubzilla-eafd225bdd84eae667aa933c62c32d279be2e990.tar.gz volse-hubzilla-eafd225bdd84eae667aa933c62c32d279be2e990.tar.bz2 volse-hubzilla-eafd225bdd84eae667aa933c62c32d279be2e990.zip | |
protocol revision, send dfrn_confirm binary items as hex
| -rw-r--r-- | include/ajaxupload.js | 7 | ||||
| -rw-r--r-- | mod/dfrn_confirm.php | 12 | ||||
| -rw-r--r-- | view/theme/default/style.css | 2 |
3 files changed, 12 insertions, 9 deletions
diff --git a/include/ajaxupload.js b/include/ajaxupload.js index 992190bc1..67c4a56fb 100644 --- a/include/ajaxupload.js +++ b/include/ajaxupload.js @@ -160,8 +160,7 @@ left : box.left + 'px', top : box.top + 'px', width : from.offsetWidth + 'px', - height : from.offsetHeight + 'px', - cursor : 'pointer' + height : from.offsetHeight + 'px' }); to.title = from.title; @@ -385,7 +384,9 @@ // in Internet Explorer 'direction' : 'ltr', //Max zIndex supported by Opera 9.0-9.2 - 'zIndex': 2147483583 + 'zIndex': 2147483583, + 'cursor' : 'pointer' + }); // Make sure that element opacity exists. diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 7c24de87d..77f436374 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -98,17 +98,19 @@ function dfrn_confirm_post(&$a) { $result = ''; openssl_private_encrypt($dfrn_id,$result,$a->user['prvkey']); - $params['dfrn_id'] = $result; + $params['dfrn_id'] = bin2hex($result); $params['public_key'] = $public_key; $my_url = $a->get_baseurl() . '/profile/' . $a->user['nickname']; openssl_public_encrypt($my_url, $params['source_url'], $site_pubkey); + $params['source_url'] = bin2hex($params['source_url']); if($aes_allow && function_exists('openssl_encrypt')) { 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'; @@ -288,9 +290,9 @@ function dfrn_confirm_post(&$a) { // We are processing an external confirmation to an introduction created by our user. $public_key = $_POST['public_key']; - $dfrn_id = $_POST['dfrn_id']; - $source_url = $_POST['source_url']; - $aes_key = $_POST['aes_key']; + $dfrn_id = hex2bin($_POST['dfrn_id']); + $source_url = hex2bin($_POST['source_url']); + $aes_key = hex2bin($_POST['aes_key']); $duplex = $_POST['duplex']; $version_id = $_POST['dfrn_version']; diff --git a/view/theme/default/style.css b/view/theme/default/style.css index a28231426..af84e06fa 100644 --- a/view/theme/default/style.css +++ b/view/theme/default/style.css @@ -85,7 +85,7 @@ blockquote:before { #wall-image-upload, #profile-upload-wrapper, #wall-image-upload-div, -.focus { +.hover, .focus { cursor: pointer; } |