Merge pull request #2313 from rabuzarus/0302_forum_class

[friendica.git] / mod / dfrn_notify.php

diff --git a/mod/dfrn_notify.php b/mod/dfrn_notify.php
index edf419e92907a5a1430b5327f9850872af46e691..4aa777b5503e63cfc257ed9340188a6c0dbefdf4 100644 (file)
--- a/mod/dfrn_notify.php
+++ b/mod/dfrn_notify.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once('library/simplepie/simplepie.inc');
 require_once('include/items.php');
 require_once('include/event.php');
 
@@ -130,12 +129,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);
 
@@ -306,6 +308,8 @@ 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);