sforkowany z mirror/friendica
Rino Bugfix: A variable was used that never was fetched
rodzic
ba6741932a
commit
38c8431527
|
@ -1990,8 +1990,7 @@ function dfrn_deliver($owner,$contact,$atom, $dissolve = false) {
|
|||
$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;
|
||||
|
||||
|
|
|
@ -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,6 +134,10 @@ 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)) {
|
||||
|
||||
|
@ -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) {
|
||||
|
@ -299,6 +307,8 @@ function dfrn_notify_content(&$a) {
|
|||
$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;
|
||||
|
|
Ładowanie…
Reference in New Issue