Google+: Option to use the commercial script "postToGooglePlus.php", Settings of...

[friendica-addons.git] / fromgplus / fromgplus.php

diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php
index 711a73c3acd2d7c26d0d082018fecdfb4be9dff9..7b25fd3d219eade5bff72f7bc3884162141fafcf 100644 (file)
--- a/fromgplus/fromgplus.php
+++ b/fromgplus/fromgplus.php
@@ -30,11 +30,22 @@ function fromgplus_addon_settings(&$a,&$s) {
        if(! local_user())
                return;
 
+       // If "gpluspost" is installed as well, then the settings are displayed there
+       $result = q("SELECT `installed` FROM `addon` WHERE `name` = 'gpluspost' AND `installed`");
+       if (count($result) > 0)
+               return;
+
        $enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : '');
        $account = get_pconfig(local_user(),'fromgplus','account');
 
-       $s .= '<div class="settings-block">';
-       $s .= '<h3>' . t('Google+ Import Settings').'</h3>';
+       $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>';
+       $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 .= '<img class="connector" src="images/googleplus.png" /><h3 class="connector">'. t('Google+ Mirror').'</h3>';
+       $s .= '</span>';
+
        $s .= '<div id="fromgplus-wrapper">';
 
        $s .= '<label id="fromgplus-enable-label" for="fromgplus-enable">'.t('Enable Google+ Import').'</label>';
@@ -45,7 +56,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;
@@ -241,6 +252,7 @@ function fromgplus_cleantext($text) {
 function fromgplus_handleattachments($item, $displaytext) {
        $post = "";
        $quote = "";
+       $type = "";
 
        foreach ($item->object->attachments as $attachment) {
                switch($attachment->objectType) {
@@ -256,7 +268,7 @@ function fromgplus_handleattachments($item, $displaytext) {
                                break;
 
                        case "article":
-                               $post .= "\n\n[bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
+                               $post .= "\n[class=type-link][bookmark=".$attachment->url."]".fromgplus_html2bbcode($attachment->displayName)."[/bookmark]\n";
 
                                $images = fromgplus_cleanupgoogleproxy($attachment->fullImage, $attachment->image);
                                //if ($images["preview"] != "")
@@ -264,12 +276,14 @@ function fromgplus_handleattachments($item, $displaytext) {
                                //elseif ($images["full"] != "")
                                //      $post .= "\n[img]".$images["full"]."[/img]\n";
                                if ($images["full"] != "")
-                                       $post .= "\n[img]".$images["full"]."[/img]\n";
+                                       $post .= "\n[img]".$images["full"]."[/img]";
 
                                //$post .= "[quote]".trim(fromgplus_html2bbcode($attachment->content))."[/quote]";
                                $quote = trim(fromgplus_html2bbcode($attachment->content));
                                if ($quote != "")
                                        $quote = "\n[quote]".$quote."[/quote]";
+
+                               $quote .= "[/class]";
                                break;
 
                        case "photo":