X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=787c29b132d6babe128bcd7ef25ecfae334a06cf;hb=3d907bfc537445cb7e7562db175b06663906af7f;hp=fb7ce8c1ecd5453d764718d7d813a8aa049b66bb;hpb=bb04495f5b1941002b624b9463c6a3c6f5030f07;p=friendica-addons.git diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php index fb7ce8c1..787c29b1 100644 --- a/pumpio/pumpio.php +++ b/pumpio/pumpio.php @@ -5,6 +5,9 @@ * Version: 0.2 * Author: Michael Vogel */ + +use Friendica\Core\Worker; + require('addon/pumpio/oauth/http.php'); require('addon/pumpio/oauth/oauth_client.php'); require_once('include/enotify.php'); @@ -122,7 +125,7 @@ function pumpio_connect(&$a) { $consumer_secret = get_pconfig(local_user(), 'pumpio','consumer_secret'); $hostname = get_pconfig(local_user(), 'pumpio','host'); - if ((($consumer_key == "") OR ($consumer_secret == "")) AND ($hostname != "")) { + if ((($consumer_key == "") || ($consumer_secret == "")) && ($hostname != "")) { logger("pumpio_connect: register client"); $clientdata = pumpio_registerclient($a, $hostname); set_pconfig(local_user(), 'pumpio','consumer_key', $clientdata->client_id); @@ -134,7 +137,7 @@ function pumpio_connect(&$a) { logger("pumpio_connect: ckey: ".$consumer_key." csecrect: ".$consumer_secret, LOGGER_DEBUG); } - if (($consumer_key == "") OR ($consumer_secret == "")) { + if (($consumer_key == "") || ($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); @@ -251,13 +254,13 @@ function pumpio_settings(&$a,&$s) { $s .= ''; $s .= '
'; - if (($username != '') AND ($servername != '')) { + if (($username != '') && ($servername != '')) { $oauth_token = get_pconfig(local_user(), "pumpio", "oauth_token"); $oauth_token_secret = get_pconfig(local_user(), "pumpio", "oauth_token_secret"); $s .= '
'; - if (($oauth_token == "") OR ($oauth_token_secret == "")) { + if (($oauth_token == "") || ($oauth_token_secret == "")) { $s .= '
'; @@ -349,23 +352,27 @@ function pumpio_settings_post(&$a,&$b) { } } -function pumpio_post_local(&$a,&$b) { +function pumpio_post_local(&$a, &$b) { - if((! local_user()) || (local_user() != $b['uid'])) + if (!local_user() || (local_user() != $b['uid'])) { return; + } - $pumpio_post = intval(get_pconfig(local_user(),'pumpio','post')); + $pumpio_post = intval(get_pconfig(local_user(), 'pumpio', 'post')); $pumpio_enable = (($pumpio_post && x($_REQUEST,'pumpio_enable')) ? intval($_REQUEST['pumpio_enable']) : 0); - if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'pumpio','post_by_default'))) + if ($b['api_source'] && intval(get_pconfig(local_user(), 'pumpio', 'post_by_default'))) { $pumpio_enable = 1; + } - if(! $pumpio_enable) + if (!$pumpio_enable) { return; + } - if(strlen($b['postopts'])) + if (strlen($b['postopts'])) { $b['postopts'] .= ','; + } $b['postopts'] .= 'pumpio'; } @@ -403,7 +410,7 @@ function pumpio_send(&$a,&$b) { logger("pumpio_send: receiver ".print_r($receiver, true)); - if (!count($receiver) AND ($b['private'] OR !strstr($b['postopts'],'pumpio'))) + if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio'))) return; } @@ -418,10 +425,10 @@ function pumpio_send(&$a,&$b) { if($b['verb'] == ACTIVITY_DISLIKE) return; - if (($b['verb'] == ACTIVITY_POST) AND ($b['created'] !== $b['edited']) AND !$b['deleted']) + if (($b['verb'] == ACTIVITY_POST) && ($b['created'] !== $b['edited']) && !$b['deleted']) pumpio_action($a, $b["uid"], $b["uri"], "update", $b["body"]); - if (($b['verb'] == ACTIVITY_POST) AND $b['deleted']) + if (($b['verb'] == ACTIVITY_POST) && $b['deleted']) pumpio_action($a, $b["uid"], $b["uri"], "delete"); if($b['deleted'] || ($b['created'] !== $b['edited'])) @@ -480,7 +487,7 @@ function pumpio_send(&$a,&$b) { $inReplyTo = array("id" => $orig_post["uri"], "objectType" => "note"); - if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) + if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) $inReplyTo["objectType"] = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); $params["object"] = array( @@ -516,7 +523,7 @@ function pumpio_send(&$a,&$b) { $post_id = $user->object->id; logger('pumpio_send '.$username.': success '.$post_id); - if($post_id AND $iscomment) { + if($post_id && $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$b['id']); q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", dbesc($post_id), @@ -562,12 +569,12 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") { $orig_post = $r[0]; - if ($orig_post["extid"] AND !strstr($orig_post["extid"], "/proxy/")) + if ($orig_post["extid"] && !strstr($orig_post["extid"], "/proxy/")) $uri = $orig_post["extid"]; else $uri = $orig_post["uri"]; - if (($orig_post["object-type"] != "") AND (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) + if (($orig_post["object-type"] != "") && (strstr($orig_post["object-type"], NAMESPACE_ACTIVITY_SCHEMA))) $objectType = str_replace(NAMESPACE_ACTIVITY_SCHEMA, '', $orig_post["object-type"]); elseif (strstr($uri, "/api/comment/")) $objectType = "comment"; @@ -684,8 +691,7 @@ function pumpio_sync(&$a) { } function pumpio_cron(&$a,$b) { - //pumpio_sync($a); - proc_run("php","addon/pumpio/pumpio_sync.php"); + Worker::add(PRIORITY_MEDIUM,"addon/pumpio/pumpio_sync.php"); } function pumpio_fetchtimeline(&$a, $uid) { @@ -763,7 +769,7 @@ function pumpio_fetchtimeline(&$a, $uid) { if ($receiver->id == "http://activityschema.org/collection/public") $public = true; - if ($public AND !stristr($post->generator->displayName, $application_name)) { + if ($public && !stristr($post->generator->displayName, $application_name)) { require_once('include/html2bbcode.php'); $_SESSION["authenticated"] = true; @@ -1060,10 +1066,10 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet require_once('include/items.php'); require_once('include/html2bbcode.php'); - if (($post->verb == "like") OR ($post->verb == "favorite")) + if (($post->verb == "like") || ($post->verb == "favorite")) return pumpio_dolike($a, $uid, $self, $post, $own_id); - if (($post->verb == "unlike") OR ($post->verb == "unfavorite")) + if (($post->verb == "unlike") || ($post->verb == "unfavorite")) return pumpio_dounlike($a, $uid, $self, $post, $own_id); if ($post->verb == "delete") @@ -1206,9 +1212,9 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet if ($post->verb == "share") { if (!intval(get_config('system','wall-to-wall_share'))) { - if (isset($post->object->author->displayName) AND ($post->object->author->displayName != "")) + if (isset($post->object->author->displayName) && ($post->object->author->displayName != "")) $share_author = $post->object->author->displayName; - elseif (isset($post->object->author->preferredUsername) AND ($post->object->author->preferredUsername != "")) + elseif (isset($post->object->author->preferredUsername) && ($post->object->author->preferredUsername != "")) $share_author = $post->object->author->preferredUsername; else $share_author = $post->object->author->url; @@ -1240,7 +1246,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet $top_item = item_store($postarray); $postarray["id"] = $top_item; - if (($top_item == 0) AND ($post->verb == "update")) { + if (($top_item == 0) && ($post->verb == "update")) { $r = q("UPDATE `item` SET `title` = '%s', `body` = '%s' , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d", dbesc($postarray["title"]), dbesc($postarray["body"]), @@ -1278,7 +1284,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet foreach($myconv as $conv) { // now if we find a match, it means we're in this conversation - if(!link_compare($conv['author-link'],$importer_url) AND !link_compare($conv['author-link'],$own_id)) + if(!link_compare($conv['author-link'],$importer_url) && !link_compare($conv['author-link'],$own_id)) continue; require_once('include/enotify.php'); @@ -1407,8 +1413,11 @@ function pumpio_getallusers(&$a, $uid) { $success = false; } - foreach ($users->items AS $user) - pumpio_get_contact($uid, $user); + if (is_array($users->items)) { + foreach ($users->items AS $user) { + pumpio_get_contact($uid, $user); + } + } } function pumpio_queue_hook(&$a,&$b) { @@ -1427,7 +1436,7 @@ function pumpio_queue_hook(&$a,&$b) { logger('pumpio_queue: run'); - $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` + $r = q("SELECT `user`.* FROM `user` LEFT JOIN `contact` ON `contact`.`uid` = `user`.`uid` WHERE `contact`.`self` = 1 AND `contact`.`id` = %d LIMIT 1", intval($x['cid']) ); @@ -1448,8 +1457,8 @@ function pumpio_queue_hook(&$a,&$b) { $success = false; - if ($oauth_token AND $oauth_token_secret AND - $consumer_key AND $consumer_secret) { + if ($oauth_token && $oauth_token_secret && + $consumer_key && $consumer_secret) { $username = $user.'@'.$host; logger('pumpio_queue: able to post for user '.$username); @@ -1473,7 +1482,7 @@ function pumpio_queue_hook(&$a,&$b) { if($success) { $post_id = $user->object->id; logger('pumpio_queue: send '.$username.': success '.$post_id); - if($post_id AND $iscomment) { + if($post_id && $iscomment) { logger('pumpio_send '.$username.': Update extid '.$post_id." for post id ".$z['item']); q("UPDATE `item` SET `extid` = '%s' WHERE `id` = %d", dbesc($post_id),