toggles "post to facebook, post to twitter", etc.

2 files changed, 74 insertions, 7 deletions

diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index a41344a3d..2a5715b2e 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -3,6 +3,9 @@
 /**
  * This module still needs a lot of work, but is functional today.
  * Please review this section if you upgrade because things will change.
+ * If you have issues upgrading, remove facebook from the addon list, 
+ * view a page on your site, then add it back to the list. This will reset
+ * all of the plugin 'hooks'. 
  *
  * 1. register an API key from developer.facebook.com
  *   a. We'd be very happy if you include "Friendika" in the application name
@@ -77,7 +80,7 @@ function facebook_init(&$a) {
  			if(strpos($token,'&') !== false)
 				$token = substr($token,0,strpos($token,'&'));
 			set_pconfig($uid,'facebook','access_token',$token);
-			set_pconfig($uid,'facebook','post','true');
+			set_pconfig($uid,'facebook','post','1');
 		}
 
 		// todo: is this a browser session or a server session? where do we go? 
@@ -118,12 +121,41 @@ function facebook_content(&$a) {
 }
 
 function facebook_install() {
-	register_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
+	register_hook('post_local_end',  'addon/facebook/facebook.php', 'facebook_post_hook');
+	register_hook('jot_networks',    'addon/facebook/facebook.php', 'facebook_jot_nets');
+	register_hook('post_local_start','addon/facebook/facebook.php', 'facebook_post_local');
+
 }
 
 
 function facebook_uninstall() {
-	unregister_hook('post_local_end', 'addon/facebook/facebook.php', 'facebook_post_hook');
+	unregister_hook('post_local_end',  'addon/facebook/facebook.php', 'facebook_post_hook');
+	unregister_hook('jot_networks',    'addon/facebook/facebook.php', 'facebook_jot_nets');
+	unregister_hook('post_local_start','addon/facebook/facebook.php', 'facebook_post_local');
+}
+
+
+function facebook_jot_nets(&$a,&$b) {
+	if(! local_user())
+		return;
+
+	$fb_post = get_pconfig(local_user(),'facebook','post');
+	if(intval($fb_post) == 1) {
+		$fb_defpost = get_pconfig(local_user(),'facebook','post_by_default');
+		$selected = ((intval($fb_defpost == 1)) ? ' selected="selected" ' : '');
+		$b .= '<div class="profile-jot-net"><input type="checkbox" name="facebook_enable" $selected value="1" /> ' 
+			. t('Post to Facebook') . '</div>';	
+	}
+}
+
+function facebook_post_local(&$a,&$b) {
+	if(! local_user())
+		return;
+
+	if((x($b,'facebook_enable')) && (intval($b['facebook_enable'])))
+		set_pconfig(local_user(),'facebook','enable','1');
+	else
+		del_pconfig(local_user(),'facebook','enable');
 }
 
 
@@ -143,10 +175,11 @@ function facebook_post_hook(&$a,&$b) {
 
 		if($appid && $secret) {
 
-			$fb_post  = get_pconfig(local_user(),'facebook','post');
-			$fb_token = get_pconfig(local_user(),'facebook','access_token');
+			$fb_post   = intval(get_pconfig(local_user(),'facebook','post'));
+			$fb_enable = intval(get_pconfig(local_user(),'facebook','enable'));
+			$fb_token  = get_pconfig(local_user(),'facebook','access_token');
 
-			if($fb_post && $fb_token) {
+			if($fb_post && $fb_token && $fb_enable) {
 				require_once('library/facebook.php');
 				require_once('include/bbcode.php');	
 
diff --git a/addon/twitter/twitter.php b/addon/twitter/twitter.php
index a0c6db931..6a0365e09 100644
--- a/addon/twitter/twitter.php
+++ b/addon/twitter/twitter.php
@@ -40,6 +40,8 @@ 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');
+	register_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start');
 	logger("installed twitter");
 }
 
@@ -48,8 +50,39 @@ 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');
+	unregister_hook('post_local_start', 'addon/twitter/twitter.php', 'twitter_post_start');
+
+}
+
+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)) ? ' selected="selected" ' : '');
+		$b .= '<div class="profile-jot-net"><input type="checkbox" name="twitter_enable" $selected value="1" /> ' 
+			. t('Post to Twitter') . '</div>';	
+	}
+
+
 }
 
+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;
@@ -181,8 +214,9 @@ 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'));
 
-			if($twitter_post) {
+			if($twitter_post && $twitter_enable) {
 				require_once('addon/twitter/twitteroauth.php');
 				require_once('include/bbcode.php');	
 				$tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret);