]> git.mxchange.org Git - friendica-addons.git/blobdiff - pumpio/pumpio.php
Review updates
[friendica-addons.git] / pumpio / pumpio.php
index 9cf2461fe7dc4cd4c62569dec370a7ff3e849b0f..6a7429ffb0d297d0fe13a58343622df59ce6be2a 100644 (file)
@@ -5,40 +5,46 @@
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
-use Friendica\Model\GlobalContact;
-use Friendica\Object\Contact;
+use Friendica\Model\Contact;
+use Friendica\Model\GContact;
+use Friendica\Model\Group;
+use Friendica\Model\User;
+use Friendica\Model\Item;
+use Friendica\Model\Queue;
+use Friendica\Util\Network;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
 require_once 'include/enotify.php';
-require_once "include/Photo.php";
 require_once "mod/share.php";
 
 define('PUMPIO_DEFAULT_POLL_INTERVAL', 5); // given in minutes
 
 function pumpio_install() {
-       register_hook('post_local',           'addon/pumpio/pumpio.php', 'pumpio_post_local');
-       register_hook('notifier_normal',      'addon/pumpio/pumpio.php', 'pumpio_send');
-       register_hook('jot_networks',         'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
-       register_hook('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
-       register_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
-       register_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
-       register_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
-       register_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
+       Addon::registerHook('post_local',           'addon/pumpio/pumpio.php', 'pumpio_post_local');
+       Addon::registerHook('notifier_normal',      'addon/pumpio/pumpio.php', 'pumpio_send');
+       Addon::registerHook('jot_networks',         'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
+       Addon::registerHook('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
+       Addon::registerHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
+       Addon::registerHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
+       Addon::registerHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
+       Addon::registerHook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
 }
 
 function pumpio_uninstall() {
-       unregister_hook('post_local',       'addon/pumpio/pumpio.php', 'pumpio_post_local');
-       unregister_hook('notifier_normal',  'addon/pumpio/pumpio.php', 'pumpio_send');
-       unregister_hook('jot_networks',     'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
-       unregister_hook('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
-       unregister_hook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
-       unregister_hook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
-       unregister_hook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
-       unregister_hook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
+       Addon::unregisterHook('post_local',       'addon/pumpio/pumpio.php', 'pumpio_post_local');
+       Addon::unregisterHook('notifier_normal',  'addon/pumpio/pumpio.php', 'pumpio_send');
+       Addon::unregisterHook('jot_networks',     'addon/pumpio/pumpio.php', 'pumpio_jot_nets');
+       Addon::unregisterHook('connector_settings',      'addon/pumpio/pumpio.php', 'pumpio_settings');
+       Addon::unregisterHook('connector_settings_post', 'addon/pumpio/pumpio.php', 'pumpio_settings_post');
+       Addon::unregisterHook('cron', 'addon/pumpio/pumpio.php', 'pumpio_cron');
+       Addon::unregisterHook('queue_predeliver', 'addon/pumpio/pumpio.php', 'pumpio_queue_hook');
+       Addon::unregisterHook('check_item_notification','addon/pumpio/pumpio.php', 'pumpio_check_item_notification');
 }
 
 function pumpio_module() {}
@@ -46,7 +52,7 @@ function pumpio_module() {}
 function pumpio_content(&$a) {
 
        if(! local_user()) {
-               notice( t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.') . EOL);
                return '';
        }
 
@@ -80,7 +86,7 @@ function pumpio_registerclient(&$a, $host) {
 
        $url = "https://".$host."/api/client/register";
 
-       $params = array();
+       $params = [];
 
        $application_name  = Config::get('pumpio', 'application_name');
 
@@ -142,7 +148,7 @@ function pumpio_connect(&$a) {
        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);
+               $o .= L10n::t("Unable to register the client at the pump.io server '%s'.", $hostname);
                return($o);
        }
 
@@ -182,8 +188,8 @@ function pumpio_connect(&$a) {
 
        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>';
+               $o .= L10n::t("You are now authenticated to pumpio.");
+               $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.L10n::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.';
@@ -201,7 +207,7 @@ function pumpio_jot_nets(&$a,&$b) {
                $pumpio_defpost = PConfig::get(local_user(),'pumpio','post_by_default');
                $selected = ((intval($pumpio_defpost) == 1) ? ' checked="checked" ' : '');
                $b .= '<div class="profile-jot-net"><input type="checkbox" name="pumpio_enable"' . $selected . ' value="1" /> '
-                       . t('Post to pumpio') . '</div>';
+                       . L10n::t('Post to pumpio') . '</div>';
        }
 }
 
@@ -239,20 +245,20 @@ function pumpio_settings(&$a,&$s) {
        /* Add some HTML to the existing form */
 
        $s .= '<span id="settings_pumpio_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-       $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+       $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. L10n::t('Pump.io Import/Export/Mirror').'</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_pumpio_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_pumpio_expanded\'); openClose(\'settings_pumpio_inflated\');">';
-       $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. t('Pump.io Import/Export/Mirror').'</h3>';
+       $s .= '<img class="connector'.$css.'" src="images/pumpio.png" /><h3 class="connector">'. L10n::t('Pump.io Import/Export/Mirror').'</h3>';
        $s .= '</span>';
 
        $s .= '<div id="pumpio-username-wrapper">';
-       $s .= '<label id="pumpio-username-label" for="pumpio-username">'.t('pump.io username (without the servername)').'</label>';
+       $s .= '<label id="pumpio-username-label" for="pumpio-username">'.L10n::t('pump.io username (without the servername)').'</label>';
        $s .= '<input id="pumpio-username" type="text" name="pumpio_user" value="'.$username.'" />';
        $s .= '</div><div class="clear"></div>';
 
        $s .= '<div id="pumpio-servername-wrapper">';
-       $s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.t('pump.io servername (without "http://" or "https://" )').'</label>';
+       $s .= '<label id="pumpio-servername-label" for="pumpio-servername">'.L10n::t('pump.io servername (without "http://" or "https://" )').'</label>';
        $s .= '<input id="pumpio-servername" type="text" name="pumpio_host" value="'.$servername.'" />';
        $s .= '</div><div class="clear"></div>';
 
@@ -264,36 +270,36 @@ function pumpio_settings(&$a,&$s) {
                $s .= '<div id="pumpio-password-wrapper">';
                if (($oauth_token == "") || ($oauth_token_secret == "")) {
                        $s .= '<div id="pumpio-authenticate-wrapper">';
-                       $s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.t("Authenticate your pump.io connection").'</a>';
+                       $s .= '<a href="'.$a->get_baseurl().'/pumpio/connect">'.L10n::t("Authenticate your pump.io connection").'</a>';
                        $s .= '</div><div class="clear"></div>';
                } else {
                        $s .= '<div id="pumpio-import-wrapper">';
-                       $s .= '<label id="pumpio-import-label" for="pumpio-import">' . t('Import the remote timeline') . '</label>';
+                       $s .= '<label id="pumpio-import-label" for="pumpio-import">' . L10n::t('Import the remote timeline') . '</label>';
                        $s .= '<input id="pumpio-import" type="checkbox" name="pumpio_import" value="1" ' . $import_checked . '/>';
                        $s .= '</div><div class="clear"></div>';
 
                        $s .= '<div id="pumpio-enable-wrapper">';
-                       $s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . t('Enable pump.io Post Plugin') . '</label>';
+                       $s .= '<label id="pumpio-enable-label" for="pumpio-checkbox">' . L10n::t('Enable pump.io Post Addon') . '</label>';
                        $s .= '<input id="pumpio-checkbox" type="checkbox" name="pumpio" value="1" ' . $checked . '/>';
                        $s .= '</div><div class="clear"></div>';
 
                        $s .= '<div id="pumpio-bydefault-wrapper">';
-                       $s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . t('Post to pump.io by default') . '</label>';
+                       $s .= '<label id="pumpio-bydefault-label" for="pumpio-bydefault">' . L10n::t('Post to pump.io by default') . '</label>';
                        $s .= '<input id="pumpio-bydefault" type="checkbox" name="pumpio_bydefault" value="1" ' . $def_checked . '/>';
                        $s .= '</div><div class="clear"></div>';
 
                        $s .= '<div id="pumpio-public-wrapper">';
-                       $s .= '<label id="pumpio-public-label" for="pumpio-public">' . t('Should posts be public?') . '</label>';
+                       $s .= '<label id="pumpio-public-label" for="pumpio-public">' . L10n::t('Should posts be public?') . '</label>';
                        $s .= '<input id="pumpio-public" type="checkbox" name="pumpio_public" value="1" ' . $public_checked . '/>';
                        $s .= '</div><div class="clear"></div>';
 
                        $s .= '<div id="pumpio-mirror-wrapper">';
-                       $s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . t('Mirror all public posts') . '</label>';
+                       $s .= '<label id="pumpio-mirror-label" for="pumpio-mirror">' . L10n::t('Mirror all public posts') . '</label>';
                        $s .= '<input id="pumpio-mirror" type="checkbox" name="pumpio_mirror" value="1" ' . $mirror_checked . '/>';
                        $s .= '</div><div class="clear"></div>';
 
                        $s .= '<div id="pumpio-delete-wrapper">';
-                       $s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . t('Check to delete this preset') . '</label>';
+                       $s .= '<label id="pumpio-delete-label" for="pumpio-delete">' . L10n::t('Check to delete this preset') . '</label>';
                        $s .= '<input id="pumpio-delete" type="checkbox" name="pumpio_delete" value="1" />';
                        $s .= '</div><div class="clear"></div>';
                }
@@ -303,7 +309,7 @@ function pumpio_settings(&$a,&$s) {
 
        /* provide a submit button */
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="pumpio-submit" name="pumpio-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
 
 
@@ -336,7 +342,7 @@ function pumpio_settings_post(&$a,&$b) {
                        // Filtering the hostname if someone is entering it with "http"
                        $host = $_POST['pumpio_host'];
                        $host = trim($host);
-                       $host = str_replace(array("https://", "http://"), array("", ""), $host);
+                       $host = str_replace(["https://", "http://"], ["", ""], $host);
 
                        PConfig::set(local_user(),'pumpio','post',intval($_POST['pumpio']));
                        PConfig::set(local_user(),'pumpio','import',$_POST['pumpio_import']);
@@ -412,12 +418,13 @@ function pumpio_send(&$a,&$b) {
 
                logger("pumpio_send: receiver ".print_r($receiver, true));
 
-               if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio')))
+               if (!count($receiver) && ($b['private'] || !strstr($b['postopts'],'pumpio'))) {
                        return;
+               }
 
                // Dont't post if the post doesn't belong to us.
                // This is a check for forum postings
-               $self = dba::select('contact', array('id'), array('uid' => $b['uid'], 'self' => true), array('limit' => 1));
+               $self = dba::selectFirst('contact', ['id'], ['uid' => $b['uid'], 'self' => true]);
                if ($b['contact-id'] != $self['id']) {
                        return;
                }
@@ -468,14 +475,14 @@ function pumpio_send(&$a,&$b) {
 
                $content = bbcode($b['body'], false, false, 4);
 
-               $params = array();
+               $params = [];
 
                $params["verb"] = "post";
 
                if (!$iscomment) {
-                       $params["object"] = array(
+                       $params["object"] = [
                                                'objectType' => "note",
-                                               'content' => $content);
+                                               'content' => $content];
 
                        if ($title != "")
                                $params["object"]["displayName"] = $title;
@@ -493,16 +500,16 @@ function pumpio_send(&$a,&$b) {
                                $params["bcc"] = $receiver["bcc"];
 
                 } else {
-                       $inReplyTo = array("id" => $orig_post["uri"],
-                                       "objectType" => "note");
+                       $inReplyTo = ["id" => $orig_post["uri"],
+                                       "objectType" => "note"];
 
                        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(
+                       $params["object"] = [
                                                'objectType' => "comment",
                                                'content' => $content,
-                                               'inReplyTo' => $inReplyTo);
+                                               'inReplyTo' => $inReplyTo];
 
                        if ($title != "")
                                $params["object"]["displayName"] = $title;
@@ -521,7 +528,7 @@ function pumpio_send(&$a,&$b) {
                $url = 'https://'.$host.'/api/user/'.$user.'/feed';
 
                if (pumpio_reachable($url))
-                       $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+                       $success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
                else
                        $success = false;
 
@@ -546,12 +553,11 @@ function pumpio_send(&$a,&$b) {
                        if (count($r))
                                $a->contact = $r[0]["id"];
 
-                       $s = serialize(array('url' => $url, 'item' => $b['id'], 'post' => $params));
-                       require_once('include/queue_fn.php');
-                       add_to_queue($a->contact,NETWORK_PUMPIO,$s);
-                       notice(t('Pump.io post failed. Queued for retry.').EOL);
+                       $s = serialize(['url' => $url, 'item' => $b['id'], 'post' => $params]);
+                       
+                       Queue::add($a->contact, NETWORK_PUMPIO, $s);
+                       notice(L10n::t('Pump.io post failed. Queued for retry.').EOL);
                }
-
        }
 }
 
@@ -593,9 +599,9 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
                $objectType = "image";
 
        $params["verb"] = $action;
-       $params["object"] = array('id' => $uri,
+       $params["object"] = ['id' => $uri,
                                "objectType" => $objectType,
-                               "content" => $content);
+                               "content" => $content];
 
        $client = new oauth_client_class;
        $client->oauth_version = '1.0a';
@@ -610,7 +616,7 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
        $url = 'https://'.$hostname.'/api/user/'.$username.'/feed';
 
        if (pumpio_reachable($url))
-               $success = $client->CallAPI($url, 'POST', $params, array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+               $success = $client->CallAPI($url, 'POST', $params, ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
        else
                $success = false;
 
@@ -623,10 +629,10 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
                if (count($r))
                        $a->contact = $r[0]["id"];
 
-               $s = serialize(array('url' => $url, 'item' => $orig_post["id"], 'post' => $params));
-               require_once('include/queue_fn.php');
-               add_to_queue($a->contact,NETWORK_PUMPIO,$s);
-               notice(t('Pump.io like failed. Queued for retry.').EOL);
+               $s = serialize(['url' => $url, 'item' => $orig_post["id"], 'post' => $params]);
+               
+               Queue::add($a->contact, NETWORK_PUMPIO, $s);
+               notice(L10n::t('Pump.io like failed. Queued for retry.').EOL);
        }
 }
 
@@ -715,7 +721,7 @@ function pumpio_fetchtimeline(&$a, $uid) {
        //  get the application name for the pump.io app
        //  1st try personal config, then system config and fallback to the
        //  hostname of the node if neither one is set.
-       $application_name  = PConfig::get( $uid, 'pumpio', 'application_name');
+       $application_name  = PConfig::get($uid, 'pumpio', 'application_name');
        if ($application_name == "")
                $application_name  = Config::get('pumpio', 'application_name');
        if ($application_name == "")
@@ -740,7 +746,7 @@ function pumpio_fetchtimeline(&$a, $uid) {
        $username = $user.'@'.$host;
 
        if (pumpio_reachable($url))
-               $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+               $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
        else
                $success = false;
 
@@ -765,7 +771,7 @@ function pumpio_fetchtimeline(&$a, $uid) {
                        if ($first_time)
                                continue;
 
-                       $receiptians = array();
+                       $receiptians = [];
                        if (@is_array($post->cc))
                                $receiptians = array_merge($receiptians, $post->cc);
 
@@ -943,7 +949,7 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
                return;
        }
 
-       $likedata = array();
+       $likedata = [];
        $likedata['parent'] = $orig_post['id'];
        $likedata['verb'] = ACTIVITY_LIKE;
        $likedata['gravity'] = 3;
@@ -959,11 +965,11 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
        $author  = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
        $objauthor =  '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
-       $post_type = t('status');
+       $post_type = L10n::t('status');
        $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
        $likedata['object-type'] = ACTIVITY_OBJ_NOTE;
 
-       $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
+       $likedata['body'] = L10n::t('%1$s likes %2$s\'s %3$s', $author, $objauthor, $plink);
 
        $likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' .
                '<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>';
@@ -975,10 +981,10 @@ function pumpio_dolike(&$a, $uid, $self, $post, $own_id, $threadcompletion = tru
 
 function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
-       GlobalContact::update(array("url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
+       GContact::update(["url" => $contact->url, "network" => NETWORK_PUMPIO, "generation" => 2,
                        "photo" => $contact->image->url, "name" => $contact->displayName,  "hide" => true,
                        "nick" => $contact->preferredUsername, "location" => $contact->location->displayName,
-                       "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)));
+                       "about" => $contact->summary, "addr" => str_replace("acct:", "", $contact->id)]);
        $cid = Contact::getIdForURL($contact->url, $uid);
 
        if ($no_insert)
@@ -1023,14 +1029,7 @@ function pumpio_get_contact($uid, $contact, $no_insert = false) {
 
                $contact_id = $r[0]['id'];
 
-               $g = q("select def_gid from user where uid = %d limit 1",
-                       intval($uid)
-               );
-
-               if($g && intval($g[0]['def_gid'])) {
-                       require_once('include/group.php');
-                       group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
-               }
+               Group::addMember(User::getDefaultGroup($uid), $contact_id);
        } else {
                $contact_id = $r[0]["id"];
 
@@ -1059,7 +1058,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
                );
 
        if (count($r))
-               return drop_item($r[0]["id"], $false);
+               return Item::delete($r[0]["id"]);
 
        $r = q("SELECT * FROM `item` WHERE `extid` = '%s' AND `uid` = %d LIMIT 1",
                                dbesc($post->object->id),
@@ -1067,7 +1066,7 @@ function pumpio_dodelete(&$a, $uid, $self, $post, $own_id) {
                );
 
        if (count($r))
-               return drop_item($r[0]["id"], $false);
+               return Item::delete($r[0]["id"]);
 }
 
 function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcompletion = true) {
@@ -1106,7 +1105,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
        if (!strstr("post|share|update", $post->verb))
                return false;
 
-       $receiptians = array();
+       $receiptians = [];
        if (@is_array($post->cc))
                $receiptians = array_merge($receiptians, $post->cc);
 
@@ -1118,7 +1117,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
                        if ($receiver->id == "http://activityschema.org/collection/public")
                                $public = true;
 
-       $postarray = array();
+       $postarray = [];
         $postarray['network'] = NETWORK_PUMPIO;
        $postarray['gravity'] = 0;
        $postarray['uid'] = $uid;
@@ -1299,7 +1298,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 
                                        $conv_parent = $conv['parent'];
 
-                                       notification(array(
+                                       notification([
                                                'type'         => NOTIFY_COMMENT,
                                                'notify_flags' => $user[0]['notify-flags'],
                                                'language'     => $user[0]['language'],
@@ -1314,7 +1313,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
                                                'verb'         => ACTIVITY_POST,
                                                'otype'        => 'item',
                                                'parent'       => $conv_parent,
-                                               ));
+                                               ]);
 
                                        // only send one notification
                                        break;
@@ -1367,7 +1366,7 @@ function pumpio_fetchinbox(&$a, $uid) {
                $url .= '?since='.urlencode($last_id);
 
        if (pumpio_reachable($url))
-               $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $user);
+               $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $user);
        else
                $success = false;
 
@@ -1408,7 +1407,7 @@ function pumpio_getallusers(&$a, $uid) {
        $url = 'https://'.$hostname.'/api/user/'.$username.'/following';
 
        if (pumpio_reachable($url))
-               $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+               $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users);
        else
                $success = false;
 
@@ -1416,7 +1415,7 @@ function pumpio_getallusers(&$a, $uid) {
                $url = 'https://'.$hostname.'/api/user/'.$username.'/following?count='.$users->totalItems;
 
                if (pumpio_reachable($url))
-                       $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $users);
+                       $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $users);
                else
                        $success = false;
        }
@@ -1436,8 +1435,6 @@ function pumpio_queue_hook(&$a,&$b) {
        if(! count($qi))
                return;
 
-       require_once('include/queue_fn.php');
-
        foreach($qi as $x) {
                if($x['network'] !== NETWORK_PUMPIO)
                        continue;
@@ -1483,7 +1480,7 @@ function pumpio_queue_hook(&$a,&$b) {
                        $client->client_secret = $consumer_secret;
 
                        if (pumpio_reachable($z['url']))
-                               $success = $client->CallAPI($z['url'], 'POST', $z['post'], array('FailOnAccessError'=>true, 'RequestContentType'=>'application/json'), $user);
+                               $success = $client->CallAPI($z['url'], 'POST', $z['post'], ['FailOnAccessError'=>true, 'RequestContentType'=>'application/json'], $user);
                        else
                                $success = false;
 
@@ -1497,7 +1494,7 @@ function pumpio_queue_hook(&$a,&$b) {
                                                intval($z['item'])
                                        );
                                }
-                               remove_queue_item($x['id']);
+                               Queue::removeItem($x['id']);
                        } else
                                logger('pumpio_queue: send '.$username.': '.$url.' general error: ' . print_r($user,true));
                } else
@@ -1505,14 +1502,14 @@ function pumpio_queue_hook(&$a,&$b) {
 
                if (!$success) {
                        logger('pumpio_queue: delayed');
-                       update_queue_time($x['id']);
+                       Queue::updateTime($x['id']);
                }
        }
 }
 
 function pumpio_getreceiver(&$a, $b) {
 
-       $receiver = array();
+       $receiver = [];
 
        if (!$b["private"]) {
 
@@ -1522,9 +1519,9 @@ function pumpio_getreceiver(&$a, $b) {
                $public = PConfig::get($b['uid'], "pumpio", "public");
 
                if ($public)
-                       $receiver["to"][] = Array(
+                       $receiver["to"][] = [
                                                "objectType" => "collection",
-                                               "id" => "http://activityschema.org/collection/public");
+                                               "id" => "http://activityschema.org/collection/public"];
        } else {
                $cids = explode("><", $b["allow_cid"]);
                $gids = explode("><", $b["allow_gid"]);
@@ -1539,30 +1536,29 @@ function pumpio_getreceiver(&$a, $b) {
                                );
 
                        if (count($r)) {
-                               $receiver["bcc"][] = Array(
+                               $receiver["bcc"][] = [
                                                        "displayName" => $r[0]["name"],
                                                        "objectType" => "person",
                                                        "preferredUsername" => $r[0]["nick"],
-                                                       "url" => $r[0]["url"]);
+                                                       "url" => $r[0]["url"]];
                        }
                }
                foreach ($gids AS $gid) {
                        $gid = trim($gid, " <>");
 
                        $r = q("SELECT `contact`.`name`, `contact`.`nick`, `contact`.`url`, `contact`.`network` ".
-                               "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d AND `group_member`.`uid` = %d ".
+                               "FROM `group_member`, `contact` WHERE `group_member`.`gid` = %d ".
                                "AND `contact`.`id` = `group_member`.`contact-id` AND `contact`.`network` = '%s'",
                                        intval($gid),
-                                       intval($b["uid"]),
                                        dbesc(NETWORK_PUMPIO)
                                );
 
                        foreach ($r AS $row)
-                               $receiver["bcc"][] = Array(
+                               $receiver["bcc"][] = [
                                                        "displayName" => $row["name"],
                                                        "objectType" => "person",
                                                        "preferredUsername" => $row["nick"],
-                                                       "url" => $row["url"]);
+                                                       "url" => $row["url"]];
                }
        }
 
@@ -1583,11 +1579,11 @@ function pumpio_getreceiver(&$a, $b) {
                                );
 
                        if (count($r)) {
-                                       $receiver["to"][] = Array(
+                                       $receiver["to"][] = [
                                                                "displayName" => $r[0]["name"],
                                                                "objectType" => "person",
                                                                "preferredUsername" => $r[0]["nick"],
-                                                               "url" => $r[0]["url"]);
+                                                               "url" => $r[0]["url"]];
                        }
                }
        }
@@ -1634,7 +1630,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
        logger("pumpio_fetchallcomments: fetching comment for user ".$uid." url ".$url);
 
        if (pumpio_reachable($url))
-               $success = $client->CallAPI($url, 'GET', array(), array('FailOnAccessError'=>true), $item);
+               $success = $client->CallAPI($url, 'GET', [], ['FailOnAccessError'=>true], $item);
        else
                $success = false;
 
@@ -1703,7 +1699,7 @@ function pumpio_fetchallcomments(&$a, $uid, $id) {
 
 
 function pumpio_reachable($url) {
-       $data = z_fetch_url($url, false, $redirects, array('timeout'=>10));
+       $data = Network::curl($url, false, $redirects, ['timeout'=>10]);
        return(intval($data['return_code']) != 0);
 }