X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=fromgplus%2Ffromgplus.php;h=1c047663fb661557a9e54eba4fa6210b8ab1fc55;hb=6c9b4c598cf057e0c02533c5e375dd583efd58a8;hp=a6d3d84ff05d7fe9da6f7660a9afc0581b06e49b;hpb=34765b3b76bea3295281fdf768626360cddcc4db;p=friendica-addons.git

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index a6d3d84f..1c047663 100644
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -33,8 +33,14 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
 	$account = get_pconfig(local_user(),'fromgplus','account');
 
-	$s .= '<div class="settings-block">';
+	$s .= '<span id="settings_fromgplus_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
 	$s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '</span>';
+	$s .= '<div id="settings_fromgplus_expanded" class="settings-block" style="display: none;">';
+	$s .= '<span class="fakelink" onclick="openClose(\'settings_fromgplus_expanded\'); openClose(\'settings_fromgplus_inflated\');">';
+	$s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+	$s .= '</span>';
+
 	$s .= '<div id="fromgplus-wrapper">';
 
 	$s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.t('Enable Google+ Import').'</label>';
@@ -45,7 +51,7 @@ function fromgplus_addon_settings(&$a,&$s) {
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="fromgplus-submit" name="fromgplus-submit" 
-class="settings-submit" value="' . t('Submit') . '" /></div>';
+class="settings-submit" value="' . t('Save Settings') . '" /></div>';
 	$s .= '</div>';
 
 	return;
@@ -101,6 +107,10 @@ function fromgplus_post($a, $uid, $source, $body, $location) {
 
 	//$uid = 2;
 
+	// Don't know what it is. Maybe some trash from the mobile client
+	$trash = html_entity_decode("&#xFEFF;", ENT_QUOTES, 'UTF-8');
+	$body = str_replace($trash, "", $body);
+
 	$body = trim($body);
 
         if (substr($body, 0, 3) == "[b]") {
@@ -223,16 +233,21 @@ function fromgplus_cleanupgoogleproxy($fullImage, $image) {
 }
 
 function fromgplus_cleantext($text) {
+
+	// Don't know what it is. But it is added to the text.
+	$trash = html_entity_decode("&#xFEFF;", ENT_QUOTES, 'UTF-8');
+
 	$text = strip_tags($text);
 	$text = html_entity_decode($text);
 	$text = trim($text);
-	$text = str_replace(array("\n", "\r", " "), array("", "", ""), $text);
+	$text = str_replace(array("\n", "\r", " ", $trash), array("", "", "", ""), $text);
 	return($text);
 }
 
 function fromgplus_handleattachments($item, $displaytext) {
 	$post = "";
 	$quote = "";
+	$type = "";
 
 	foreach ($item->object->attachments as $attachment) {
 		switch($attachment->objectType) {
@@ -248,7 +263,7 @@ function fromgplus_handleattachments($item, $displaytext) {
 				break;
 
 			case "article":
-				$post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+				$post .= "\n\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
 
 				$images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
 				//if ($images["preview"] != "")
@@ -262,6 +277,8 @@ function fromgplus_handleattachments($item, $displaytext) {
 				$quote = trim(fromgplus_html2bbcode($attachment->content));
 				if ($quote != "")
 					$quote = "\n[quote]".$quote."[/quote]";
+
+				$quote .= "[/class]";
 				break;
 
 			case "photo":
@@ -322,6 +339,8 @@ function fromgplus_fetch($a, $uid) {
 
 	$initiallastdate = get_pconfig($uid,'fromgplus','lastdate');
 
+	$first_time = ($initiallastdate == "");
+
 	$lastdate = 0;
 
 	if (!is_array($activities->items))
@@ -336,6 +355,9 @@ function fromgplus_fetch($a, $uid) {
 		if ($lastdate < strtotime($item->published))
 			$lastdate = strtotime($item->published);
 
+		if ($first_time)
+			continue;
+
 		if ($item->access->description == "Public")
 
 			// Loop prevention - ignore postings from HootSuite