Merge branch 'master' of git://github.com/friendika/friendika

boot.php

@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.990' );
+define ( 'FRIENDIKA_VERSION',      '2.2.991' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1058      );
 

doc/Connectors.md

@@ -26,6 +26,8 @@ These are described as the "federated social web" or OStatus contacts.
 
 Please note that there are **no** privacy provisions on the OStatus network. Any message which is delivered to **any** OStatus member is visible to anybody in the world and will negate any privacy settings that you have in effect. These messages will also turn up in public searches. 
 
+Since OStatus communications do not use authentication, if you select the profile privacy option to hide your profile and messages from unknown viewers, OStatus members will **not** be able to recieve your communications. 
+
 To connect with an OStatus member insert their profile URL or Identity address into the Connect box on your [Contacts](contacts) page.
 
 The StatusNet connector may be used if you wish posts to appear on an OStatus site using an existing OStatus account. 

mod/dfrn_notify.php

@@ -419,7 +419,7 @@ function dfrn_notify_post(&$a) {
 								'$email'		=> $importer['email'],				// email address to send to
 								'$url'			=> $datarray['author-link'],			// full url for the site
 								'$from'			=> $from,					// name of the person sending the message
-								'$body'			=> 'q1' .$msg['htmlversion'],			// html version of the message
+								'$body'			=> $msg['htmlversion'],			// html version of the message
 								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
 							));
 			
