X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=fromgplus%2Ffromgplus.php;h=24ec46f3da0de17596dd9dfcb47648605f72d940;hb=7c6aa340d9125e5fba18b4519196871c84a7b5c2;hp=1a1ae682cfee3d8d4937a6df98b0d4ebe6c8d36a;hpb=e6c622d89db973517f58ca9fb9bb2cea9048d902;p=friendica-addons.git
diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 1a1ae682..24ec46f3 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -9,28 +9,34 @@
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\Core\Protocol;
+use Friendica\Object\Image;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
+use Friendica\Model\Item;
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 +54,27 @@ function fromgplus_addon_settings(&$a,&$s) {
$account = PConfig::get(local_user(),'fromgplus','account');
$s .= '';
- $s .= '![](images/googleplus.png)
'. t('Google+ Mirror').'
';
+ $s .= '![](images/googleplus.png)
'. L10n::t('Google+ Mirror').'
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '![](images/googleplus.png)
'. t('Google+ Mirror').'
';
+ $s .= '![](images/googleplus.png)
'. 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;
@@ -76,36 +82,38 @@ class="settings-submit" value="' . t('Save Settings') . '" />';
function fromgplus_addon_settings_post(&$a,&$b) {
- if(! local_user())
+ if (!local_user())
return;
- if($_POST['fromgplus-submit']) {
+ if (!empty($_POST['fromgplus-submit'])) {
PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
- $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
+ $enable = (x($_POST,'fromgplus-enable') ? intval($_POST['fromgplus-enable']) : 0);
PConfig::set(local_user(),'fromgplus','enable', $enable);
- $keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
+ $keywords = (x($_POST, 'fromgplus-keywords') ? intval($_POST['fromgplus-keywords']) : 0);
PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
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')), ''],
+ ]);
}
-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) {
@@ -162,15 +170,14 @@ function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
$_SESSION['uid'] = $uid;
unset($_REQUEST);
- $_REQUEST['type'] = 'wall';
$_REQUEST['api_source'] = true;
$_REQUEST['profile_uid'] = $uid;
$_REQUEST['source'] = $source;
- $_REQUEST['extid'] = NETWORK_GPLUS;
+ $_REQUEST['extid'] = Protocol::GPLUS;
if (isset($id)) {
- $_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+ $_REQUEST['message_id'] = Item::newURI($uid, Protocol::GPLUS.':'.$id);
}
// $_REQUEST['verb']
@@ -198,13 +205,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,11 +226,13 @@ 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);
- $arr[$x[0]] = $x[1];
+ if (count($x) > 1) {
+ $arr[$x[0]] = $x[1];
+ }
}
unset($val, $x, $var);
return $arr;
@@ -240,10 +249,10 @@ 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'] != "")
+ if (!empty($queryvar['url']))
$cleaned["full"] = urldecode($queryvar['url']);
else
$cleaned["full"] = $fullImage;
@@ -251,27 +260,27 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
$cleaned["full"] = "";
$queryvar = fromgplus_parse_query($image);
- if ($queryvar['url'] != "")
+ if (!empty($queryvar['url']))
$cleaned["preview"] = urldecode($queryvar['url']);
else
$cleaned["preview"] = $image;
if (@exif_imagetype($cleaned["preview"]) == 0)
$cleaned["preview"] = "";
- if ($cleaned["full"] == "") {
+ if (empty($cleaned["full"])) {
$cleaned["full"] = $cleaned["preview"];
$cleaned["preview"] = "";
}
- if ($cleaned["full"] != "")
- $infoFull = Photo::getInfoFromURL($cleaned["full"]);
+ if (!empty($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"]);
+ if (!empty($cleaned["preview"]))
+ $infoPreview = Image::getInfoFromURL($cleaned["preview"]);
else
- $infoFull = array("0" => 0, "1" => 0);
+ $infoPreview = ["0" => 0, "1" => 0];
if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) {
$temp = $cleaned["full"];
@@ -304,40 +313,42 @@ 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/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);
if ($images["full"] != "")
$pagedata["images"][0]["src"] = $images["full"];
- $quote = trim(fromgplus_html2bbcode($attachment->content));
+ if (!empty($attachment->content)) {
+ $quote = trim(fromgplus_html2bbcode($attachment->content));
+ }
- if ($quote != "")
+ if (!empty($quote)) {
$pagedata["text"] = $quote;
+ }
// Add Keywords to page link
$data = parseurl_getsiteinfo_cached($pagedata["url"], true);
@@ -352,17 +363,17 @@ 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);
}
}
- if ($images["preview"] != "") {
+ if (!empty($images["preview"])) {
$post .= "\n[url=".$images["page"]."][img]".$images["preview"]."[/img][/url]\n";
$pagedata["images"][0]["src"] = $images["preview"];
$pagedata["url"] = $images["page"];
- } elseif ($images["full"] != "") {
+ } elseif (!empty($images["full"])) {
$post .= "\n[img]".$images["full"]."[/img]\n";
$pagedata["images"][0]["src"] = $images["full"];
@@ -378,7 +389,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";
@@ -399,7 +410,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];
@@ -412,7 +423,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;
@@ -437,7 +448,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);
@@ -449,7 +460,7 @@ function fromgplus_fetch($a, $uid) {
$lastdate = 0;
- if (!is_array($activities->items))
+ if (empty($activities->items))
return;
$reversed = array_reverse($activities->items);
@@ -515,12 +526,12 @@ function fromgplus_fetch($a, $uid) {
if (function_exists("share_header"))
$post .= share_header($item->object->actor->displayName, $item->object->actor->url,
$item->object->actor->image->url, "",
- datetime_convert('UTC','UTC',$item->object->published),$item->object->url);
+ DateTimeFormat::utc($item->object->published),$item->object->url);
else
$post .= "[share author='".str_replace("'", "'",$item->object->actor->displayName).
"' profile='".$item->object->actor->url.
"' avatar='".$item->object->actor->image->url.
- "' posted='".datetime_convert('UTC','UTC',$item->object->published).
+ "' posted='".DateTimeFormat::utc($item->object->published).
"' link='".$item->object->url."']";
$post .= fromgplus_html2bbcode($item->object->content);