X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=addon%2Ftwitter%2Ftwitter.php;h=b1c8a0a897a3b388663b39d82f1ba7d452a8a9a9;hb=bdd71b10bef1aa03961fb9c0e2b95c36e9acb096;hp=961cca3bf76d2c462308081642153556f9996fa8;hpb=a05b2b4cc741eea54451b9af2a9728be6bc1ac8e;p=friendica.git

diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index 961cca3bf7..b1c8a0a897 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -1,11 +1,17 @@
 <?php
+/**
+ * Name: Twitter Connector
+ * Version: 1.0.1
+ * Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias>
+ */
+
 
 /*   Twitter Plugin for Friendika
  *
  *   Author: Tobias Diekershoff
  *           tobias.diekershoff@gmx.net
  *
- *   License:3-clause BSD license (same as Friendika)
+ *   License:3-clause BSD license
  *
  *   Configuration:
  *     To use this plugin you need a OAuth Consumer key pair (key & secret)
@@ -40,6 +46,7 @@ function twitter_install() {
 	register_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings'); 
 	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');
 	logger("installed twitter");
 }
 
@@ -48,11 +55,30 @@ function twitter_uninstall() {
 	unregister_hook('plugin_settings', 'addon/twitter/twitter.php', 'twitter_settings'); 
 	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');
+}
+
+function twitter_jot_nets(&$a,&$b) {
+	if(! local_user())
+		return;
+
+	$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) ? ' checked="checked" ' : '');
+		$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable"' . $selected . 'value="1" /> ' 
+			. t('Post to Twitter') . '</div>';	
+	}
+
+
 }
 
 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
@@ -61,12 +87,13 @@ function twitter_settings_post ($a,$post) {
 		 */
 		del_pconfig( local_user(), 'twitter', 'consumerkey'  );
 		del_pconfig( local_user(), 'twitter', 'consumersecret' );
