formatting, minor

[friendica.git] / addon / twitter / twitter.php

diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 0b706f9b18aeb6d181bbc9c0c0d3c82ff157d99e..c59d1b9e5ce8d9e76b30cc7ab6ac1783ffec9b8a 100644 (file)
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -41,7 +41,6 @@ function twitter_install() {
        register_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
        register_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
        register_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
-       register_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start');
        logger("installed twitter");
 }
 
@@ -51,8 +50,6 @@ function twitter_uninstall() {
        unregister_hook('plugin_settings_post', 'addon/twitter/twitter.php', 'twitter_settings_post');
        unregister_hook('post_local_end', 'addon/twitter/twitter.php', 'twitter_post_hook');
        unregister_hook('jot_networks', 'addon/twitter/twitter.php', 'twitter_jot_nets');
-       unregister_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start');
-
 }
 
 function twitter_jot_nets(&$a,&$b) {
@@ -62,7 +59,7 @@ function twitter_jot_nets(&$a,&$b) {
        $tw_post = get_pconfig(local_user(),'twitter','post');
        if(intval($tw_post) == 1) {
                $tw_defpost = get_pconfig(local_user(),'twitter','post_by_default');
-               $selected = ((intval($tw_defpost == 1)) ? ' selected="selected" ' : '');
+               $selected = ((intval($tw_defpost) == 1) ? ' checked="checked" ' : '');
                $b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . 'value="1" /> ' 
                        . t('Post to Twitter') . '</div>';      
        }
@@ -70,19 +67,6 @@ function twitter_jot_nets(&$a,&$b) {
 
 }
 
-function twitter_post_start(&$a,&$b) {
-       if(! local_user())
-               return;
-
-       if((x($b,'twitter_enable')) && (intval($b['twitter_enable'])))
-               set_pconfig(local_user(),'twitter','enable','1');
-       else
-               del_pconfig(local_user(),'twitter','enable');
-
-
-}
-
-
 function twitter_settings_post ($a,$post) {
        if(! local_user())
                return;
@@ -99,7 +83,7 @@ function twitter_settings_post ($a,$post) {
        if (isset($_POST['twitter-pin'])) {
                //  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
                logger('got a Twitter PIN');
-               require_once('addon/twitter/twitteroauth.php');
+               require_once('library/twitteroauth.php');
                $ckey    = get_config('twitter', 'consumerkey'  );
                $csecret = get_config('twitter', 'consumersecret' );
                //  the token and secret for which the PIN was generated were hidden in the settings
@@ -134,6 +118,7 @@ function twitter_settings(&$a,&$s) {
        $osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
         $enabled = get_pconfig(local_user(), 'twitter', 'post');
        $checked = (($enabled) ? ' checked="checked" ' : '');
+       $s .= '<div class="settings-block">';
        $s .= '<h3>'. t('Twitter Posting Settings') .'</h3>';
 
        if ( (!$ckey) && (!$csecret) ) {
@@ -153,7 +138,7 @@ function twitter_settings(&$a,&$s) {
                         * which the user can request a PIN to connect the account to a
                         * account at Twitter.
                         */
-                       require_once('addon/twitter/twitteroauth.php');
+                       require_once('library/twitteroauth.php');
                        $connection = new TwitterOAuth($ckey, $csecret);
                        $request_token = $connection->getRequestToken();
                        $token = $request_token['oauth_token'];
@@ -167,14 +152,14 @@ function twitter_settings(&$a,&$s) {
                        $s .= '<input id="twitter-pin" type="text" name="twitter-pin" />';
                        $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="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
+            $s .= '</div><div class="clear"></div>';
+            $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';
                } else {
                        /***
                         *  we have an OAuth key / secret pair for the user
                         *  so let's give a chance to disable the postings to Twitter
                         */
-                        require_once('addon/twitter/twitteroauth.php');
+                        require_once('library/twitteroauth.php');
                        $connection = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
                        $details = $connection->get('account/verify_credentials');
                        $s .= '<div id="twitter-info" ><img id="twitter-avatar" src="'.$details->profile_image_url.'" /><p id="twitter-info-block">'. t('Currently connected to: ') .'<a href="https://twitter.com/'.$details->screen_name.'" target="_twitter">'.$details->screen_name.'</a><br /><em>'.$details->description.'</em></p></div>';
@@ -190,7 +175,7 @@ function twitter_settings(&$a,&$s) {
                        $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>'; 
                }
        }
-        $s .= '</div><div class="clear"></div>';
+        $s .= '</div><div class="clear"></div></div>';
 }
 
 
@@ -213,18 +198,18 @@ function twitter_post_hook(&$a,&$b) {
 
                if($ckey && $csecret && $otoken && $osecret) {
 
-                       $twitter_post = get_pconfig(local_user(),'twitter','post');
-                       $twitter_enable = intval(get_pconfig(local_user(),'twitter','enable'));
+                       $twitter_post = intval(get_pconfig(local_user(),'twitter','post'));
+                       $twitter_enable = (($twitter_post && x($_POST,'twitter_enable')) ? intval($_POST['twitter_enable']) : 0);
 
                        if($twitter_post && $twitter_enable) {
-                               require_once('addon/twitter/twitteroauth.php');
+                               require_once('library/twitteroauth.php');
                                require_once('include/bbcode.php');     
                                $tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
                                $max_char = 140; // max. length for a tweet
                                $msg = strip_tags(bbcode($b['body']));
                                if ( strlen($msg) > $max_char) {
                                        $shortlink = "";
-                                       require_once('addon/twitter/slinky.php');
+                                       require_once('library/slinky.php');
                                        // post url = base url + /display/ + owner + post id
                                        // we construct this from the Owner link and replace
                                        // profile by display - this will cause an error when