diff options
| author | marijus <mario@mariovavti.com> | 2014-08-24 09:35:21 +0200 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-08-24 09:35:21 +0200 |
| commit | f991ca8df127dd90e12c00b5d39e22603e4e425a (patch) | |
| tree | 68518e3c2b71ba9d7cb1ebfa06a4484f3d1e5bcd /mod | |
| parent | 8d382a9394a1b3b32fcd40553add9520e076ab68 (diff) | |
| parent | 9b524c9bc4553a82b98f46e4c4804d76ee1495f2 (diff) | |
| download | volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.tar.gz volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.tar.bz2 volse-hubzilla-f991ca8df127dd90e12c00b5d39e22603e4e425a.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/item.php | 4 | ||||
| -rw-r--r-- | mod/viewsrc.php | 7 | ||||
| -rw-r--r-- | mod/zfinger.php | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/mod/item.php b/mod/item.php index 27691eb4f..df51c8a92 100644 --- a/mod/item.php +++ b/mod/item.php @@ -768,9 +768,9 @@ function item_post(&$a) { $key = get_config('system','pubkey'); $datarray['item_flags'] = $datarray['item_flags'] | ITEM_OBSCURED; if($datarray['title']) - $datarray['title'] = json_encode(aes_encapsulate($datarray['title'],$key)); + $datarray['title'] = json_encode(crypto_encapsulate($datarray['title'],$key)); if($datarray['body']) - $datarray['body'] = json_encode(aes_encapsulate($datarray['body'],$key)); + $datarray['body'] = json_encode(crypto_encapsulate($datarray['body'],$key)); } if($orig_post) { diff --git a/mod/viewsrc.php b/mod/viewsrc.php index 0f4df9b9b..ddf39535c 100644 --- a/mod/viewsrc.php +++ b/mod/viewsrc.php @@ -19,13 +19,16 @@ function viewsrc_content(&$a) { } if(local_user() && $item_id) { - $r = q("select body from item where item_restrict = 0 and uid = %d and id = %d limit 1", + $r = q("select item_flags, body from item where item_restrict = 0 and uid = %d and id = %d limit 1", intval(local_user()), intval($item_id) ); - if($r) + if($r) { + if($r[0]['item_flags'] & ITEM_OBSCURED) + $r[0]['body'] = crypto_unencapsulate(json_decode($r[0]['body'],true),get_config('system','prvkey')); $o = (($json) ? json_encode($r[0]['body']) : str_replace("\n",'<br />',$r[0]['body'])); + } } if(is_ajax()) { diff --git a/mod/zfinger.php b/mod/zfinger.php index cf8a3fda1..ef55085d6 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -203,7 +203,7 @@ function zfinger_init(&$a) { $permissions['connected'] = true; } - $ret['permissions'] = (($ztarget && $zkey) ? aes_encapsulate(json_encode($permissions),$zkey) : $permissions); + $ret['permissions'] = (($ztarget && $zkey) ? crypto_encapsulate(json_encode($permissions),$zkey) : $permissions); if($permissions['view_profile']) $ret['profile'] = $profile; |