X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fromgplus%2Ffromgplus.php;h=0a2b680227a05007af5773838abe1b0fb1cefbd5;hb=f1514063559930de791c0bff18a3f6ae4b455f7c;hp=b8910d5df98aff349ea80971b7db672a38c66dff;hpb=0afd633346b517894ff8e92c705bd5d052dd06a2;p=friendica-addons.git
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index b8910d5d..0a2b6802 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -11,8 +11,10 @@ define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
use Friendica\Core\Addon;
use Friendica\Core\Config;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
use Friendica\Object\Image;
+use Friendica\Util\Network;
require_once 'mod/share.php';
require_once 'mod/parse_url.php';
@@ -30,8 +32,8 @@ function fromgplus_uninstall() {
Addon::unregisterHook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
// Old hooks
- Addon::unregisterHook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
- Addon::unregisterHook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
+ Addon::unregisterHook('addon_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
+ Addon::unregisterHook('addon_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
}
function fromgplus_addon_settings(&$a,&$s) {
@@ -49,27 +51,27 @@ function fromgplus_addon_settings(&$a,&$s) {
$account = PConfig::get(local_user(),'fromgplus','account');
$s .= '';
- $s .= ''. t('Google+ Mirror').'
';
+ $s .= ''. L10n::t('Google+ Mirror').'
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= ''. t('Google+ Mirror').'
';
+ $s .= ''. L10n::t('Google+ Mirror').'
';
$s .= '';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
$s .= '
';
+class="settings-submit" value="' . L10n::t('Save Settings') . '" />
';
$s .= '';
return;
@@ -90,23 +92,25 @@ function fromgplus_addon_settings_post(&$a,&$b) {
if (!$enable)
PConfig::delete(local_user(),'fromgplus','lastdate');
- info( t('Google+ Import Settings saved.') . EOL);
+ info(L10n::t('Google+ Import Settings saved.') . EOL);
}
}
-function fromgplus_plugin_admin(&$a, &$o){
- $t = get_markup_template("admin.tpl", "addon/fromgplus/");
+function fromgplus_addon_admin(&$a, &$o)
+{
+ $t = get_markup_template("admin.tpl", "addon/fromgplus/");
- $o = replace_macros($t, [
- '$submit' => t('Save Settings'),
- '$key' => ['key', t('Key'), trim(Config::get('fromgplus', 'key')), t('')],
- ]);
+ $o = replace_macros($t, [
+ '$submit' => L10n::t('Save Settings'),
+ '$key' => ['key', L10n::t('Key'), trim(Config::get('fromgplus', 'key')), L10n::t('')],
+ ]);
}
-function fromgplus_plugin_admin_post(&$a){
- $key = ((x($_POST,'key')) ? trim($_POST['key']) : '');
- Config::set('fromgplus','key',$key);
- info( t('Settings updated.'). EOL );
+function fromgplus_addon_admin_post(&$a)
+{
+ $key = ((x($_POST, 'key')) ? trim($_POST['key']) : '');
+ Config::set('fromgplus', 'key', $key);
+ info(L10n::t('Settings updated.'). EOL);
}
function fromgplus_cron($a,$b) {
@@ -310,8 +314,7 @@ function fromgplus_cleantext($text) {
}
function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
- require_once("include/items.php");
- require_once("include/network.php");
+ require_once 'include/items.php';
$post = "";
$quote = "";
@@ -322,13 +325,13 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
switch($attachment->objectType) {
case "video":
$pagedata["type"] = "video";
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
break;
case "article":
$pagedata["type"] = "link";
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
@@ -379,7 +382,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
break;
case "photo-album":
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
@@ -400,7 +403,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
case "album":
$pagedata["type"] = "link";
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$thumb = $attachment->thumbnails[0];
@@ -413,7 +416,7 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
break;
case "audio":
- $pagedata["url"] = original_url($attachment->url);
+ $pagedata["url"] = Network::finalUrl($attachment->url);
$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
$post .= "\n\n[bookmark=".$pagedata["url"]."]".$pagedata["title"]."[/bookmark]\n";
break;
@@ -438,7 +441,7 @@ function fromgplus_fetch($a, $uid) {
$account = PConfig::get($uid,'fromgplus','account');
$key = Config::get('fromgplus','key');
- $result = fetch_url("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
+ $result = Network::fetchUrl("https://www.googleapis.com/plus/v1/people/".$account."/activities/public?alt=json&pp=1&key=".$key."&maxResults=".$maxfetch);
//$result = file_get_contents("google.txt");
//file_put_contents("google.txt", $result);