diff options
| author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-15 06:31:47 +0100 |
|---|---|---|
| committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2012-03-15 06:31:47 +0100 |
| commit | 80b57e664a3df68994108a3d511468b249e0bbff (patch) | |
| tree | 44eb74a6943ecc26a795f136e79d653c39955d63 /include/items.php | |
| parent | 4fcdada4320d5d5619eb3a1f517d0fea6b26857b (diff) | |
| parent | b06c5983a4dae26dd24aecd7473bad98558cd6fc (diff) | |
| download | volse-hubzilla-80b57e664a3df68994108a3d511468b249e0bbff.tar.gz volse-hubzilla-80b57e664a3df68994108a3d511468b249e0bbff.tar.bz2 volse-hubzilla-80b57e664a3df68994108a3d511468b249e0bbff.zip | |
Merge branch 'master' of https://github.com/friendica/friendica
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/include/items.php b/include/items.php index 70c72ae16..4b1523ff6 100755 --- a/include/items.php +++ b/include/items.php @@ -1046,6 +1046,21 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { if(! $rino_enable) $rino = 0; + $ssl_val = intval(get_config('system','ssl_policy')); + $ssl_policy = ''; + switch($ssl_val){ + case SSL_POLICY_FULL: + $ssl_policy = 'full'; + break; + case SSL_POLICY_SELFSIGN: + $ssl_policy = 'self'; + break; + case SSL_POLICY_NONE: + default: + $ssl_policy = 'none'; + break; + } + $url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino=1' : ''); logger('dfrn_deliver: ' . $url); @@ -1118,6 +1133,8 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) { $postvars['perm'] = 'r'; } + $postvars['ssl_policy'] = $ssl_policy; + if($rino && $rino_allowed && (! $dissolve)) { $key = substr(random_string(),0,16); $data = bin2hex(aes_encrypt($postvars['data'],$key)); |