* 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\Contact;
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';
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() {}
function pumpio_content(&$a) {
if(! local_user()) {
- notice( t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return '';
}
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);
}
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.';
$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>';
}
}
/* 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>';
$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>';
}
/* 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>';
}
$a->contact = $r[0]["id"];
$s = serialize(['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);
+
+ Queue::add($a->contact, NETWORK_PUMPIO, $s);
+ notice(L10n::t('Pump.io post failed. Queued for retry.').EOL);
}
-
}
}
$a->contact = $r[0]["id"];
$s = serialize(['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);
+
+ Queue::add($a->contact, NETWORK_PUMPIO, $s);
+ notice(L10n::t('Pump.io like failed. Queued for retry.').EOL);
}
}
// 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 == "")
$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>';
- $ret = item_store($likedata);
+ $ret = Item::insert($likedata);
logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
}
if (trim($postarray['body']) == "")
return false;
- $top_item = item_store($postarray);
+ $top_item = Item::insert($postarray);
$postarray["id"] = $top_item;
if (($top_item == 0) && ($post->verb == "update")) {
'to_email' => $user[0]['email'],
'uid' => $user[0]['uid'],
'item' => $postarray,
- 'link' => $a->get_baseurl().'/display/'.urlencode(get_item_guid($top_item)),
+ 'link' => $a->get_baseurl().'/display/'.urlencode(Item::getGuidById($top_item)),
'source_name' => $postarray['author-name'],
'source_link' => $postarray['author-link'],
'source_photo' => $postarray['author-avatar'],
if(! count($qi))
return;
- require_once('include/queue_fn.php');
-
foreach($qi as $x) {
if($x['network'] !== NETWORK_PUMPIO)
continue;
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
if (!$success) {
logger('pumpio_queue: delayed');
- update_queue_time($x['id']);
+ Queue::updateTime($x['id']);
}
}
}
function pumpio_reachable($url) {
- $data = z_fetch_url($url, false, $redirects, ['timeout'=>10]);
+ $data = Network::curl($url, false, $redirects, ['timeout'=>10]);
return(intval($data['return_code']) != 0);
}
projects / friendica-addons.git / blobdiff