Merge branch 'apull'

diff --combined statusnet/statusnet.php
index 6580e89,7e9226a..7e9226a
mode 100755,100644..100755
--- 1/statusnet/statusnet.php
--- 2/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@@ -63,7 -63,6 +63,6 @@@ class StatusNetOAuth extends TwitterOAu
      $ci = curl_init();
      /* Curl settings */
      $prx = get_config('system','proxy');
-     logger('Proxy SN: '.$prx);
      if(strlen($prx)) {
          curl_setopt($ci, CURLOPT_HTTPPROXYTUNNEL, 1);
          curl_setopt($ci, CURLOPT_PROXY, $prx);
@@@ -215,7 -214,6 +214,6 @@@ function statusnet_settings_post ($a,$p
              } else {
                if (isset($_POST['statusnet-pin'])) {
                        //  if the user supplied us with a PIN from Twitter, let the magic of OAuth happen
-                       logger('got a StatusNet security code');
                      $api     = get_pconfig(local_user(), 'statusnet', 'baseapi');
                                        $ckey    = get_pconfig(local_user(), 'statusnet', 'consumerkey'  );
                                        $csecret = get_pconfig(local_user(), 'statusnet', 'consumersecret' );
@@@ -389,9 -387,6 +387,6 @@@ function statusnet_post_hook(&$a,&$b) 
        if(! strstr($b['postopts'],'statusnet'))
                return;
  
-       logger('StatusNet post invoked');
- 
- 
        load_pconfig($b['uid'], 'statusnet');
              
        $api     = get_pconfig($b['uid'], 'statusnet', 'baseapi');
@@@ -408,7 -403,7 +403,7 @@@
                $msg = strip_tags(bbcode($b['body']));
                // quotes not working - let's try this
                $msg = html_entity_decode($msg);
-               if ( strlen($msg) > $max_char) {
+               if (( strlen($msg) > $max_char) && $max_char > 0) {
                        $shortlink = "";
                        require_once('library/slinky.php');
                        $slinky = new Slinky( $b['plink'] );

diff --combined twitter/twitter.php
index c492c6c,a6f73c8..a6f73c8
mode 100755,100644..100755
--- 1/twitter/twitter.php
--- 2/twitter/twitter.php
+++ b/twitter/twitter.php
@@@ -21,7 -21,7 +21,7 @@@
   *     we do not need "Twitter as login". When you've registered the app you get the
   *     OAuth Consumer key and secret pair for your application/site.
   *
-  *     Add this key pair to your global .htconfig.php
+  *     Add this key pair to your global .htconfig.php or use the admin panel.
   *
   *     $a->config['twitter']['consumerkey'] = 'your consumer_key here';
   *     $a->config['twitter']['consumersecret'] = 'your consumer_secret here';
@@@ -91,10 -91,11 +91,11 @@@ function twitter_settings_post ($a,$pos
                /***
                 * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
                 * from the user configuration
-                * TODO can we revoke the access tokens at Twitter and do we need to do so?
                 */
                del_pconfig( local_user(), 'twitter', 'consumerkey'  );
                del_pconfig( local_user(), 'twitter', 'consumersecret' );
+                 del_pconfig( local_user(), 'twitter', 'oauthtoken'  );  
+                 del_pconfig( local_user(), 'twitter', 'oauthsecret'  );  
                  del_pconfig( local_user(), 'twitter', 'post' );
                  del_pconfig( local_user(), 'twitter', 'post_by_default' );
        } else {