Rino Bugfix: A variable was used that never was fetched

diff --git a/include/items.php b/include/items.php
index f15e2a1fc5119580848f3024aa3dbf3917e19fa6..a5184abde4ec63ce81493512a68739be4bd70c3b 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -1986,13 +1986,12 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
        if($contact['duplex'] && $contact['issued-id'])
                $idtosend = '1:' . $orig_id;
 
-    
+
        $rino = get_config('system','rino_encrypt');
        $rino = intval($rino);
 
-   
+       logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
-       
        $ssl_val = intval(get_config('system','ssl_policy'));
        $ssl_policy = '';
 
@@ -2043,6 +2042,8 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
        $rino_remote_version = intval($res->rino);
        $page         = (($owner['page-flags'] == PAGE_COMMUNITY) ? 1 : 0);
 
+       logger("Remote rino version: ".$rino_remote_version, LOGGER_DEBUG);
+
        if($owner['page-flags'] == PAGE_PRVGROUP)
                $page = 2;
 
@@ -2120,26 +2121,26 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
                                        return -1;
                                } catch (CannotPerformOperation $ex) {
                                        logger('Cannot safely create a key');
-                                       return -1; 
+                                       return -1;
                                }
                                try {
                                        $data = Crypto::encrypt($postvars['data'], $key);
                                } catch (CryptoTestFailed $ex) {
                                        logger('Cannot safely perform encryption');
-                                       return -1; 
+                                       return -1;
                                } catch (CannotPerformOperation $ex) {
                                        logger('Cannot safely perform encryption');
-                                       return -1; 
+                                       return -1;
                                }
                                break;
                        default:
                                logger("rino: invalid requested verision '$rino_remote_version'");
                                return -1;
                }
-               
+
                $postvars['rino'] = $rino_remote_version;
                $postvars['data'] = bin2hex($data);
-               
+
                #logger('rino: sent key = ' . $key, LOGGER_DEBUG);
 
 
@@ -2167,7 +2168,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
 
                $postvars['key'] = bin2hex($postvars['key']);
        }
-       
+
 
        logger('dfrn_deliver: ' . "SENDING: " . print_r($postvars,true), LOGGER_DATA);
 

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index 874f17c77202a97b25c084603dd3b2c5f5aaf8e5..ba81e4712a8a54b52902dd14f533ca20be458de3 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -33,6 +33,8 @@ function dfrn_notify_post(&$a) {
                $dfrn_id = substr($dfrn_id,2);
        }
 
+       logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG);
+
        $r = q("SELECT * FROM `challenge` WHERE `dfrn-id` = '%s' AND `challenge` = '%s' LIMIT 1",
                dbesc($dfrn_id),
                dbesc($challenge)
@@ -132,16 +134,20 @@ function dfrn_notify_post(&$a) {
        if($importer['page-flags'] == PAGE_SOAPBOX)
                xml_status(0);
 
-       
+       $rino = get_config('system','rino_encrypt');
+       $rino = intval($rino);
+
+       logger("Local rino version: ". $rino, LOGGER_DEBUG);
+
        if(strlen($key)) {
-               
+
                // if local rino is lower than remote rino, abort: should not happen!
                // but only for $remote_rino > 1, because old code did't send rino version
                if ($rino_remote_version > 1 && $rino < $rino_remote) {
                        logger("rino version '$rino_remote' is lower than supported '$rino'");
                        xml_status(0,"rino version '$rino_remote' is lower than supported '$rino'");
                }
-               
+
                $rawkey = hex2bin(trim($key));
                logger('rino: md5 raw key: ' . md5($rawkey));
                $final_key = '';
@@ -164,7 +170,7 @@ function dfrn_notify_post(&$a) {
                }
 
                #logger('rino: received key : ' . $final_key);
-               
+
                switch($rino_remote) {
                        case 0:
                        case 1:
@@ -195,8 +201,8 @@ function dfrn_notify_post(&$a) {
                                logger("rino: invalid sent verision '$rino_remote'");
                                xml_status(0);
                }
-               
-               
+
+
                logger('rino: decrypted data: ' . $data, LOGGER_DATA);
        }
 
@@ -222,6 +228,8 @@ function dfrn_notify_content(&$a) {
 
                logger('dfrn_notify: new notification dfrn_id=' . $dfrn_id);
 
+               logger("Remote rino version: ".$rino_remote, LOGGER_DEBUG);
+
                $direction = (-1);
                if(strpos($dfrn_id,':') == 1) {
                        $direction = intval(substr($dfrn_id,0,1));
@@ -243,7 +251,7 @@ function dfrn_notify_content(&$a) {
                        dbesc($last_update)
                );
 
-               logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG );
+               logger('dfrn_notify: challenge=' . $hash, LOGGER_DEBUG);
 
                $sql_extra = '';
                switch($direction) {
@@ -295,14 +303,16 @@ function dfrn_notify_content(&$a) {
                $challenge    = bin2hex($challenge);
                $encrypted_id = bin2hex($encrypted_id);
 
-               
+
                $rino = get_config('system','rino_encrypt');
                $rino = intval($rino);
-               
+
+               logger("Local rino version: ". $rino, LOGGER_DEBUG);
+
                // if requested rino is lower than enabled local rino, lower local rino version
                // if requested rino is higher than enabled local rino, reply with local rino
                if ($rino_remote < $rino) $rino = $rino_remote;
-               
+
                if((($r[0]['rel']) && ($r[0]['rel'] != CONTACT_IS_SHARING)) || ($r[0]['page-flags'] == PAGE_COMMUNITY)) {
                        $perm = 'rw';
                }