X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=fromgplus%2Ffromgplus.php;h=0a2b680227a05007af5773838abe1b0fb1cefbd5;hb=f1514063559930de791c0bff18a3f6ae4b455f7c;hp=f66042075e61213e3fa409a94373c2ff235a803d;hpb=cdfa834f05d0c5fdda6a117ada87d95bb7def033;p=friendica-addons.git
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index f6604207..0a2b6802 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -9,28 +9,31 @@
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\Photo;
+use Friendica\Object\Image;
+use Friendica\Util\Network;
require_once 'mod/share.php';
require_once 'mod/parse_url.php';
require_once 'include/text.php';
function fromgplus_install() {
- register_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
- register_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
- register_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
+ Addon::registerHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
+ Addon::registerHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
+ Addon::registerHook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
}
function fromgplus_uninstall() {
- unregister_hook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
- unregister_hook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
- unregister_hook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
+ Addon::unregisterHook('connector_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
+ Addon::unregisterHook('connector_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post');
+ Addon::unregisterHook('cron', 'addon/fromgplus/fromgplus.php', 'fromgplus_cron');
// Old hooks
- unregister_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings');
- unregister_hook('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) {
@@ -48,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;
@@ -89,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, array(
- '$submit' => t('Save Settings'),
- '$key' => array('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) {
@@ -198,13 +203,13 @@ function fromgplus_html2bbcode($html) {
$bbcode = html_entity_decode($html, ENT_QUOTES, 'UTF-8');
- $bbcode = str_ireplace(array("\n"), array(""), $bbcode);
- $bbcode = str_ireplace(array("", ""), array("[b]", "[/b]"), $bbcode);
- $bbcode = str_ireplace(array("", ""), array("[i]", "[/i]"), $bbcode);
- $bbcode = str_ireplace(array("", ""), array("[s]", "[/s]"), $bbcode);
- $bbcode = str_ireplace(array("
"), array("\n"), $bbcode);
- $bbcode = str_ireplace(array("
"), array("\n"), $bbcode);
- $bbcode = str_ireplace(array("
"), array("\n"), $bbcode);
+ $bbcode = str_ireplace(["\n"], [""], $bbcode);
+ $bbcode = str_ireplace(["", ""], ["[b]", "[/b]"], $bbcode);
+ $bbcode = str_ireplace(["", ""], ["[i]", "[/i]"], $bbcode);
+ $bbcode = str_ireplace(["", ""], ["[s]", "[/s]"], $bbcode);
+ $bbcode = str_ireplace(["
"], ["\n"], $bbcode);
+ $bbcode = str_ireplace(["
"], ["\n"], $bbcode);
+ $bbcode = str_ireplace(["
"], ["\n"], $bbcode);
$bbcode = trim(strip_tags($bbcode));
return($bbcode);
@@ -219,7 +224,7 @@ function fromgplus_parse_query($var)
$var = parse_url($var, PHP_URL_QUERY);
$var = html_entity_decode($var);
$var = explode('&', $var);
- $arr = array();
+ $arr = [];
foreach($var as $val) {
$x = explode('=', $val);
@@ -240,7 +245,7 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
//$image = str_replace(array($preview, $preview2), array("/", "/"), $image->url);
$image = $image->url;
- $cleaned = array();
+ $cleaned = [];
$queryvar = fromgplus_parse_query($fullImage);
if ($queryvar['url'] != "")
@@ -264,14 +269,14 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
}
if ($cleaned["full"] != "")
- $infoFull = Photo::getInfoFromURL($cleaned["full"]);
+ $infoFull = Image::getInfoFromURL($cleaned["full"]);
else
- $infoFull = array("0" => 0, "1" => 0);
+ $infoFull = ["0" => 0, "1" => 0];
if ($cleaned["preview"] != "")
- $infoPreview = Photo::getInfoFromURL($cleaned["preview"]);
+ $infoPreview = Image::getInfoFromURL($cleaned["preview"]);
else
- $infoFull = array("0" => 0, "1" => 0);
+ $infoFull = ["0" => 0, "1" => 0];
if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) {
$temp = $cleaned["full"];
@@ -304,31 +309,29 @@ function fromgplus_cleantext($text) {
$text = strip_tags($text);
$text = html_entity_decode($text, ENT_QUOTES);
$text = trim($text);
- $text = str_replace(array("\n", "\r", " ", $trash), array("", "", "", ""), $text);
+ $text = str_replace(["\n", "\r", " ", $trash], ["", "", "", ""], $text);
return($text);
}
function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
- require_once("include/Photo.php");
- require_once("include/items.php");
- require_once("include/network.php");
+ require_once 'include/items.php';
$post = "";
$quote = "";
- $pagedata = array();
+ $pagedata = [];
$pagedata["type"] = "";
foreach ($item->object->attachments as $attachment) {
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);
@@ -353,9 +356,9 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
} else {
if ($attachment->fullImage->url != "") {
- $images = Photo::storePhoto($a, $uid, "", $attachment->fullImage->url);
+ $images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
} elseif ($attachment->image->url != "") {
- $images = Photo::storePhoto($a, $uid, "", $attachment->image->url);
+ $images = Image::storePhoto($a, $uid, "", $attachment->image->url);
}
}
@@ -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);