diff --git a/fbpost/fbpost.php b/fbpost/fbpost.php index ba60f4e64..1167376a8 100644 --- a/fbpost/fbpost.php +++ b/fbpost/fbpost.php @@ -1052,11 +1052,14 @@ function fbpost_fetchwall($a, $uid) { $_SESSION["authenticated"] = true; $_SESSION["uid"] = $uid; + unset($_REQUEST); $_REQUEST["type"] = "wall"; $_REQUEST["api_source"] = true; $_REQUEST["profile_uid"] = $uid; $_REQUEST["source"] = "Facebook"; + $_REQUEST["title"] = ""; + $_REQUEST["body"] = (isset($item->message) ? escape_tags($item->message) : ''); if(isset($item->name) and isset($item->link)) diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php index 5d0e86c3d..fdd0b579a 100644 --- a/fromgplus/fromgplus.php +++ b/fromgplus/fromgplus.php @@ -109,6 +109,7 @@ function fromgplus_post($a, $uid, $source, $body, $location) { $_SESSION['authenticated'] = true; $_SESSION['uid'] = $uid; + unset($_REQUEST); $_REQUEST['type'] = 'wall'; $_REQUEST['api_source'] = true; diff --git a/public_server/public_server.php b/public_server/public_server.php index 3711854f8..becf96c34 100644 --- a/public_server/public_server.php +++ b/public_server/public_server.php @@ -43,9 +43,11 @@ function public_server_register_account($a,$b) { ); }; - + function public_server_cron($a,$b) { + logger("public_server: cron start"); + require_once('include/enotify.php'); $r = q("select * from user where account_expires_on < UTC_TIMESTAMP() + INTERVAL 5 DAY and account_expires_on > '0000-00-00 00:00:00' and expire_notification_sent = '0000-00-00 00:00:00' "); @@ -116,6 +118,7 @@ function public_server_cron($a,$b) { } } + logger("public_server: cron end"); } diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index da723eca9..f85e8bd95 100755 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -385,14 +385,16 @@ function pumpio_send(&$a,&$b) { $client->client_id = $consumer_key; $client->client_secret = $consumer_secret; + $username = $user.'@'.$host; + $success = $client->CallAPI( 'https://'.$host.'/api/user/'.$user.'/feed', 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user); if($success) - logger('pumpio_send: success'); + logger('pumpio_send '.$username.': success'); else - logger('pumpio_send: general error: ' . print_r($user,true)); + logger('pumpio_send '.$username.': general error: ' . print_r($user,true)); } } @@ -456,10 +458,12 @@ function pumpio_fetchtimeline($a, $uid) { logger('pumpio: fetching for user '.$uid.' '.$url.' C:'.$client->client_id.' CS:'.$client->client_secret.' T:'.$client->access_token.' TS:'.$client->access_token_secret); + $username = $user.'@'.$host; + $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user); if (!$success) { - logger('pumpio: error fetching posts for user '.$uid." ".print_r($user, true)); + logger('pumpio: error fetching posts for user '.$uid." ".$username." ".print_r($user, true)); return; } @@ -498,6 +502,7 @@ function pumpio_fetchtimeline($a, $uid) { $_SESSION["authenticated"] = true; $_SESSION["uid"] = $uid; + unset($_REQUEST); $_REQUEST["type"] = "wall"; $_REQUEST["api_source"] = true; $_REQUEST["profile_uid"] = $uid; @@ -505,6 +510,8 @@ function pumpio_fetchtimeline($a, $uid) { if ($post->object->displayName != "") $_REQUEST["title"] = html2bbcode($post->object->displayName); + else + $_REQUEST["title"] = ""; $_REQUEST["body"] = html2bbcode($post->object->content); diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 6b4c8010f..bd2312f7a 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -855,6 +855,9 @@ function statusnet_fetchtimeline($a, $uid) { if ($first_time) continue; + if ($post->source == "activity") + continue; + if (is_object($post->retweeted_status)) continue; @@ -865,6 +868,7 @@ function statusnet_fetchtimeline($a, $uid) { $_SESSION["authenticated"] = true; $_SESSION["uid"] = $uid; + unset($_REQUEST); $_REQUEST["type"] = "wall"; $_REQUEST["api_source"] = true; $_REQUEST["profile_uid"] = $uid; @@ -872,6 +876,8 @@ function statusnet_fetchtimeline($a, $uid) { //$_REQUEST["date"] = $post->created_at; + $_REQUEST["title"] = ""; + $_REQUEST["body"] = $post->text; if (is_string($post->place->name)) $_REQUEST["location"] = $post->place->name; diff --git a/twitter/twitter.php b/twitter/twitter.php index 775072e0b..5e01db959 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -678,6 +678,7 @@ function twitter_fetchtimeline($a, $uid) { $_SESSION["authenticated"] = true; $_SESSION["uid"] = $uid; + unset($_REQUEST); $_REQUEST["type"] = "wall"; $_REQUEST["api_source"] = true; $_REQUEST["profile_uid"] = $uid; @@ -685,6 +686,8 @@ function twitter_fetchtimeline($a, $uid) { //$_REQUEST["date"] = $post->created_at; + $_REQUEST["title"] = ""; + $_REQUEST["body"] = $post->text; if (is_string($post->place->name)) $_REQUEST["location"] = $post->place->name;