Merge pull request #492 from zeroadam/Addon

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

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index d8538dccce431ed7d287f414960307f06340a6a6..be4db5fafdcd9b82c49823f7d4d3276c932e4919 100644 (file)
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -5,6 +5,7 @@
  * Version: 0.2
  * Author: Michael Vogel <http://pirati.ca/profile/heluecht>
  */
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
@@ -12,6 +13,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\GContact;
 use Friendica\Model\Group;
 use Friendica\Model\User;
+use Friendica\Model\Item;
 
 require 'addon/pumpio/oauth/http.php';
 require 'addon/pumpio/oauth/oauth_client.php';
@@ -21,25 +23,25 @@ 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() {}
@@ -274,7 +276,7 @@ function pumpio_settings(&$a,&$s) {
                        $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">' . 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>';
 
@@ -1054,7 +1056,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),
@@ -1062,7 +1064,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) {