pumpio: PHP fixes for 5.4 not warn all time

[friendica-addons.git] / pumpio / pumpio.php

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index fc705e756ed24b5bf876eb4757a828ffbb762fb5..63f403c276d842e3622e57170bf03b52a90647da 100755 (executable)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -39,6 +39,11 @@ function pumpio_content(&$a) {
                return '';
        }
 
+       if (function_exists("apc_delete")) {
+               $toDelete = new APCIterator('user', APC_ITER_VALUE);
+               apc_delete($toDelete);
+       }
+
        if (isset($a->argv[1]))
                switch ($a->argv[1]) {
                        case "connect":
@@ -54,7 +59,7 @@ function pumpio_content(&$a) {
        return $o;
 }
 
-function pumpio_registerclient($a, $host) {
+function pumpio_registerclient(&$a, $host) {
 
        $url = "https://".$host."/api/client/register";
 
@@ -72,6 +77,8 @@ function pumpio_registerclient($a, $host) {
         $params["logo_url"] = $a->get_baseurl()."/images/friendica-256.png";
         $params["redirect_uris"] = $a->get_baseurl()."/pumpio/connect";
 
+       logger("pumpio_registerclient: ".$url." parameters ".print_r($params, true), LOGGER_DEBUG);
+
         $ch = curl_init($url);
         curl_setopt($ch, CURLOPT_HEADER, false);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER,true);
@@ -84,12 +91,15 @@ function pumpio_registerclient($a, $host) {
 
         if ($curl_info["http_code"] == "200") {
                 $values = json_decode($s);
+               logger("pumpio_registerclient: success ".print_r($values, true), LOGGER_DEBUG);
                return($values);
         }
+       logger("pumpio_registerclient: failed: ".print_r($curl_info, true), LOGGER_DEBUG);
        return(false);
+
 }
 
-function pumpio_connect($a) {
+function pumpio_connect(&$a) {
        // Start a session.  This is necessary to hold on to  a few keys the callback script will also need
        session_start();
 
@@ -99,16 +109,23 @@ function pumpio_connect($a) {
        $hostname = get_pconfig(local_user(), 'pumpio','host');
 
        if ((($consumer_key == "") OR ($consumer_secret == "")) AND ($hostname != "")) {
+               logger("pumpio_connect: register client");
                $clientdata = pumpio_registerclient($a, $hostname);
                set_pconfig(local_user(), 'pumpio','consumer_key', $clientdata->client_id);
                set_pconfig(local_user(), 'pumpio','consumer_secret', $clientdata->client_secret);
 
                $consumer_key = get_pconfig(local_user(), 'pumpio','consumer_key');
                $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret');
+
+               logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG);
        }
 
-       if (($consumer_key == "") OR ($consumer_secret == ""))
-               return;
+       if (($consumer_key == "") OR ($consumer_secret == "")) {
+               logger("pumpio_connect: ".sprintf("Unable to register the client at the pump.io server '%s'.", $hostname));
+
+               $o .= sprintf(t("Unable to register the client at the pump.io server '%s'."), $hostname);
+               return($o);
+       }
 
        // The callback URL is the script that gets called after the user authenticates with pumpio
        $callback_url = $a->get_baseurl()."/pumpio/connect";
@@ -134,6 +151,7 @@ function pumpio_connect($a) {
        if (($success = $client->Initialize())) {
                if (($success = $client->Process())) {
                        if (strlen($client->access_token)) {
+                               logger("pumpio_connect: otoken: ".$client->access_token." osecrect: ".$client->access_token_secret, LOGGER_DEBUG);
                                set_pconfig(local_user(), "pumpio", "oauth_token", $client->access_token);
                                set_pconfig(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret);
                        }
@@ -144,8 +162,12 @@ function pumpio_connect($a) {
            $o = 'Could not connect to pumpio. Refresh the page or try again later.';
 
         if($success) {
+               logger("pumpio_connect: authenticated");
                $o .= t("You are now authenticated to pumpio.");
                $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
+       } else {
+               logger("pumpio_connect: could not connect");
+               $o = 'Could not connect to pumpio. Refresh the page or try again later.';
        }
 
        return($o);
@@ -294,6 +316,8 @@ function pumpio_settings_post(&$a,&$b) {
                        set_pconfig(local_user(),'pumpio','public',$_POST['pumpio_public']);
                        set_pconfig(local_user(),'pumpio','mirror',$_POST['pumpio_mirror']);
                        set_pconfig(local_user(),'pumpio','post_by_default',intval($_POST['pumpio_bydefault']));
+
+                       header("Location: ".$a->get_baseurl()."/pumpio/connect");
                }
        }
 }
@@ -329,7 +353,7 @@ function pumpio_send(&$a,&$b) {
                        return;
        }
 
-       logger("pumpio_send: parameter ".print_r($b, true));
+       logger("pumpio_send: parameter ".print_r($b, true), LOGGER_DATA);
 
        if($b['parent'] != $b['id']) {
                // Looking if its a reply to a pumpio post
@@ -481,7 +505,7 @@ function pumpio_send(&$a,&$b) {
        }
 }
 
-function pumpio_action($a, $uid, $uri, $action, $content) {
+function pumpio_action(&$a, $uid, $uri, $action, $content) {
 
        // Don't do likes and other stuff if you don't import the timeline
        if (!get_pconfig($uid,'pumpio','import'))
@@ -552,7 +576,7 @@ function pumpio_action($a, $uid, $uri, $action, $content) {
 }
 
 
-function pumpio_cron($a,$b) {
+function pumpio_cron(&$a,$b) {
         $last = get_config('pumpio','last_poll');
 
         $poll_interval = intval(get_config('pumpio','poll_interval'));
@@ -601,7 +625,7 @@ function pumpio_cron($a,$b) {
        set_config('pumpio','last_poll', time());
 }
 
-function pumpio_fetchtimeline($a, $uid) {
+function pumpio_fetchtimeline(&$a, $uid) {
        $ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
        $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
        $otoken  = get_pconfig($uid, 'pumpio', 'oauth_token');
@@ -966,7 +990,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
                return drop_item($r[0]["id"], $false);
 }
 
-function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) {
+function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = false) {
        require_once('include/items.php');
 
        if (($post->verb == "like") OR ($post->verb == "favorite"))
@@ -1056,14 +1080,17 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) {
                        }
                }
 
+               $reply = new stdClass;
                $reply->verb = "note";
                $reply->cc = $post->cc;
                $reply->to = $post->to;
+               $reply->object = new stdClass;
                $reply->object->objectType = $post->object->inReplyTo->objectType;
                $reply->object->content = $post->object->inReplyTo->content;
                $reply->object->id = $post->object->inReplyTo->id;
                $reply->actor = $post->object->inReplyTo->author;
                $reply->url = $post->object->inReplyTo->url;
+               $reply->generator = new stdClass;
                $reply->generator->displayName = "pumpio";
                $reply->published = $post->object->inReplyTo->published;
                $reply->received = $post->object->inReplyTo->updated;
@@ -1125,7 +1152,8 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) {
 
        if ($post->object->objectType == "comment") {
 
-               pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
+               if ($threadcompletion)
+                       pumpio_fetchallcomments($a, $uid, $postarray['parent-uri']);
 
                $user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
                                intval($uid)
@@ -1182,7 +1210,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) {
        return $top_item;
 }
 
-function pumpio_fetchinbox($a, $uid) {
+function pumpio_fetchinbox(&$a, $uid) {
 
         $ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
         $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
@@ -1215,18 +1243,21 @@ function pumpio_fetchinbox($a, $uid) {
                $url .= '?since='.urlencode($last_id);
 
         $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
-        $posts = array_reverse($user->items);
 
-       if (count($posts))
-               foreach ($posts as $post) {
-                       $last_id = $post->id;
-                       pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
-               }
+       if ($user->items) {
+           $posts = array_reverse($user->items);
+
+           if (count($posts))
+                   foreach ($posts as $post) {
+                           $last_id = $post->id;
+                           pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
+                   }
+       }
 
        set_pconfig($uid,'pumpio','last_id', $last_id);
 }
 
-function pumpio_getallusers($a, $uid) {
+function pumpio_getallusers(&$a, $uid) {
         $ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
         $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
         $otoken  = get_pconfig($uid, 'pumpio', 'oauth_token');
@@ -1281,15 +1312,17 @@ function pumpio_queue_hook(&$a,&$b) {
                if(! count($r))
                        continue;
 
-               $user = $r[0];
+               $userdata = $r[0];
+
+               //logger('pumpio_queue: fetching userdata '.print_r($userdata, true));
 
-               $oauth_token = get_pconfig($user['uid'], "pumpio", "oauth_token");
-               $oauth_token_secret = get_pconfig($user['uid'], "pumpio", "oauth_token_secret");
-               $consumer_key = get_pconfig($user['uid'], "pumpio","consumer_key");
-               $consumer_secret = get_pconfig($user['uid'], "pumpio","consumer_secret");
+               $oauth_token = get_pconfig($userdata['uid'], "pumpio", "oauth_token");
+               $oauth_token_secret = get_pconfig($userdata['uid'], "pumpio", "oauth_token_secret");
+               $consumer_key = get_pconfig($userdata['uid'], "pumpio","consumer_key");
+               $consumer_secret = get_pconfig($userdata['uid'], "pumpio","consumer_secret");
 
-               $host = get_pconfig($user['uid'], "pumpio", "host");
-               $user = get_pconfig($user['uid'], "pumpio", "user");
+               $host = get_pconfig($userdata['uid'], "pumpio", "host");
+               $user = get_pconfig($userdata['uid'], "pumpio", "user");
 
                $success = false;
 
@@ -1326,7 +1359,7 @@ function pumpio_queue_hook(&$a,&$b) {
                        } else
                                logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true));
                } else
-                       logger("pumpio_queue: Error getting tokens for user ".$user['uid']);
+                       logger("pumpio_queue: Error getting tokens for user ".$userdata['uid']);
 
                if (!$success) {
                        logger('pumpio_queue: delayed');
@@ -1335,7 +1368,7 @@ function pumpio_queue_hook(&$a,&$b) {
        }
 }
 
-function pumpio_getreceiver($a, $b) {
+function pumpio_getreceiver(&$a, $b) {
 
        $receiver = array();
 
@@ -1420,7 +1453,7 @@ function pumpio_getreceiver($a, $b) {
        return $receiver;
 }
 
-function pumpio_fetchallcomments($a, $uid, $id) {
+function pumpio_fetchallcomments(&$a, $uid, $id) {
        $ckey    = get_pconfig($uid, 'pumpio', 'consumer_key');
        $csecret = get_pconfig($uid, 'pumpio', 'consumer_secret');
        $otoken  = get_pconfig($uid, 'pumpio', 'oauth_token');
@@ -1510,7 +1543,7 @@ function pumpio_fetchallcomments($a, $uid, $id) {
                $post->object = $item;
 
                logger("pumpio_fetchallcomments: posting comment ".$post->object->id);
-               pumpio_dopost($a, $client, $uid, $self, $post, $own_id);
+               pumpio_dopost($a, $client, $uid, $self, $post, $own_id, false);
        }
 }