jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Continued:

Browse source 
- added curly braces/spaces
- converted multiple single-line comments into one multi-line comment

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2017-03-25 14:07:26 +01:00
parent 4d731dd838
commit 006b4b88b2
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
1 changed files with 36 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
mod/dfrn_notify.php
View file

@ -70,9 +70,11 @@ function dfrn_notify_post(App $a) {
break; // NOTREACHED
}
// be careful - $importer will contain both the contact information for the contact
// sending us the post, and also the user information for the person receiving it.
// since they are mixed together, it is easy to get them confused.
/*
* be careful - $importer will contain both the contact information for the contact
* sending us the post, and also the user information for the person receiving it.
* since they are mixed together, it is easy to get them confused.
*/
$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
`contact`.`pubkey` AS `cpubkey`,
@ -107,8 +109,9 @@ function dfrn_notify_post(App $a) {
intval($prv),
intval($importer['id'])
);
if($writable != (-1))
if ($writable != (-1)) {
$importer['writable'] = $writable;
}
$importer['forum'] = $page;
}
@ -133,7 +136,7 @@ function dfrn_notify_post(App $a) {
}
/// @TODO remove this old-lost code then?
// If we are setup as a soapbox we aren't accepting input from this person
// This behaviour is deactivated since it really doesn't make sense to even disallow comments
// The check if someone is a friend or simply a follower is done in a later place so it needn't to be done here
@ -165,16 +168,13 @@ function dfrn_notify_post(App $a) {
if ($dfrn_version >= 2.1) {
if ((($importer['duplex']) && strlen($importer['cprvkey'])) || (! strlen($importer['cpubkey']))) {
openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
}
else {
} else {
openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
}
}
else {
} else {
if ((($importer['duplex']) && strlen($importer['cpubkey'])) || (! strlen($importer['cprvkey']))) {
openssl_public_decrypt($rawkey,$final_key,$importer['cpubkey']);
}
else {
} else {
openssl_private_decrypt($rawkey,$final_key,$importer['cprvkey']);
}
}
@ -184,19 +184,23 @@ function dfrn_notify_post(App $a) {
switch($rino_remote) {
case 0:
case 1:
// we got a key. old code send only the key, without RINO version.
// we assume RINO 1 if key and no RINO version
/*
* we got a key. old code send only the key, without RINO version.
* we assume RINO 1 if key and no RINO version
*/
$data = aes_decrypt(hex2bin($data),$final_key);
break;
case 2:
try {
$data = Crypto::decrypt(hex2bin($data),$final_key);
} catch (InvalidCiphertext $ex) { // VERY IMPORTANT
// Either:
// 1. The ciphertext was modified by the attacker,
// 2. The key is wrong, or
// 3. $ciphertext is not a valid ciphertext or was corrupted.
// Assume the worst.
/*
* Either:
* 1. The ciphertext was modified by the attacker,
* 2. The key is wrong, or
* 3. $ciphertext is not a valid ciphertext or was corrupted.
* Assume the worst.
*/
logger('The ciphertext has been tampered with!');
xml_status(0,'The ciphertext has been tampered with!');
} catch (Ex\CryptoTestFailed $ex) {
@ -227,8 +231,10 @@ function dfrn_notify_content(App $a) {
if(x($_GET,'dfrn_id')) {
// initial communication from external contact, $direction is their direction.
// If this is a duplex communication, ours will be the opposite.
/*
* initial communication from external contact, $direction is their direction.
* If this is a duplex communication, ours will be the opposite.
*/
$dfrn_id = notags(trim($_GET['dfrn_id']));
$dfrn_version = (float) $_GET['dfrn_version'];
@ -318,7 +324,6 @@ function dfrn_notify_content(App $a) {
$rino = get_config('system','rino_encrypt');
$rino = intval($rino);
// use RINO1 if mcrypt isn't installed and RINO2 was selected
/// @TODO Define a code-standard: and/AND/&& are around
if ($rino == 2 && !function_exists('mcrypt_create_iv')) {
$rino = 1;
}