From e912b1fd2edfd1c596e586b90d6beef0198de065 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 27 Sep 2013 23:33:35 +0200 Subject: [PATCH] pumpio: endless loop in comment completetion should be solved. Bug when registering should be solved as well. --- jappixmini/jappixmini.php | 3 +- jappixmini/lib.js | 3 +- pumpio/pumpio.php | 73 ++++++++++++++++++++++++--------------- 3 files changed, 49 insertions(+), 30 deletions(-) diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index aac5c5486..adbea6755 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -498,11 +498,12 @@ function jappixmini_script(&$a,&$s) { // get nickname $r = q("SELECT `username` FROM `user` WHERE `uid`=$uid"); $nickname = json_encode($r[0]["username"]); + $groupchats = get_config('jappixmini','groupchats'); // add javascript to start Jappix Mini $a->page['htmlhead'] .= ""; diff --git a/jappixmini/lib.js b/jappixmini/lib.js index ed52f5974..313027328 100644 --- a/jappixmini/lib.js +++ b/jappixmini/lib.js @@ -236,7 +236,7 @@ function jappixmini_addon_subscribe() { sendSubscribe(xid, "subscribe"); } -function jappixmini_addon_start(server, username, proxy, bosh, encrypted, password, nickname, contacts, contacts_hash, autoapprove, autosubscribe) { +function jappixmini_addon_start(server, username, proxy, bosh, encrypted, password, nickname, contacts, contacts_hash, autoapprove, autosubscribe, groupchats) { var handler = function(password){ // check if settings have changed, reinitialize jappix mini if this is the case var settings_identifier = str_sha1(server); @@ -261,6 +261,7 @@ function jappixmini_addon_start(server, username, proxy, bosh, encrypted, passwo HOST_BOSH = bosh; // start jappix mini + MINI_GROUPCHATS = groupchats; MINI_NICKNAME = nickname; LOCK_HOST = "off"; launchMini(true, false, server, username, password); diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index d378127a8..f697b227c 100755 --- 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"; @@ -89,7 +94,7 @@ function pumpio_registerclient($a, $host) { 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 +104,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); } - 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 +146,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); set_pconfig(local_user(), "pumpio", "oauth_token", $client->access_token); set_pconfig(local_user(), "pumpio", "oauth_token_secret", $client->access_token_secret); } @@ -146,7 +159,8 @@ function pumpio_connect($a) { if($success) { $o .= t("You are now authenticated to pumpio."); $o .= '
'.t("return to the connector page").''; - } + } else + $o = 'Could not connect to pumpio. Refresh the page or try again later.'; return($o); } @@ -481,7 +495,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 +566,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 +615,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,17 +980,17 @@ 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")) - return pumpio_dolike(&$a, $uid, $self, $post, $own_id); + return pumpio_dolike($a, $uid, $self, $post, $own_id); if (($post->verb == "unlike") OR ($post->verb == "unfavorite")) - return pumpio_dounlike(&$a, $uid, $self, $post, $own_id); + return pumpio_dounlike($a, $uid, $self, $post, $own_id); if ($post->verb == "delete") - return pumpio_dodelete(&$a, $uid, $self, $post, $own_id); + return pumpio_dodelete($a, $uid, $self, $post, $own_id); if ($post->verb != "update") { // Two queries for speed issues @@ -1068,7 +1082,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id) { $reply->published = $post->object->inReplyTo->published; $reply->received = $post->object->inReplyTo->updated; $reply->url = $post->object->inReplyTo->url; - pumpio_dopost(&$a, $client, $uid, $self, $reply, $own_id); + pumpio_dopost($a, $client, $uid, $self, $reply, $own_id); $postarray['parent-uri'] = $post->object->inReplyTo->id; } @@ -1125,7 +1139,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 +1197,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'); @@ -1220,13 +1235,13 @@ function pumpio_fetchinbox($a, $uid) { if (count($posts)) foreach ($posts as $post) { $last_id = $post->id; - pumpio_dopost(&$a, $client, $uid, $self, $post, $own_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 +1296,17 @@ function pumpio_queue_hook(&$a,&$b) { if(! count($r)) continue; - $user = $r[0]; + $userdata = $r[0]; - $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"); + //logger('pumpio_queue: fetching userdata '.print_r($userdata, true)); - $host = get_pconfig($user['uid'], "pumpio", "host"); - $user = get_pconfig($user['uid'], "pumpio", "user"); + $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($userdata['uid'], "pumpio", "host"); + $user = get_pconfig($userdata['uid'], "pumpio", "user"); $success = false; @@ -1326,7 +1343,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 +1352,7 @@ function pumpio_queue_hook(&$a,&$b) { } } -function pumpio_getreceiver($a, $b) { +function pumpio_getreceiver(&$a, $b) { $receiver = array(); @@ -1420,7 +1437,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 +1527,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); } }