Double check for maximum number of workers

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index ba81e4712a8a54b52902dd14f533ca20be458de3..fcc5726548fea9ae944c204fbbd7362ff24c8034 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -33,8 +33,6 @@ 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)
@@ -95,6 +93,8 @@ function dfrn_notify_post(&$a) {
 
        $importer = $r[0];
 
+       logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DEBUG);
+
        if((($writable != (-1)) && ($writable != $importer['writable'])) || ($importer['forum'] != $forum) || ($importer['prv'] != $prv)) {
                q("UPDATE `contact` SET `writable` = %d, forum = %d, prv = %d WHERE `id` = %d",
                        intval(($writable == (-1)) ? $importer['writable'] : $writable),
@@ -130,12 +130,15 @@ function dfrn_notify_post(&$a) {
 
 
        // If we are setup as a soapbox we aren't accepting input from this person
-
-       if($importer['page-flags'] == PAGE_SOAPBOX)
-               xml_status(0);
+       // 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
+       //if($importer['page-flags'] == PAGE_SOAPBOX)
+       //      xml_status(0);
 
        $rino = get_config('system','rino_encrypt');
        $rino = intval($rino);
+       // use RINO1 if mcrypt isn't installed and RINO2 was selected
+       if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
 
        logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
@@ -228,8 +231,6 @@ 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));
@@ -281,6 +282,8 @@ function dfrn_notify_content(&$a) {
                if(! count($r))
                        $status = 1;
 
+               logger("Remote rino version: ".$rino_remote." for ".$r[0]["url"], LOGGER_DEBUG);
+
                $challenge = '';
                $encrypted_id = '';
                $id_str = $my_id . '.' . mt_rand(1000,9999);
@@ -306,7 +309,9 @@ function dfrn_notify_content(&$a) {
 
                $rino = get_config('system','rino_encrypt');
                $rino = intval($rino);
-
+               // use RINO1 if mcrypt isn't installed and RINO2 was selected
+               if ($rino==2 and !function_exists('mcrypt_create_iv')) $rino=1;
+               
                logger("Local rino version: ". $rino, LOGGER_DEBUG);
 
                // if requested rino is lower than enabled local rino, lower local rino version