X-Git-Url: https://git.mxchange.org/?p=friendica-addons.git;a=blobdiff_plain;f=fromgplus%2Ffromgplus.php;h=c028ea852ddef2beea32a59f72a090b6cf387868;hp=17300ae8ee0a74f12d083a5a7c2f4fd94227defd;hb=c71f7b0e1a7bb5ca88347b295dd3a4cc3106c5a9;hpb=5d33440e635c7f6d2f52c1882798839fb27abc17

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 17300ae8..c028ea85 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -9,20 +9,29 @@
 
 define('FROMGPLUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
 
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Object\Image;
+
+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) {
@@ -35,8 +44,9 @@ function fromgplus_addon_settings(&$a,&$s) {
 	if (count($result) > 0)
 		return;
 
-	$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
-	$account = get_pconfig(local_user(),'fromgplus','account');
+	$enable_checked = (intval(PConfig::get(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
+	$keywords_checked = (intval(PConfig::get(local_user(), 'fromgplus', 'keywords')) ? ' checked="checked"' : '');
+	$account = PConfig::get(local_user(),'fromgplus','account');
 
 	$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
 	$s .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t('Google+ Mirror').'</h3>';
@@ -54,8 +64,11 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$s .= '<label id="fromgplus-label" for="fromgplus-account">'.t('Google Account ID').' </label>';
 	$s .= '<input id="fromgplus-account" type="text" name="fromgplus-account" value="'.$account.'" />';
 	$s .= '</div><div class="clear"></div>';
+	$s .= '<label id="fromgplus-keywords-label" for="fromgplus-keywords">'.t('Add keywords to post').'</label>';
+	$s .= '<input id="fromgplus-keywords" type="checkbox" name="fromgplus-keywords" value="1"'.$keywords_checked.' />';
+	$s .= '<div class="clear"></div>';
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit" 
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit"
 class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 	$s .= '</div>';
 
@@ -68,21 +81,40 @@ function fromgplus_addon_settings_post(&$a,&$b) {
 		return;
 
 	if($_POST['fromgplus-submit']) {
-		set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
+		PConfig::set(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
 		$enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
-		set_pconfig(local_user(),'fromgplus','enable', $enable);
+		PConfig::set(local_user(),'fromgplus','enable', $enable);
+		$keywords = ((x($_POST, 'fromgplus-keywords')) ? intval($_POST['fromgplus-keywords']) : 0);
+		PConfig::set(local_user(),'fromgplus', 'keywords', $keywords);
 
 		if (!$enable)
-			del_pconfig(local_user(),'fromgplus','lastdate');
+			PConfig::delete(local_user(),'fromgplus','lastdate');
 
 		info( t('Google+ Import Settings saved.') . EOL);
 	}
 }
 
+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('')],
+	]);
+}
+
+function fromgplus_addon_admin_post(&$a)
+{
+	$key = ((x($_POST, 'key')) ? trim($_POST['key']) : '');
+	Config::set('fromgplus', 'key', $key);
+	info(t('Settings updated.'). EOL);
+}
+
 function fromgplus_cron($a,$b) {
-	$last = get_config('fromgplus','last_poll');
+	$last = Config::get('fromgplus','last_poll');
 
-        $poll_interval = intval(get_config('fromgplus','poll_interval'));
+        $poll_interval = intval(Config::get('fromgplus','poll_interval'));
         if(! $poll_interval)
                 $poll_interval = FROMGPLUS_DEFAULT_POLL_INTERVAL;
 
@@ -99,7 +131,7 @@ function fromgplus_cron($a,$b) {
         $r = q("SELECT * FROM `pconfig` WHERE `cat` = 'fromgplus' AND `k` = 'enable' AND `v` = '1' ORDER BY RAND() ");
         if(count($r)) {
                 foreach($r as $rr) {
-			$account = get_pconfig($rr['uid'],'fromgplus','account');
+			$account = PConfig::get($rr['uid'],'fromgplus','account');
 			if ($account) {
 		        logger('fromgplus: fetching for user '.$rr['uid']);
 				fromgplus_fetch($a, $rr['uid']);
@@ -109,10 +141,10 @@ function fromgplus_cron($a,$b) {
 
         logger('fromgplus: cron_end');
 
-	set_config('fromgplus','last_poll', time());
+	Config::set('fromgplus','last_poll', time());
 }
 
-function fromgplus_post($a, $uid, $source, $body, $location) {
+function fromgplus_post($a, $uid, $source, $body, $location, $coord, $id) {
 
 	//$uid = 2;
 
@@ -140,6 +172,10 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
 	$_REQUEST['source'] = $source;
 	$_REQUEST['extid'] = NETWORK_GPLUS;
 
+	if (isset($id)) {
+		$_REQUEST['message_id'] = item_new_uri($a->get_hostname(), $uid, NETWORK_GPLUS.':'.$id);
+	}
+
 	// $_REQUEST['verb']
 	// $_REQUEST['parent']
 	// $_REQUEST['parent_uri']
@@ -147,8 +183,9 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
 	$_REQUEST['title'] = $title;
 	$_REQUEST['body'] = $body;
 	$_REQUEST['location'] = $location;
+	$_REQUEST['coord'] = $coord;
 
-	if (($_REQUEST['title'] == "") AND ($_REQUEST['body'] == "")) {
+	if (($_REQUEST['title'] == "") && ($_REQUEST['body'] == "")) {
 	        logger('fromgplus: empty post for user '.$uid." ".print_r($_REQUEST, true));
 		return;
 	}
@@ -164,13 +201,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("<b>", "</b>"), array("[b]", "[/b]"), $bbcode);
-	$bbcode = str_ireplace(array("<i>", "</i>"), array("[i]", "[/i]"), $bbcode);
-	$bbcode = str_ireplace(array("<s>", "</s>"), array("[s]", "[/s]"), $bbcode);
-	$bbcode = str_ireplace(array("<br />"), array("\n"), $bbcode);
-	$bbcode = str_ireplace(array("<br/>"), array("\n"), $bbcode);
-	$bbcode = str_ireplace(array("<br>"), array("\n"), $bbcode);
+	$bbcode = str_ireplace(["\n"], [""], $bbcode);
+	$bbcode = str_ireplace(["<b>", "</b>"], ["[b]", "[/b]"], $bbcode);
+	$bbcode = str_ireplace(["<i>", "</i>"], ["[i]", "[/i]"], $bbcode);
+	$bbcode = str_ireplace(["<s>", "</s>"], ["[s]", "[/s]"], $bbcode);
+	$bbcode = str_ireplace(["<br />"], ["\n"], $bbcode);
+	$bbcode = str_ireplace(["<br/>"], ["\n"], $bbcode);
+	$bbcode = str_ireplace(["<br>"], ["\n"], $bbcode);
 
 	$bbcode = trim(strip_tags($bbcode));
 	return($bbcode);
@@ -185,7 +222,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);
@@ -206,7 +243,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'] != "")
@@ -230,22 +267,22 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
 	}
 
 	if ($cleaned["full"] != "")
-		$infoFull = get_photo_info($cleaned["full"]);
+		$infoFull = Image::getInfoFromURL($cleaned["full"]);
 	else
-		$infoFull = array("0" => 0, "1" => 0);
+		$infoFull = ["0" => 0, "1" => 0];
 
 	if ($cleaned["preview"] != "")
-		$infoPreview = get_photo_info($cleaned["preview"]);
+		$infoPreview = Image::getInfoFromURL($cleaned["preview"]);
 	else
-		$infoFull = array("0" => 0, "1" => 0);
+		$infoFull = ["0" => 0, "1" => 0];
 
-	if (($infoPreview[0] >= $infoFull[0]) AND ($infoPreview[1] >= $infoFull[1])) {
+	if (($infoPreview[0] >= $infoFull[0]) && ($infoPreview[1] >= $infoFull[1])) {
 		$temp = $cleaned["full"];
 		$cleaned["full"] = $cleaned["preview"];
 		$cleaned["preview"] = $temp;
 	}
 
-	if (($cleaned["full"] == $cleaned["preview"]) OR (($infoPreview[0] == $infoFull[0]) AND ($infoPreview[1] == $infoFull[1])))
+	if (($cleaned["full"] == $cleaned["preview"]) || (($infoPreview[0] == $infoFull[0]) && ($infoPreview[1] == $infoFull[1])))
 		$cleaned["preview"] = "";
 
 	if ($cleaned["full"] == "")
@@ -270,18 +307,17 @@ 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");
 
 	$post = "";
 	$quote = "";
-	$pagedata = array();
+	$pagedata = [];
 	$pagedata["type"] = "";
 
 	foreach ($item->object->attachments as $attachment) {
@@ -306,17 +342,23 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 				if ($quote != "")
 					$pagedata["text"] = $quote;
 
+				// Add Keywords to page link
+				$data = parseurl_getsiteinfo_cached($pagedata["url"], true);
+				if (isset($data["keywords"]) && PConfig::get($uid, 'fromgplus', 'keywords')) {
+					$pagedata["keywords"] = $data["keywords"];
+				}
 				break;
 
 			case "photo":
 				// Don't store shared pictures in your wall photos (to prevent a possible violating of licenses)
-				if ($shared)
+				if ($shared) {
 					$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
-				else {
-					if ($attachment->fullImage->url != "")
-						$images = store_photo($a, $uid, "", $attachment->fullImage->url);
-					elseif ($attachment->image->url != "")
-						$images = store_photo($a, $uid, "", $attachment->image->url);
+				} else {
+					if ($attachment->fullImage->url != "") {
+						$images = Image::storePhoto($a, $uid, "", $attachment->fullImage->url);
+					} elseif ($attachment->image->url != "") {
+						$images = Image::storePhoto($a, $uid, "", $attachment->image->url);
+					}
 				}
 
 				if ($images["preview"] != "") {
@@ -327,11 +369,12 @@ function fromgplus_handleattachments($a, $uid, $item, $displaytext, $shared) {
 					$post .= "\n[img]".$images["full"]."[/img]\n";
 					$pagedata["images"][0]["src"] = $images["full"];
 
-					if ($images["preview"] != "")
+					if ($images["preview"] != "") {
 						$pagedata["images"][1]["src"] = $images["preview"];
+					}
 				}
 
-				if (($attachment->displayName != "") AND (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
+				if (($attachment->displayName != "") && (fromgplus_cleantext($attachment->displayName) != fromgplus_cleantext($displaytext))) {
 					$post .= fromgplus_html2bbcode($attachment->displayName)."\n";
 					$pagedata["title"] = fromgplus_html2bbcode($attachment->displayName);
 				}
@@ -394,17 +437,16 @@ function fromgplus_fetch($a, $uid) {
 	// Special blank to identify postings from the googleplus connector
 	$blank = html_entity_decode("&#x00A0;", ENT_QUOTES, 'UTF-8');
 
-	$account = get_pconfig($uid,'fromgplus','account');
-	$key = get_config('fromgplus','key');
+	$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 = file_get_contents("google.txt");
-	//$result = file_get_contents("addon/fromgplus/album.txt");
 	//file_put_contents("google.txt", $result);
 
 	$activities = json_decode($result);
 
-	$initiallastdate = get_pconfig($uid,'fromgplus','lastdate');
+	$initiallastdate = PConfig::get($uid,'fromgplus','lastdate');
 
 	$first_time = ($initiallastdate == "");
 
@@ -416,6 +458,7 @@ function fromgplus_fetch($a, $uid) {
 	$reversed = array_reverse($activities->items);
 
 	foreach($reversed as $item) {
+
 		if (strtotime($item->published) <= $initiallastdate)
 			continue;
 
@@ -428,17 +471,16 @@ function fromgplus_fetch($a, $uid) {
 		if ($lastdate < strtotime($item->published))
 			$lastdate = strtotime($item->published);
 
+		PConfig::set($uid,'fromgplus','lastdate', $lastdate);
+
 		if ($first_time)
 			continue;
 
-		if ($item->access->description == "Public")
-
-			// Loop prevention - ignore postings from HootSuite
-			if ($item->provider->title == "HootSuite")
-				continue;
+		if ($item->access->description == "Public") {
 
 			// Loop prevention through the special blank from the googleplus connector
-			if (strstr($item->object->content, $blank))
+			//if (strstr($item->object->content, $blank))
+			if (strrpos($item->object->content, $blank) >= strlen($item->object->content) - 5)
 				continue;
 
 			switch($item->object->objectType) {
@@ -448,25 +490,41 @@ function fromgplus_fetch($a, $uid) {
 					if (is_array($item->object->attachments))
 						$post .= fromgplus_handleattachments($a, $uid, $item, $item->object->content, false);
 
-					// geocode, placeName
-					if (isset($item->address))
+					$coord = "";
+					$location = "";
+					if (isset($item->location)) {
+						if (isset($item->location->address->formatted))
+							$location = $item->location->address->formatted;
+
+						if (isset($item->location->displayName))
+							$location = $item->location->displayName;
+
+						if (isset($item->location->position->latitude) &&
+							isset($item->location->position->longitude))
+							$coord = $item->location->position->latitude." ".$item->location->position->longitude;
+
+					} elseif (isset($item->address))
 						$location = $item->address;
-					else
-						$location = "";
 
-					fromgplus_post($a, $uid, "Google+", $post, $location);
-					//fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);
 
 					break;
 
 				case "activity":
 					$post = fromgplus_html2bbcode($item->annotation)."\n";
 
-					if (!intval(get_config('system','old_share'))) {
-						$post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName).
-								"' profile='".$item->object->actor->url.
-								"' avatar='".$item->object->actor->image->url.
-								"' link='".$item->object->url."']";
+					if (!intval(Config::get('system','old_share'))) {
+
+						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);
+						else
+							$post .= "[share author='".str_replace("'", "&#039;",$item->object->actor->displayName).
+									"' profile='".$item->object->actor->url.
+									"' avatar='".$item->object->actor->image->url.
+									"' posted='".datetime_convert('UTC','UTC',$item->object->published).
+									"' link='".$item->object->url."']";
 
 						$post .= fromgplus_html2bbcode($item->object->content);
 
@@ -483,16 +541,27 @@ function fromgplus_fetch($a, $uid) {
 							$post .= "\n".trim(fromgplus_handleattachments($a, $uid, $item, $item->object->content, true));
 					}
 
-					if (isset($item->address))
+					$coord = "";
+					$location = "";
+					if (isset($item->location)) {
+						if (isset($item->location->address->formatted))
+							$location = $item->location->address->formatted;
+
+						if (isset($item->location->displayName))
+							$location = $item->location->displayName;
+
+						if (isset($item->location->position->latitude) &&
+							isset($item->location->position->longitude))
+							$coord = $item->location->position->latitude." ".$item->location->position->longitude;
+
+					} elseif (isset($item->address))
 						$location = $item->address;
-					else
-						$location = "";
 
-					fromgplus_post($a, $uid, "Google+", $post, $location);
-					//fromgplus_post($a, $uid, $item->provider->title, $post, $location);
+					fromgplus_post($a, $uid, $item->provider->title, $post, $location, $coord, $item->id);
 					break;
 			}
+		}
 	}
 	if ($lastdate != 0)
-		set_pconfig($uid,'fromgplus','lastdate', $lastdate);
+		PConfig::set($uid,'fromgplus','lastdate', $lastdate);
 }