-		del_pconfig( local_user(), 'twitter', 'post' );
+                del_pconfig( local_user(), 'twitter', 'post' );
+                del_pconfig( local_user(), 'twitter', 'post_by_default' );
 	} else {
 	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
@@ -79,11 +106,13 @@ function twitter_settings_post ($a,$post) {
 		set_pconfig(local_user(),'twitter', 'oauthsecret', $token['oauth_token_secret']);
                 set_pconfig(local_user(),'twitter', 'post', 1);
                 //  reload the Addon Settings page, if we don't do it see Bug #42
-                header('Location: '.$a->get_baseurl().'/settings/addon');
+                goaway($a->get_baseurl().'/settings/addon');
 	} else {
 		//  if no PIN is supplied in the POST variables, the user has changed the setting
 		//  to post a tweet for every new __public__ posting to the wall
 		set_pconfig(local_user(),'twitter','post',intval($_POST['twitter-enable']));
+                set_pconfig(local_user(),'twitter','post_by_default',intval($_POST['twitter-default']));
+                info( t('Twitter settings updated.') . EOL);
 	}}
 }
 function twitter_settings(&$a,&$s) {
@@ -101,14 +130,18 @@ function twitter_settings(&$a,&$s) {
 	$osecret = get_pconfig(local_user(), 'twitter', 'oauthsecret' );
         $enabled = get_pconfig(local_user(), 'twitter', 'post');
 	$checked = (($enabled) ? ' checked="checked" ' : '');
-	$s .= '<h3>'.t('Twitter Posting Settings').'</h3>';
+        $defenabled = get_pconfig(local_user(),'twitter','post_by_default');
+	$defchecked = (($defenabled) ? ' checked="checked" ' : '');
+
+	$s .= '<div class="settings-block">';
+	$s .= '<h3>'. t('Twitter Posting Settings') .'</h3>';
 
 	if ( (!$ckey) && (!$csecret) ) {
 		/***
 		 * no global consumer keys
 		 * display warning and skip personal config
 		 */
-		$s .= '<p>'.t('No consumer key pair for Twitter found. Please contact your site administrator.').'</p>';
+		$s .= '<p>'. t('No consumer key pair for Twitter found. Please contact your site administrator.') .'</p>';
 	} else {
 		/***
 		 * ok we have a consumer key pair now look into the OAuth stuff
@@ -120,44 +153,48 @@ 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'];
 			/***
 			 *  make some nice form
 			 */
-			$s .= '<p>'.t('At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.').'</p>';
+			$s .= '<p>'. t('At this Friendika instance the Twitter plugin was enabled but you have not yet connected your account to your Twitter account. To do so click the button below to get a PIN from Twitter which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to Twitter.') .'</p>';
 			$s .= '<a href="'.$connection->getAuthorizeURL($token).'" target="_twitter"><img src="addon/twitter/lighter.png" alt="'.t('Log in with Twitter').'"></a>';
 			$s .= '<div id="twitter-pin-wrapper">';
-			$s .= '<label id="twitter-pin-label" for="twitter-pin">'.t('Copy the PIN from Twitter here').'</label>';
+			$s .= '<label id="twitter-pin-label" for="twitter-pin">'. t('Copy the PIN from Twitter here') .'</label>';
 			$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="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>';
-			$s .= '<p>'.t('If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.').'</p>';
+			$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>';
+			$s .= '<p>'. t('If enabled all your <strong>public</strong> postings can be posted to the associated Twitter account. You can choose to do so by default (here) or for every posting separately in the posting options when writing the entry.') .'</p>';
 			$s .= '<div id="twitter-enable-wrapper">';
-			$s .= '<label id="twitter-enable-label" for="twitter-checkbox">'.t('Send public postings to Twitter').'</label>';
+			$s .= '<label id="twitter-enable-label" for="twitter-checkbox">'. t('Allow posting to Twitter'). '</label>';
 			$s .= '<input id="twitter-checkbox" type="checkbox" name="twitter-enable" value="1" ' . $checked . '/>';
+                        $s .= '<div class="clear"></div>';
+                        $s .= '<label id="twitter-default-label" for="twitter-default">'. t('Send public postings to Twitter by default') .'</label>';
+                        $s .= '<input id="twitter-default" type="checkbox" name="twitter-default" value="1" ' . $defchecked . '/>';
 			$s .= '</div><div class="clear"></div>';
+
 			$s .= '<div id="twitter-disconnect-wrapper">';
-                        $s .= '<label id="twitter-disconnect-label" for="twitter-disconnect">'.t('Clear OAuth configuration').'</label>';
+                        $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>';
+        $s .= '</div><div class="clear"></div></div>';
 }
 
 
@@ -169,7 +206,12 @@ function twitter_post_hook(&$a,&$b) {
 
         logger('twitter post invoked');
 
-	if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) {
+	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');
 
@@ -180,38 +222,64 @@ function twitter_post_hook(&$a,&$b) {
 
 		if($ckey && $csecret && $otoken && $osecret) {
 
-			$twitter_post = get_pconfig(local_user(),'twitter','post');
+			$twitter_post = intval(get_pconfig(local_user(),'twitter','post'));
+			$twitter_enable = (($twitter_post && x($_POST,'twitter_enable')) ? intval($_POST['twitter_enable']) : 0);
+
+			// if API is used, default to the chosen settings
+			if($_POST['api_source'] && intval(get_pconfig(local_user(),'twitter','post_by_default')))
+				$twitter_enable = 1;
 
-			if($twitter_post) {
-				require_once('addon/twitter/twitteroauth.php');
+			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);
 				$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');
-                                        // 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
-                                        // /profile/ is in the owner url twice but I don't
-                                        // think this will be very common...
+				if ( strlen($msg) > $max_char) {
+					$shortlink = "";
+					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
+					// /profile/ is in the owner url twice but I don't
+					// think this will be very common...
 					$posturl = str_replace('/profile/','/display/',$b['owner-link']).'/'.$b['id'];
 					$slinky = new Slinky( $posturl );
 					// setup a cascade of shortening services
 					// try to get a short link from these services
 					// in the order ur1.ca, trim, id.gd, tinyurl
 					$slinky->set_cascade( array( new Slinky_UR1ca(), new Slinky_Trim(), new Slinky_IsGd(), new Slinky_TinyURL() ) );
-                                        $shortlink = $slinky->short();
-                                        // the new message will be shortened such that "... $shortlink"
-                                        // will fit into the character limit
-                                        $msg = substr($msg, 0, $max_char-strlen($shortlink)-4);
-                                        $msg .= '... ' . $shortlink;
-                                }
-                                // and now tweet it :-)
-				$tweet->post('statuses/update', array('status' => $msg));
+					$shortlink = $slinky->short();
+					// the new message will be shortened such that "... $shortlink"
+					// will fit into the character limit
+					$msg = substr($msg, 0, $max_char-strlen($shortlink)-4);
+					$msg .= '... ' . $shortlink;
+				}
+                // and now tweet it :-)
+				if(strlen($msg)) {
+					$result = $tweet->post('statuses/update', array('status' => $msg));
+					logger('twitter_post returns: ' . $result);
+				}
+
 			}
 		}
-        }
+	}
 }
 
+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' ), '')
+	));
+}