7 files changed, 43 insertions, 32 deletions
diff --git a/addon/facebook/README b/addon/facebook/README
index 19c594886..325f18dd1 100644
--- a/addon/facebook/README
+++ b/addon/facebook/README
@@ -33,3 +33,7 @@ long posts truncated - with a link to view the full post.
 Facebook contacts will not be able to view private photos, as they are not able to
 authenticate to your site to establish identity. We will address this 
 in a future release.
+
+Info: please make sure that you understand all aspects due to Friendika's 
+default licence which is: Creative Commons Attribution 3.0 (further info:
+http://creativecommons.org/licenses/by/3.0/ )
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php
index 33895f80d..e8a24070d 100644
--- a/addon/facebook/facebook.php
+++ b/addon/facebook/facebook.php
@@ -273,6 +273,10 @@ function facebook_post(&$a) {
 
 		$no_linking = get_pconfig($uid,'facebook','no_linking');
 
+		$no_wall = ((x($_POST,'facebook_no_wall')) ? intval($_POST['facebook_no_wall']) : 0);
+		set__pconfig($uid,'facebook','no_wall',$no_wall);
+	
+
 		$linkvalue = ((x($_POST,'facebook_linking')) ? intval($_POST['facebook_linking']) : 0);
 		set_pconfig($uid,'facebook','no_linking', (($linkvalue) ? 0 : 1));
 
@@ -359,12 +363,11 @@ function facebook_content(&$a) {
 		$checked = (($no_linking) ? '' : ' checked="checked" ');
 		$o .= '<input type="checkbox" name="facebook_linking" value="1"' . $checked . '/>' . ' ' . t('Link all your Facebook friends and conversations') . EOL ;
 
-		$hidden = (($a->user['hidewall'] || get_config('system','block_public')) ? true : false);
-		if(! $hidden) {
-			$o .= EOL;
-			$o .= t('Warning: Your Facebook privacy settings can not be imported.') . EOL;
-			$o .= t('Linked Facebook items <strong>may</strong> be publicly visible, depending on your privacy settings for this website/account.') . EOL;
-		}
+		$no_wall = get_pconfig(local_user(),'facebook','no_wall');
+		$checked = (($no_wall) ? ' checked="checked" ' : '');
+		$o .= '<input type="checkbox" name="facebook_no_wall" value="1"' . $checked . '/>' . ' ' . t('Do not link your Facebook profile wall posts - as these could be visible to people that would not be able to see them on Facebook.') . EOL ;
+
+
 		$o .= '<input type="submit" name="submit" value="' . t('Submit') . '" /></form></div>';
 	}
 
@@ -766,12 +769,13 @@ function fb_consume_all($uid) {
 	if(! $access_token)
 		return;
 	
-
-	$s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
-	if($s) {
-		$j = json_decode($s);
-		logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA);
-		fb_consume_stream($uid,$j,true);
+	if(! get_pconfig($uid,'facebook','no_wall')) {
+		$s = fetch_url('https://graph.facebook.com/me/feed?access_token=' . $access_token);
+		if($s) {
+			$j = json_decode($s);
+			logger('fb_consume_stream: wall: ' . print_r($j,true), LOGGER_DATA);
+			fb_consume_stream($uid,$j,true);
+		}
 	}
 	$s = fetch_url('https://graph.facebook.com/me/home?access_token=' . $access_token);
 	if($s) {
diff --git a/addon/impressum/README b/addon/impressum/README
index 9a38c0bec..8e4255bd1 100644
--- a/addon/impressum/README
+++ b/addon/impressum/README
@@ -7,7 +7,7 @@ License: 3-clause BSD license (same as Friendika)
 
 About
   This plugin adds an Impressum block to the /friendika page with informations
-  about the page operator/owner and how to countact you in case of any questions.
+  about the page operator/owner and how to contact you in case of any questions.
 
   In the notes and postal fields you can use HTML tags for formatting.
 
diff --git a/addon/statusnet/README b/addon/statusnet/README
index 8d5e27297..6ace48284 100644
--- a/addon/statusnet/README
+++ b/addon/statusnet/README
@@ -3,30 +3,30 @@ by Tobias Diekershoff
    tobias.diekershoff(at)gmx.net
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! This addon is currently in under development. If you have any problem    !!
+!! This addon is currently under development. If you have any problem       !!
 !! with it, please contact the Author.                                      !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 With this addon to Friendika you can give your user the possibility to post
-their public messages to any StatusNet instance like identi.ca for example. The
-messages will be strapped their rich context and shortened to to the character
+their public messages to any StatusNet instance (like identi.ca for example). 
+The messages will be strapped their rich context and shortened to to the character
 limit of the StatusNet instance in question if necessary. If shortening of the
 message was performed a link will be added to the notice pointing to the
 original message on your server.
 
-There is a similar plugin to forward public messages to Twitter Twitter Plugin.
+There is a similar plugin to forward public messages to Twitter: Twitter Plugin.
 
 Online version of this document: http://ur1.ca/35mpb
 
 ___ Requirements ___
 
 Due to the distributed nature of the StatusNet network, each user who wishes to
-forward public messages to a StatusNet account has get the OAuth credentials
-for themselves, which makes this addon a little bit more user unfriendly then
-the Twitter Plugin is. Nothing to geeky though!
+forward public messages to a StatusNet account has to get the OAuth credentials
+for themselves, which makes this addon a little bit more user unfriendly than
+the Twitter Plugin is. Nothing too geeky though!
 
 The inclusion of a shorturl for the original posting in cases when the message
-was longer then the maximal allowed notice length requires it, that you have
+was longer than the maximal allowed notice length requires it, that you have
 PHP5+ and curl on your server.
 Where to find
 
@@ -58,7 +58,7 @@ To get the OAuth Consumer key pair the user has to (a) ask her Friendika admin
 if a pair already exists or (b) has to register the Friendika server as a
 client application on the StatusNet server. This can be done from the account
 settings under "Connect -> Connections -> Register an OAuth client application
--> Register new application".
+-> Register a new application".
 
 During the registration of the OAuth client remember the following:
  * there is no callback url
@@ -69,7 +69,7 @@ During the registration of the OAuth client remember the following:
 After the required credentials for the application are stored in the
 configuration you have to actually connect your Friendika account with
 StatusNet. To do so follow the Sign in with StatusNet button, allow the access
-and copy the security code into the addon configuration. Friendika will then
+and copy the security code into the plugin configuration. Friendika will then
 try to acquire the final OAuth credentials from the API, if successful the
-addon settings will allow you to select to post your public messages to your
+plugin settings will allow you to select to post your public messages to your
 StatusNet account.
diff --git a/addon/statusnet/statusnet.php b/addon/statusnet/statusnet.php
index 2f02ded54..f1b35d6c0 100644
--- a/addon/statusnet/statusnet.php
+++ b/addon/statusnet/statusnet.php
@@ -355,7 +355,10 @@ function statusnet_post_hook(&$a,&$b) {
 
         logger('StatusNet post invoked');
 
-	if((local_user()) && (local_user() == $b['uid']) && (! $b['private']) && (!$b['parent']) ) {
+	if((local_user()) && (local_user() == $b['uid']) && (! $b['private'])) {
+
+		// mike 2-9-11 there was a restriction to only allow this for top level posts
+		// now relaxed so should allow one's own comments to be forwarded through the connector as well. 
 
 		// Status.Net is not considered a private network
 		if($b['prvnets'])
diff --git a/addon/twitter/README b/addon/twitter/README
index a49fa5cda..e6d5f12c9 100644
--- a/addon/twitter/README
+++ b/addon/twitter/README
@@ -3,7 +3,7 @@ By Tobias Diekershoff
    tobias.diekershoff(at)gmx.net
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!!   This addon is currently in under development. If you have any problem  !!
+!!   This addon is currently under development. If you have any problem     !!
 !!   with it, please contact the Author.                                    !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
@@ -29,7 +29,7 @@ After you registered the application you get an OAuth consumer key / secret
 pair that identifies your app, you will need them for configuration.
 
 The inclusion of a shorturl for the original posting in cases when the
-message was longer then 140 characters requires it, that you have *PHP5+* and
+message was longer than 140 characters requires it, that you have *PHP5+* and
 *curl* on your server.
 
 ___ Where to find ___
@@ -51,19 +51,19 @@ To activate this addon add @twitter@ to the list of active addons in your
 .htconfig.php file 
     $a->config['system']['addon'] = "twitter, ..."
 Afterwards you need to add your OAuth consumer key / secret pair to it by
-adding the following to lines
+adding the following two lines
 
 $a->config['twitter']['consumerkey'] = 'your consumer KEY here';
 $a->config['twitter']['consumersecret'] = 'your consumer SECRET here';
 
 When this is done your user can now configure their Twitter connection at
-"Settings -> Addon Settings" and enable the forwarding of their *public*
+"Settings -> Plugin Settings" and enable the forwarding of their *public*
 messages to Twitter.
 
 __ User Configuration __
 
 When the OAuth consumer informations are correctly placed into the
-configuration file and a user visits the "Addon Settings" page they can now
+configuration file and a user visits the "Plugin Settings" page they can now
 connect to Twitter. To do so one has to follow the _Sign in with Twitter_
 button (the page will be opened in a new browser window/tab) and get a PIN from
 Twitter. This PIN has to be entered on the settings page. After submitting the
@@ -71,7 +71,7 @@ PIN the plugin will get OAuth credentials identifying this user from the
 Friendika account.
 
 If this first step was successful the Twitter configuration will be changed
-on the "Addon Settings" page displaying two check boxes. One to enable/disable
+on the "Plugin Settings" page displaying two check boxes. One to enable/disable
 the forwarding of *all public* postings to Twitter and one to clear the
 personal configuration from the Twitter credentials.
 
diff --git a/addon/widgets/widget_like.php b/addon/widgets/widget_like.php
index 9b54212a8..6927d4324 100644
--- a/addon/widgets/widget_like.php
+++ b/addon/widgets/widget_like.php
@@ -4,7 +4,7 @@ function like_widget_name() {
 	return "Shows likes";
 }
 function like_widget_help() {
-	return "Search first item wich contains <em>KEY</em> and print like/dislike count";
+	return "Search first item which contains <em>KEY</em> and print like/dislike count";
 }
 
 function like_widget_args(){