inflate/deflate twitter connector settings

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

diff --git a/twitter/twitter.php b/twitter/twitter.php
index e18b74452756702f65af71578cea142d86e6186a..e140b1b2ada5b3488ca66852c19997bde35157b9 100755 (executable)
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -84,6 +84,7 @@ function twitter_uninstall() {
        unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
        unregister_hook('cron', 'addon/twitter/twitter.php', 'twitter_cron');
        unregister_hook('queue_predeliver', 'addon/twitter/twitter.php', 'twitter_queue_hook');
+       unregister_hook('follow', 'addon/twitter/twitter.php', 'twitter_follow');
 
        // old setting - remove only
        unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
@@ -228,8 +229,13 @@ function twitter_settings(&$a,&$s) {
         $create_userenabled = get_pconfig(local_user(),'twitter','create_user');
         $create_userchecked = (($create_userenabled) ? ' checked="checked" ' : '');
 
-       $s .= '<div class="settings-block">';
+       $s .= '<span id="settings_twitter_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
        $s .= '<h3>'. t('Twitter Posting Settings') .'</h3>';
+       $s .= '</span>';
+       $s .= '<div id="settings_twitter_expanded" class="settings-block" style="display: none;">';
+       $s .= '<span class="fakelink" onclick="openClose(\'settings_twitter_expanded\'); openClose(\'settings_twitter_inflated\');">';
+       $s .= '<h3>'. t('Twitter Posting Settings') .'</h3>';
+       $s .= '</span>';
 
        if ( (!$ckey) && (!$csecret) ) {
                /***
@@ -263,7 +269,7 @@ function twitter_settings(&$a,&$s) {
                        $s .= '<input id="twitter-token" type="hidden" name="twitter-token" value="'.$token.'" />';
                        $s .= '<input id="twitter-token2" type="hidden" name="twitter-token2" value="'.$request_token['oauth_token_secret'].'" />';
             $s .= '</div><div class="clear"></div>';
-            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
                } else {
                        /***
                         *  we have an OAuth key / secret pair for the user
@@ -309,7 +315,7 @@ function twitter_settings(&$a,&$s) {
                         $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'. t('Clear OAuth configuration') .'</label>';
                         $s .= '<input id="twitter-disconnect" type="checkbox" name="twitter-disconnect" value="1" />';
                        $s .= '</div><div class="clear"></div>';
-                       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; 
+                       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="twitter-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>'; 
                }
        }
         $s .= '</div><div class="clear"></div>';
@@ -862,7 +868,7 @@ function twitter_plugin_admin(&$a, &$o){
        $t = get_markup_template( "admin.tpl", "addon/twitter/" );
 
        $o = replace_macros($t, array(
-               '$submit' => t('Submit'),
+               '$submit' => t('Save Settings'),
                                                                // name, label, value, help, [extra values]
                '$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),
                 '$consumersecret' => array('consumersecret', t('Consumer secret'),  get_config('twitter', 'consumersecret' ), ''),
@@ -1411,7 +1417,8 @@ function twitter_createpost($a, $uid, $post, $self, $create_user, $only_existing
                $postarray['tag'] = $converted["tags"];
 
 
-               if (!intval(get_config('system','wall-to-wall_share'))) {
+               // Deactivated at the moment, since there are problems with answers to retweets
+               if (false AND !intval(get_config('system','wall-to-wall_share'))) {
                        $postarray['body'] = "[share author='".$post->retweeted_status->user->name.
                                "' profile='https://twitter.com/".$post->retweeted_status->user->screen_name.
                                "' avatar='".$post->retweeted_status->user->profile_image_url_https.
@@ -1783,7 +1790,7 @@ function twitter_convertmsg($a, $body, $no_tags = false) {
                        }
                }
 
-               if (($footerlink != "") AND ($footer != "")) {
+               if (($footerlink != "") AND (trim($footer) != "")) {
                        $removedlink = trim(str_replace($footerlink, "", $body));
 
                        if (strstr($body, $removedlink))