Merge pull request #138 from fabrixxm/master

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

diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 0fd891d208a53afe1e125b9ebcf812f33e6a7259..1dce9d2f66a38b5b0b6b28f1ec55742504b33442 100644 (file)
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -1,4 +1,10 @@
 <?php
+/**
+ * Name: Twitter Connector
+ * Version: 1.0
+ * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias>
+ */
+
 
 /*   Twitter Plugin for Friendika
  *
@@ -59,7 +65,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,6 +76,9 @@ function twitter_jot_nets(&$a,&$b) {
 function twitter_settings_post ($a,$post) {
        if(! local_user())
                return;
+       // don't check twitter settings if twitter submit button is not clicked 
+       if (!x($_POST,'twitter-submit')) return;
+       
        if (isset($_POST['twitter-disconnect'])) {
                /***
                 * if the twitter-disconnect checkbox is set, clear the OAuth key/secret pair
@@ -138,7 +147,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'];
@@ -153,13 +162,13 @@ 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="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('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>';
@@ -172,7 +181,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="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('Submit') . '" /></div>'; 
                }
        }
         $s .= '</div><div class="clear"></div></div>';
@@ -189,6 +198,11 @@ function twitter_post_hook(&$a,&$b) {
 
        if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (! $b['parent']) ) {
 
+               // Twitter is not considered a private network
+               if($b['prvnets'])
+                       return;
+
+
                load_pconfig(local_user(), 'twitter');
 
                $ckey    = get_config('twitter', 'consumerkey'  );
@@ -202,6 +216,7 @@ function twitter_post_hook(&$a,&$b) {
                        $twitter_enable = (($twitter_post && x($_POST,'twitter_enable')) ? intval($_POST['twitter_enable']) : 0);
 
                        if($twitter_post && $twitter_enable) {
+                               logger('Posting to Twitter', LOGGER_DEBUG);
                                require_once('library/twitteroauth.php');
                                require_once('include/bbcode.php');     
                                $tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);
@@ -235,3 +250,19 @@ function twitter_post_hook(&$a,&$b) {
        }
 }
 
+function twitter_plugin_admin_post(&$a){
+       $consumerkey    =       ((x($_POST,'consumerkey'))              ? notags(trim($_POST['consumerkey']))   : '');
+       $consumersecret =       ((x($_POST,'consumersecret'))   ? notags(trim($_POST['consumersecret'])): '');
+       set_config('twitter','consumerkey',$consumerkey);
+       set_config('twitter','consumersecret',$consumersecret);
+       info( t('Settings updated.'). EOL );
+}
+function twitter_plugin_admin(&$a, &$o){
+       $t = file_get_contents( dirname(__file__). "/admin.tpl" );
+       $o = replace_macros($t, array(
+               '$submit' => t('Submit'),
+                                                               // 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' ), '')
+       ));
+}