@@ -440,10 +440,10 @@ function dfrn_notify_post(&$a) {
 							require_once("include/EmailNotification.php");
 							EmailNotification::sendTextHtmlEmail(
 								$msg['notificationfromname'],
-								t("Administrator@") . $a->get_hostname(),
+								t("Administrator") . '@' . $a->get_hostname(),
 								t("noreply") . '@' . $a->get_hostname(),
 								$importer['email'],
-								$from . t(" commented on an item at ") . $a->config['sitename'],
+								sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
 								$email_html_body_tpl,
 								$email_text_body_tpl
 							);
@@ -504,7 +504,7 @@ function dfrn_notify_post(&$a) {
 					$datarray['type'] = 'activity';
 					$datarray['gravity'] = GRAVITY_LIKE;
 				}
-				$r = item_store($datarray);
+				$posted_id = item_store($datarray);
 
 				// find out if our user is involved in this conversation and wants to be notified.
 			
@@ -544,11 +544,11 @@ function dfrn_notify_post(&$a) {
 							$email_html_body_tpl = replace_macros($tpl,array(
 								'$sitename'		=> $a->config['sitename'],				// name of this site
 								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-								'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
+								'$thumb'		=> $datarray['author-avatar'],				// thumbnail url for sender icon
-								'$url'			=> $conv['author-link'],				// full url for the site
+								'$url'			=> $datarray['author-link'],				// full url for the site
 								'$from'			=> $from,						// name of the person sending the message
 								'$body'			=> $msg['htmlversion'],					// html version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 							));
 			
 							// load the template for private message notifications
@@ -556,11 +556,11 @@ function dfrn_notify_post(&$a) {
 							$email_text_body_tpl = replace_macros($tpl,array(
 								'$sitename'		=> $a->config['sitename'],				// name of this site
 								'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-								'$thumb'		=> $conv['author-avatar'],				// thumbnail url for sender icon
+								'$thumb'		=> $datarray['author-avatar'],				// thumbnail url for sender icon
-								'$url'			=> $conv['author-link'],				// full url for the site
+								'$url'			=> $datarray['author-link'],				// full url for the site
 								'$from'			=> $from,						// name of the person sending the message
 								'$body'			=> $msg['textversion'],					// text version of the message
-								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nick'] . '/' . $posted_id,
+								'$display'		=> $a->get_baseurl() . '/display/' . $importer['nickname'] . '/' . $posted_id,
 							));
 
 							// use the EmailNotification library to send the message
@@ -570,7 +570,7 @@ function dfrn_notify_post(&$a) {
 								t("Administrator@") . $a->get_hostname(),
 								t("noreply") . '@' . $a->get_hostname(),
 								$importer['email'],
-								$from . t(" commented on an item at ") . $a->config['sitename'],
+								sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
 								$email_html_body_tpl,
 								$email_text_body_tpl
 							);

mod/dfrn_poll.php

@@ -31,6 +31,12 @@ function dfrn_poll_init(&$a) {
 			killme();
 		}
 
+		$r = q("SELECT `hidewall` FROM `profile` LEFT JOIN `user` ON `profile`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 LIMIT 1",
+			dbesc($a->argv[1])
+		);
+		if(count($r) && $r[0]['hidewall'])
+			killme();
+ 
 		logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] );
 		header("Content-type: application/atom+xml");
 		$o = get_feed_for($a, '', $a->argv[1],$last_update);

mod/item.php

@@ -443,7 +443,7 @@ function item_post(&$a) {
 	else
 		$post_id = 0;
 
-dbg(1);
+
 	$r = q("INSERT INTO `item` (`uid`,`type`,`wall`,`gravity`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, 
 		`author-name`, `author-link`, `author-avatar`, `created`, `edited`, `changed`, `uri`, `title`, `body`, `location`, `coord`, 
 		`tag`, `inform`, `verb`, `allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`, `private`, `pubmail`, `attach` )
@@ -533,10 +533,10 @@ dbg(1);
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
 					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $author['url'],					// full url for the site
+					'$url'			=> $author['url'],						// full url for the site
-					'$from'			=> $from,						// name of the person sending the message
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 			
 				// load the template for private message notifications
@@ -546,10 +546,10 @@ dbg(1);
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
 					'$email'		=> $importer['email'],					// email address to send to
-					'$url'			=> $author['url'],					// full url for the site
+					'$url'			=> $author['url'],						// profile url for the author
-					'$from'			=> $from,						// name of the person sending the message
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 
 				// use the EmailNotification library to send the message
@@ -559,7 +559,7 @@ dbg(1);
 					t("Administrator@") . $a->get_hostname(),
 					t("noreply") . '@' . $a->get_hostname(),
 					$user['email'],
-					$from . t(" commented on an item at ") . $a->config['sitename'],
+					sprintf( t('%s commented on an item at %s'), $from , $a->config['sitename']),
 					$email_html_body_tpl,
 					$email_text_body_tpl
 				);
@@ -598,10 +598,10 @@ dbg(1);
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$url'			=> $author['url'],					// full url for the site
+					'$url'			=> $author['url'],						// full url for the site
-					'$from'			=> $from,						// name of the person sending the message
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['htmlversion'],					// html version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 			
 				// load the template for private message notifications
@@ -610,10 +610,10 @@ dbg(1);
 					'$sitename'		=> $a->config['sitename'],				// name of this site
 					'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
 					'$thumb'		=> $author['thumb'],					// thumbnail url for sender icon
-					'$url'			=> $author['url'],					// full url for the site
+					'$url'			=> $author['url'],						// full url for the site
-					'$from'			=> $from,						// name of the person sending the message
+					'$from'			=> $from,								// name of the person sending the message
 					'$body'			=> $msg['textversion'],					// text version of the message
-					'$display'		=> $a->get_baseurl() . '/display/' . $author['nick'] . '/' . $post_id,
+					'$display'		=> $a->get_baseurl() . '/display/' . $user['nickname'] . '/' . $post_id,
 				));
 
 				// use the EmailNotification library to send the message
@@ -623,7 +623,7 @@ dbg(1);
 					t("Administrator@") . $a->get_hostname(),
 					t("noreply") . '@' . $a->get_hostname(),
 					$user['email'],
-					$from . t(" commented on an item at ") . $a->config['sitename'],
+					sprintf( t('%s posted to your profile wall at %s') , $from , $a->config['sitename']),
 					$email_html_body_tpl,
 					$email_text_body_tpl
 				);

mod/profiles.php

