X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=pumpio%2Fpumpio.php;h=d0fe09d568e070fe6f2e730762a232faa28ac22e;hb=ffa36da2c95867dec4acb6a3d4a9975bf65140d3;hp=be4db5fafdcd9b82c49823f7d4d3276c932e4919;hpb=96c41e56233765571870b56081efc366655bead4;p=friendica-addons.git

diff --git a/pumpio/pumpio.php b/pumpio/pumpio.php
index be4db5fa..d0fe09d5 100644
--- a/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@ -7,6 +7,7 @@
  */
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\Worker;
 use Friendica\Model\Contact;
@@ -14,6 +15,8 @@ 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';
@@ -49,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 '';
 	}
 
@@ -145,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);
 	}
 
@@ -185,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.';
@@ -204,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>';
 	}
 }
 
@@ -242,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>';
 
@@ -267,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 Addon') . '</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>';
 		}
@@ -306,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>';
 }
 
 
@@ -551,11 +554,10 @@ function pumpio_send(&$a,&$b) {
 				$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);
 		}
-
 	}
 }
 
@@ -628,9 +630,9 @@ function pumpio_action(&$a, $uid, $uri, $action, $content = "") {
 			$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);
 	}
 }
 
@@ -719,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 == "")
@@ -963,16 +965,16 @@ 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>';
 
-	$ret = item_store($likedata);
+	$ret = Item::insert($likedata);
 
 	logger("pumpio_dolike: ".$ret." User ".$own_id." ".$uid." Contact: ".$contactid." Url ".$orig_post['uri']);
 }
@@ -1248,7 +1250,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 	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")) {
@@ -1304,7 +1306,7 @@ function pumpio_dopost(&$a, $client, $uid, $self, $post, $own_id, $threadcomplet
 						'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'],
@@ -1433,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;
@@ -1494,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
@@ -1502,7 +1502,7 @@ function pumpio_queue_hook(&$a,&$b) {
 
 		if (!$success) {
 			logger('pumpio_queue: delayed');
-			update_queue_time($x['id']);
+			Queue::updateTime($x['id']);
 		}
 	}
 }
@@ -1699,7 +1699,7 @@ function pumpio_fetchallcomments(&$a, $uid, $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);
 }