friendica/dir
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Check all keys before use

Browse source
This commit is contained in:
Friendika 2011-09-19 03:30:59 -07:00
parent 0a30a91b14
commit fd18b42a5a
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/conversation.php
View file

@ -485,6 +485,7 @@ function conversation(&$a, $items, $mode, $update) {
$tmp_item = replace_macros($template,array( $tmp_item = replace_macros($template,array(
'$body' => $body,
'$id' => $item['item_id'], '$id' => $item['item_id'],
'$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])), '$linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'$olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])), '$olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
@ -498,7 +499,6 @@ function conversation(&$a, $items, $mode, $update) {
'$osparkle' => $osparkle, '$osparkle' => $osparkle,
'$sparkle' => $sparkle, '$sparkle' => $sparkle,
'$title' => $item['title'], '$title' => $item['title'],
'$body' => $body,
'$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])), '$ago' => ((($item['app']) && ($item['id'] == $item['parent'])) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
'$lock' => $lock, '$lock' => $lock,
'$location' => $location, '$location' => $location,
@ -514,6 +514,7 @@ function conversation(&$a, $items, $mode, $update) {
'$like' => $like, '$like' => $like,
'$dislike' => $dislike, '$dislike' => $dislike,
'$comment' => $comment '$comment' => $comment
)); ));

20
mod/dfrn_notify.php
View file

@ -807,7 +807,7 @@ function dfrn_notify_content(&$a) {
intval(time() + 90 ) intval(time() + 90 )
); );
logger('dfrn_notify: challenge=' . $hash ); logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG );
$sql_extra = ''; $sql_extra = '';
switch($direction) { switch($direction) {
@ -841,14 +841,18 @@ function dfrn_notify_content(&$a) {
$encrypted_id = ''; $encrypted_id = '';
$id_str = $my_id . '.' . mt_rand(1000,9999); $id_str = $my_id . '.' . mt_rand(1000,9999);
if((($r[0]['duplex']) && strlen($r[0]['prvkey'])) || (! strlen($r[0]['pubkey']))) { if(strlen($r[0]['prvkey']) || strlen($r[0]['pubkey'])) {
openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']); if(($r[0]['duplex']) || (! strlen($r[0]['pubkey']))) {
openssl_private_encrypt($id_str,$encrypted_id,$r[0]['prvkey']); openssl_private_encrypt($hash,$challenge,$r[0]['prvkey']);
} openssl_private_encrypt($id_str,$encrypted_id,$r[0]['prvkey']);
else { }
openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']); else {
openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']); openssl_public_encrypt($hash,$challenge,$r[0]['pubkey']);
openssl_public_encrypt($id_str,$encrypted_id,$r[0]['pubkey']);
}
} }
else
$status = 1;
$challenge = bin2hex($challenge); $challenge = bin2hex($challenge);
$encrypted_id = bin2hex($encrypted_id); $encrypted_id = bin2hex($encrypted_id);