Merge branch 'master' of git://github.com/friendica/friendica

[friendica.git] / mod / dfrn_poll.php

diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php
old mode 100644 (file)
new mode 100755 (executable)
index 4b25efe..b12e071
--- a/mod/dfrn_poll.php
+++ b/mod/dfrn_poll.php
@@ -16,6 +16,7 @@ function dfrn_poll_init(&$a) {
        $challenge       = ((x($_GET,'challenge'))       ? $_GET['challenge']            : '');
        $sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
        $dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
+       $perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
 
        $direction = (-1);
 
@@ -26,6 +27,16 @@ function dfrn_poll_init(&$a) {
        }
 
        if(($dfrn_id === '') && (! x($_POST,'dfrn_id')) && ($a->argc > 1)) {
+               if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+                       killme();
+               }
+
+               $r = q("SELECT `hidewall` FROM `user` WHERE `user`.`nickname` = '%s' LIMIT 1",
+                       dbesc($a->argv[1])
+               );
+               if(count($r) && $r[0]['hidewall'])
+                       killme();
+ 
                logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
                header("Content-type: application/atom+xml");
                $o = get_feed_for($a, '', $a->argv[1],$last_update);
@@ -50,7 +61,7 @@ function dfrn_poll_init(&$a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                                break; // NOTREACHED
                }
 
@@ -69,13 +80,15 @@ function dfrn_poll_init(&$a) {
 
                        if(strlen($s)) {
 
-                               $xml = simplexml_load_string($s);
+                               $xml = parse_xml_string($s);
 
                                if((int) $xml->status == 1) {
                                        $_SESSION['authenticated'] = 1;
                                        $_SESSION['visitor_id'] = $r[0]['id'];
                                        $_SESSION['visitor_home'] = $r[0]['url'];
-                                       notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+                                       $_SESSION['visitor_handle'] = $r[0]['addr'];
+                                       $_SESSION['visitor_visiting'] = $r[0]['uid'];
+                                       info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
                                        // Visitors get 1 day session.
                                        $session_id = session_id();
                                        $expire = time() + 86400;
@@ -88,7 +101,7 @@ function dfrn_poll_init(&$a) {
                        $profile = $r[0]['nickname'];
                        goaway((strlen($destination_url)) ? $destination_url : $a->get_baseurl() . '/profile/' . $profile);
                }
-               goaway($a->get_baseurl());
+               goaway(z_root());
 
        }
 
@@ -183,8 +196,9 @@ function dfrn_poll_post(&$a) {
        $challenge    = ((x($_POST,'challenge'))    ? $_POST['challenge']            : '');
        $url          = ((x($_POST,'url'))          ? $_POST['url']                  : '');
        $sec          = ((x($_POST,'sec'))          ? $_POST['sec']                  : '');
-       $ptype        = ((x($_POST,'type'))         ? $_POST['type']                  : '');
+       $ptype        = ((x($_POST,'type'))         ? $_POST['type']                 : '');
        $dfrn_version = ((x($_POST,'dfrn_version')) ? (float) $_POST['dfrn_version'] : 2.0);
+       $perm         = ((x($_POST,'perm'))         ? $_POST['perm']                 : 'r');
 
        if($ptype === 'profile-check') {
 
@@ -284,7 +298,7 @@ function dfrn_poll_post(&$a) {
                        $my_id = '0:' . $dfrn_id;
                        break;
                default:
-                       goaway($a->get_baseurl());
+                       goaway(z_root());
                        break; // NOTREACHED
        }
 
@@ -295,6 +309,7 @@ function dfrn_poll_post(&$a) {
        if(! count($r))
                killme();
 
+       $contact = $r[0];
        $owner_uid = $r[0]['uid'];
        $contact_id = $r[0]['id']; 
 
@@ -328,6 +343,23 @@ function dfrn_poll_post(&$a) {
                // NOTREACHED
        }
        else {
+
+               // Update the writable flag if it changed               
+               logger('dfrn_poll: post request feed: ' . print_r($_POST,true),LOGGER_DATA);
+               if($dfrn_version >= 2.21) {
+                       if($perm === 'rw')
+                               $writable = 1;
+                       else
+                               $writable = 0;
+
+                       if($writable !=  $contact['writable']) {
+                               q("UPDATE `contact` SET `writable` = %d WHERE `id` = %d LIMIT 1",
+                                       intval($writable),
+                                       intval($contact_id)
+                               );
+                       }
+               }                               
+
                header("Content-type: application/atom+xml");
                $o = get_feed_for($a,$dfrn_id, $a->argv[1], $last_update, $direction);
                echo $o;
@@ -344,6 +376,7 @@ function dfrn_poll_content(&$a) {
        $destination_url = ((x($_GET,'destination_url')) ? $_GET['destination_url']      : '');
        $sec             = ((x($_GET,'sec'))             ? $_GET['sec']                  : '');
        $dfrn_version    = ((x($_GET,'dfrn_version'))    ? (float) $_GET['dfrn_version'] : 2.0);
+       $perm            = ((x($_GET,'perm'))            ? $_GET['perm']                 : 'r');
 
        $direction = (-1);
        if(strpos($dfrn_id,':') == 1) {
@@ -388,7 +421,7 @@ function dfrn_poll_content(&$a) {
                                $my_id = '0:' . $dfrn_id;
                                break;
                        default:
-                               goaway($a->get_baseurl());
+                               goaway(z_root());
                                break; // NOTREACHED
                }
 
@@ -445,7 +478,7 @@ function dfrn_poll_content(&$a) {
                                        'sec' => $sec
                                ));
                        }
-
+                       
                        $profile = $r[0]['nickname'];
 
                        switch($destination_url) {
@@ -468,7 +501,7 @@ function dfrn_poll_content(&$a) {
 
                        if(strlen($s) && strstr($s,'<?xml')) {
 
-                               $xml = simplexml_load_string($s);
+                               $xml = parse_xml_string($s);
 
                                logger('dfrn_poll: profile: parsed xml: ' . print_r($xml,true), LOGGER_DATA);
 
@@ -480,7 +513,8 @@ function dfrn_poll_content(&$a) {
                                        $_SESSION['authenticated'] = 1;
                                        $_SESSION['visitor_id'] = $r[0]['id'];
                                        $_SESSION['visitor_home'] = $r[0]['url'];
-                                       notice( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
+                                       $_SESSION['visitor_visiting'] = $r[0]['uid'];
+                                       info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL);
                                        // Visitors get 1 day session.
                                        $session_id = session_id();
                                        $expire = time() + 86400;