@@ -363,7 +363,7 @@ function profiles_content(&$a) {
 
 		$opt_tpl = get_markup_template("profile-hide-wall.tpl");
 		$hide_wall = replace_macros($opt_tpl,array(
-			'$desc' => t('Hide your messages from unknown viewers of this profile?'),
+			'$desc' => t('Hide profile details and all your messages from unknown viewers?'),
 			'$yes_str' => t('Yes'),
 			'$no_str' => t('No'),
 			'$yes_selected' => (($r[0]['hidewall']) ? " checked=\"checked\" " : ""),

util/strings.php

@@ -58,12 +58,16 @@ $a->strings['Birthday Reminders'] = 'Birthday Reminders';
 $a->strings['Birthdays this week:'] = 'Birthdays this week:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29";
 $a->strings['[today]'] = '[today]';
+$a->strings['bytes'] = 'bytes';
 $a->strings['link to source'] = 'link to source';
 $a->strings['%d Contact'] = array(
 	0 => '%d Contact',
 	1 => '%d Contacts',
 );
 $a->strings['Applications'] = 'Applications';
+$a->strings['Private Notes'] = 'Private Notes';
+$a->strings['Item not available.'] = 'Item not available.';
+$a->strings['Item was not found.'] = 'Item was not found.';
 $a->strings["Invite Friends"] = "Invite Friends";
 $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests';
 $a->strings['Connect/Follow'] = 'Connect/Follow';
@@ -153,7 +157,8 @@ $a->strings['Unable to update your contact profile details on our system'] = 'Un
 $a->strings["Connection accepted at %s"] = "Connection accepted at %s";
 $a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
-$a->strings["%s commented on an item at %s"] = "%s commented on an item at %s";
+$a->strings['%s commented on an item at %s'] = '%s commented on an item at %s';
+$a->strings[" commented on an item at "] = " commented on an item at ";
 $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
 $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.';
 $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.';
@@ -199,6 +204,8 @@ $a->strings["%d required parameter was not found at the given location"] = array
 	1 => "%d required parameters were not found at the given location",
 );
 $a->strings['Global Directory'] = 'Global Directory';
+$a->strings['Normal site view'] = 'Normal site view';
+$a->strings['View all site entries'] = 'View all site entries';
 $a->strings['Site Directory'] = 'Site Directory';
 $a->strings['Age: '] = 'Age: ';
 $a->strings['Gender: '] = 'Gender: ';
@@ -208,9 +215,11 @@ $a->strings['Item has been removed.'] = 'Item has been removed.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
 $a->strings['Item not found'] = 'Item not found';
 $a->strings['Edit post'] = 'Edit post';
+$a->strings['Visible to <strong>everybody</strong>'] = 'Visible to <strong>everybody</strong>';
 $a->strings["Post to Email"] = "Post to Email";
 $a->strings['Edit'] = 'Edit';
 $a->strings['Upload photo'] = 'Upload photo';
+$a->strings['Attach file'] = 'Attach file';
 $a->strings['Insert web link'] = 'Insert web link';
 $a->strings['Insert YouTube video'] = 'Insert YouTube video';
 $a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
@@ -220,8 +229,12 @@ $a->strings['Clear browser location'] = 'Clear browser location';
 $a->strings['Please wait'] = 'Please wait';
 $a->strings['Permission settings'] = 'Permission settings';
 $a->strings['CC: email addresses'] = 'CC: email addresses';
+$a->strings['Public post'] = 'Public post';
 $a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
 $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
+$a->strings['No compatible communication protocols or feeds were discovered.'] = 'No compatible communication protocols or feeds were discovered.';
+$a->strings['An author or name was not found.'] = 'An author or name was not found.';
+$a->strings['No browser URL could be matched to this address.'] = 'No browser URL could be matched to this address.';
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
 $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
 $a->strings['following'] = 'following';
@@ -287,6 +300,7 @@ $a->strings['If not, you may be required to perform a manual installation. Pleas
 $a->strings['The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.'] = 'The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.';
 $a->strings['Errors encountered creating database tables.'] = 'Errors encountered creating database tables.';
 $a->strings['%s : Not a valid email address.'] = '%s : Not a valid email address.';
+$a->strings['Please join my network on %s'] = 'Please join my network on %s';
 $a->strings['%s : Message delivery failed.'] = '%s : Message delivery failed.';
 $a->strings['Send invitations'] = 'Send invitations';
 $a->strings['Enter email addresses, one per line:'] = 'Enter email addresses, one per line:';
@@ -300,8 +314,6 @@ $a->strings["%d message sent."] = array(
 $a->strings['Unable to locate original post.'] = 'Unable to locate original post.';
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
 $a->strings['Wall Photos'] = 'Wall Photos';
-$a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
-$a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
 $a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
 $a->strings['This message was sent to you by %s, a member of the Friendika social network.'] = 'This message was sent to you by %s, a member of the Friendika social network.';
 $a->strings['You may visit them online at %s'] = 'You may visit them online at %s';
@@ -354,7 +366,6 @@ $a->strings['Delete message'] = 'Delete message';
 $a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Normal View'] = 'Normal View';
 $a->strings['New Item View'] = 'New Item View';
-$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.';
 $a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.';
 $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
@@ -362,10 +373,11 @@ $a->strings['Group: '] = 'Group: ';
 $a->strings['Contact: '] = 'Contact: ';
 $a->strings['Private messages to this person are at risk of public disclosure.'] = 'Private messages to this person are at risk of public disclosure.';
 $a->strings['Invalid contact.'] = 'Invalid contact.';
-$a->strings['%d member'] = array(
+$a->strings['Warning: This group contains %s member from an insecure network.'] = array(
-	0 => '%d member',
+	0 => 'Warning: This group contains %s member from an insecure network.',
-	1 => '%d members',
+	1 => 'Warning: This group contains %s members from an insecure network.',
 );
+$a->strings['Save'] = 'Save';
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Discard';
 $a->strings['Ignore'] = 'Ignore';
@@ -412,11 +424,11 @@ $a->strings['Edit Album'] = 'Edit Album';
 $a->strings['View Photo'] = 'View Photo';
 $a->strings['Photo not available'] = 'Photo not available';
 $a->strings['Edit photo'] = 'Edit photo';
+$a->strings['Use as profile photo'] = 'Use as profile photo';
 $a->strings['Private Message'] = 'Private Message';
 $a->strings['<< Prev'] = '<< Prev';
 $a->strings['View Full Size'] = 'View Full Size';
 $a->strings['Next >>'] = 'Next >>';
-$a->strings['Tags: '] = 'Tags: ';
 $a->strings['[Remove any tag]'] = '[Remove any tag]';
 $a->strings['New album name'] = 'New album name';
 $a->strings['Caption'] = 'Caption';
@@ -429,6 +441,7 @@ $a->strings['This is you'] = 'This is you';
 $a->strings['Recent Photos'] = 'Recent Photos';
 $a->strings['Upload New Photos'] = 'Upload New Photos';
 $a->strings['View Album'] = 'View Album';
+$a->strings['Access to this profile has been restricted.'] = 'Access to this profile has been restricted.';
 $a->strings['Status'] = 'Status';
 $a->strings['Profile'] = 'Profile';
 $a->strings['Photos'] = 'Photos';
@@ -450,7 +463,8 @@ $a->strings['Profile deleted.'] = 'Profile deleted.';
 $a->strings['Profile-'] = 'Profile-';
 $a->strings['New profile created.'] = 'New profile created.';
 $a->strings['Profile unavailable to clone.'] = 'Profile unavailable to clone.';
-$a->strings['Hide my contact/friend list from viewers of this profile?'] = 'Hide my contact/friend list from viewers of this profile?';
+$a->strings['Hide your contact/friend list from viewers of this profile?'] = 'Hide your contact/friend list from viewers of this profile?';
+$a->strings['Hide profile details and all your messages from unknown viewers?'] = 'Hide profile details and all your messages from unknown viewers?';
 $a->strings['Edit Profile Details'] = 'Edit Profile Details';
 $a->strings['View this profile'] = 'View this profile';
 $a->strings['Create a new profile using these settings'] = 'Create a new profile using these settings';
@@ -600,8 +614,12 @@ $a->strings['Tag removed'] = 'Tag removed';
 $a->strings['Remove Item Tag'] = 'Remove Item Tag';
 $a->strings['Select a tag to remove: '] = 'Select a tag to remove: ';
 $a->strings['Remove'] = 'Remove';
+$a->strings['[Embedded content - reload page to view]'] = '[Embedded content - reload page to view]';
 $a->strings['No contacts.'] = 'No contacts.';
+$a->strings['File upload failed.'] = 'File upload failed.';
+$a->strings['Image exceeds size limit of %d'] = 'Image exceeds size limit of %d';
 $a->strings['Visible To:'] = 'Visible To:';
+$a->strings['everybody'] = 'everybody';
 $a->strings['Groups'] = 'Groups';
 $a->strings['Except For:'] = 'Except For:';
 $a->strings['Logged out.'] = 'Logged out.';
@@ -633,7 +651,6 @@ $a->strings['and'] = 'and';
 $a->strings[', and %d other people'] = ', and %d other people';
 $a->strings['%s like this.'] = '%s like this.';
 $a->strings['%s don\'t like this.'] = '%s don\'t like this.';
-$a->strings['Visible to <strong>everybody</strong>'] = 'Visible to <strong>everybody</strong>';
 $a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:';
 $a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:";
 $a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:";
@@ -668,6 +685,7 @@ $a->strings['Manage'] = 'Manage';
 $a->strings['Settings'] = 'Settings';
 $a->strings["\x28no subject\x29"] = "\x28no subject\x29";
 $a->strings['Embedding disabled'] = 'Embedding disabled';
+$a->strings['From: '] = 'From: ';
 $a->strings['j F, Y'] = 'j F, Y';
 $a->strings['j F'] = 'j F';
 $a->strings['Age:'] = 'Age:';
@@ -759,10 +777,18 @@ $a->strings['Uploaded file is empty'] = 'Uploaded file is empty';
 $a->strings['Uploaded file is too large'] = 'Uploaded file is too large';
 $a->strings['File has an invalid extension, it should be one of '] = 'File has an invalid extension, it should be one of ';
 $a->strings['Upload was cancelled, or server error encountered'] = 'Upload was cancelled, or server error encountered';
+$a->strings['OEmbed settings updated'] = 'OEmbed settings updated';
+$a->strings['URL to embed:'] = 'URL to embed:';
 $a->strings['Randplace Settings'] = 'Randplace Settings';
 $a->strings['Enable Randplace Plugin'] = 'Enable Randplace Plugin';
 $a->strings['Post to StatusNet'] = 'Post to StatusNet';
+$a->strings['Please contact your site administrator.<br />The provided API URL is not valid.'] = 'Please contact your site administrator.<br />The provided API URL is not valid.';
+$a->strings['We could not contact the StatusNet API with the Path you entered.'] = 'We could not contact the StatusNet API with the Path you entered.';
+$a->strings['StatusNet settings updated.'] = 'StatusNet settings updated.';
 $a->strings['StatusNet Posting Settings'] = 'StatusNet Posting Settings';
+$a->strings['Globally Available StatusNet OAuthKeys'] = 'Globally Available StatusNet OAuthKeys';
+$a->strings['There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below] = 'There are preconfigured OAuth key pairs for some StatusNet servers available. If you are useing one of them, please use these credentials. If not feel free to connect to any other StatusNet instance (see below;
+$a->strings['Provide your own OAuth Credentials'] = 'Provide your own OAuth Credentials';
 $a->strings['No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.'] = 'No consumer key pair for StatusNet found. Register your Friendika Account as an desktop client on your StatusNet account, copy the consumer key pair here and enter the API base root.<br />Before you register your own OAuth key pair ask the administrator if there is already a key pair for this Friendika installation at your favorited StatusNet installation.';
 $a->strings['OAuth Consumer Key'] = 'OAuth Consumer Key';
 $a->strings['OAuth Consumer Secret'] = 'OAuth Consumer Secret';
@@ -770,9 +796,11 @@ $a->strings["Base API Path \x28remember the trailing /\x29"] = "Base API Path \x
 $a->strings['To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.'] = 'To connect to your StatusNet account click the button below to get a security code from StatusNet which you have to copy into the input box below and submit the form. Only your <strong>public</strong> posts will be posted to StatusNet.';
 $a->strings['Log in with StatusNet'] = 'Log in with StatusNet';
 $a->strings['Copy the security code from StatusNet here'] = 'Copy the security code from StatusNet here';
+$a->strings['Cancel StatusNet Connection'] = 'Cancel StatusNet Connection';
 $a->strings['Currently connected to: '] = 'Currently connected to: ';
-$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account as well.';
+$a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated StatusNet account.';
-$a->strings['Send public postings to StatusNet'] = 'Send public postings to StatusNet';
+$a->strings['Allow posting to StatusNet'] = 'Allow posting to StatusNet';
+$a->strings['Send public postings to StatusNet by default'] = 'Send public postings to StatusNet by default';
 $a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration';
 $a->strings['Three Dimensional Tic-Tac-Toe'] = 'Three Dimensional Tic-Tac-Toe';
 $a->strings['3D Tic-Tac-Toe'] = '3D Tic-Tac-Toe';
@@ -793,6 +821,9 @@ $a->strings['At this Friendika instance the Twitter plugin was enabled but you h
 $a->strings['Copy the PIN from Twitter here'] = 'Copy the PIN from Twitter here';
 $a->strings['If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.'] = 'If enabled all your <strong>public</strong> postings will be posted to the associated Twitter account as well.';
 $a->strings['Send public postings to Twitter'] = 'Send public postings to Twitter';
+$a->strings['Connect on Friendika!'] = 'Connect on Friendika!';
+$a->strings['Widgets key: '] = 'Widgets key: ';
+$a->strings["Plugin Settings"] = "Plugin Settings";
 $a->strings['Africa/Abidjan'] = 'Africa/Abidjan';
 $a->strings['Africa/Accra'] = 'Africa/Accra';
 $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa';

view/theme/dispy/style.css

@@ -336,6 +336,9 @@ aside #viewcontacts { text-align: right;}
 #acl-wrapper-end,
 #profile-jot-end { clear: both; height: 5px; }
 
+
+
+
 /**
  * section
  */
@@ -441,7 +444,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 	height: 30px;
     
 }
-.wallwall .wwto img { width: 30px; height: 30px;}
+.wallwall .wwto img { width: 30px!important; height: 30px!important;}
 .wallwall .wall-item-photo-end { clear: both; }
 .wall-item-arrowphoto-wrapper {
     position: absolute;
@@ -474,7 +477,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
  .ccollapse-wrapper { font-size: 0.9em; margin-left: 80px; }
  
 .wall-item-outside-wrapper.comment { margin-left: 80px; }
-.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px; height: 40px;}
+.wall-item-outside-wrapper.comment .wall-item-photo { width: 40px!important; height: 40px!important;}
 .wall-item-outside-wrapper.comment .wall-item-photo-wrapper {width: 40px; height: 40px; }
 .wall-item-outside-wrapper.comment .wall-item-photo-menu-button {
 	width: 50px; top: 45px; background-position: 35px center;
@@ -719,7 +722,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 /**
  * 	contacts selector
  */
-
+#group-edit-desc { margin: 10px 0xp; }
+#group-members,
 #prof-members {
 	height: 200px; 
 	overflow: auto;
@@ -728,6 +732,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
     -moz-border-radius: 5px 5px 0px 0px;
     border-radius: 5px 5px 0px 0px;
 }
+#group-all-contacts,
 #prof-all-contacts { 
 	height: 200px;
     overflow: auto;	
@@ -736,6 +741,8 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
     -moz-border-radius: 0px 0px 5px 5px;
     border-radius: 0px 0px 5px 5px;
 }
+#group-members h3,
+#group-all-contacts h3,
 #prof-members h3,
 #prof-all-contacts h3{
 	color: #eeeeec;
@@ -743,7 +750,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 	margin: 0px;
 	padding: 5px;
 }
-
+#group-separator,
 #prof-separator { display: none;}
 
 /**
@@ -807,7 +814,7 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;}
 
 .attachtype {
 	display: block; width: 20px; height: 23px;
-	background-image: url('../../../images/content-types.gif');
+	background-image: url('../../../images/content-types.png');
 }
 
 .type-video { background-position: 0px; 0px; }

view/theme/duepuntozero/style.css

@@ -2434,7 +2434,7 @@ a.mail-list-link {
 .attachtype {
 	display: block; width: 20px; height: 23px;
 	float: left;
-	background-image: url('../../../images/content-types.gif');
+	background-image: url('../../../images/content-types.png');
 }
 
 .body-attach {

view/theme/loozah/style.css

@@ -114,8 +114,10 @@ blockquote:before {
 #profile-link,
 #profile-title, 
 #wall-image-upload,
+#wall-file-upload,
 #profile-upload-wrapper,
 #wall-image-upload-div,
+#wall-file-upload-div,
 .hover, .focus {
 	cursor: pointer;
 }
@@ -1203,7 +1205,10 @@ padding: 5px 10px 0px;
 	float: left;
 	margin-left: 30px;
 }
-
+#profile-attach-wrapper {
+    float: left;
+    margin-left: 30px;
+}
 #profile-rotator {
 	float: left;
 	margin-left: 30px;
@@ -2445,7 +2450,7 @@ a.mail-list-link {
 .attachtype {
 	display: block; width: 20px; height: 23px;
 	float: left;
-	background-image: url('../../../images/content-types.gif');
+	background-image: url('../../../images/content-types.png');
 }
 
 .body-attach {