Merge remote-tracking branch 'friendika-master/master'

README

@@ -40,10 +40,8 @@ interaction you've grown to love, *and* was free to use, *and* was open source,
 *and* where your privacy is always under your control?
  
     And what if this social network could scale to encompass the entire 
-internet, and *not* require a central organisation to provide servers (in 
+internet, and *not* require a central organisation to provide servers? 
-exchange for selling your private information; and everything else they can
+(In exchange for peddling your private information behind your back.)
-find out about you - from logging all of your online activities and
-conversations)?
 
     Look no further. 
 

addon/facebook/facebook.php

@@ -123,15 +123,12 @@ function facebook_content(&$a) {
 function facebook_install() {
 	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('jot_networks',    'addon/facebook/facebook.php', 'facebook_jot_nets');
-	unregister_hook('post_local_start','addon/facebook/facebook.php', 'facebook_post_local');
 }
 
 
@@ -148,16 +145,6 @@ function facebook_jot_nets(&$a,&$b) {
 	}
 }
 
-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');
-}
-
 
 function facebook_post_hook(&$a,&$b) {
 
@@ -175,17 +162,21 @@ function facebook_post_hook(&$a,&$b) {
 
 		if($appid && $secret) {
 
+			logger('facebook: have appid+secret');
+
 			$fb_post   = intval(get_pconfig(local_user(),'facebook','post'));
-			$fb_enable = intval(get_pconfig(local_user(),'facebook','enable'));
+			$fb_enable = (($fb_post && x($_POST,'facebook_enable')) ? intval($_POST['facebook_enable']) : 0);
 			$fb_token  = get_pconfig(local_user(),'facebook','access_token');
 
+			logger('facebook: $fb_post: ' . $fb_post . ' $fb_enable: ' . $fb_enable . ' $fb_token: ' . $fb_token,LOGGER_DEBUG); 
 			if($fb_post && $fb_token && $fb_enable) {
+				logger('facebook: able to post');
 				require_once('library/facebook.php');
 				require_once('include/bbcode.php');	
 
 				$msg = $b['body'];
 
-				logger('Facebook post2: msg=' . $msg, LOGGER_DATA);
+				logger('Facebook post: original msg=' . $msg, LOGGER_DATA);
 
 				// make links readable before we strip the code
 

addon/statusnet/statusnet.php

@@ -133,7 +133,7 @@ function statusnet_settings(&$a,&$s) {
 		$s .= '<input id="statusnet-consumerkey" type="text" name="statusnet-consumerkey" size="35" /><br />';
                 $s .= '<label id="statusnet-consumersecret-label" for="statusnet-consumersecret">'. t('OAuth Consumer Secret') .'</label>';
 		$s .= '<input id="statusnet-consumersecret" type="text" name="statusnet-consumersecret" size="35" /><br />';
-                $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t('Base API Path (remember the trailing /)') .'</label>';
+                $s .= '<label id="statusnet-baseapi-label" for="statusnet-baseapi">'. t('Base API Path (remember the trailing &#47;)') .'</label>';
 		$s .= '<input id="statusnet-baseapi" type="text" name="statusnet-baseapi" size="35" /><br  />';
                 $s .= '</div><div class="clear"></div>';
                 $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="submit" class="settings-submit" value="' . t('Submit') . '" /></div>';

boot.php

@@ -2,8 +2,8 @@
 
 set_time_limit(0);
 
-define ( 'BUILD_ID',               1038   );
+define ( 'BUILD_ID',               1039   );
-define ( 'FRIENDIKA_VERSION',      '2.10.0906' );
+define ( 'FRIENDIKA_VERSION',      '2.10.0907' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.1'  );
 
 define ( 'EOL',                    "<br />\r\n"     );
@@ -1804,7 +1804,7 @@ function like_puller($a,$item,&$arr,$mode) {
 
 	if((activity_match($item['verb'],$verb)) && ($item['id'] != $item['parent'])) {
 		$url = $item['author-link'];
-		if(($item['network'] === 'dfrn') && (! $item['self']) && ($item['author-link'] == $item['url'])) {
+		if((local_user()) && (local_user() == $item['uid']) && ($item['network'] === 'dfrn') && (! $item['self']) && (link_compare($item['author-link'],$item['url']))) {
 			$url = $a->get_baseurl() . '/redir/' . $item['contact-id'];
 			$sparkle = ' class="sparkle" ';
 		}
@@ -1978,8 +1978,11 @@ function smilies($s) {
 	$a = get_app();
 
 	return str_replace(
-	array( ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
+	array( '&lt;3', '&lt;/3', '&lt;\\3', ':-)', ';-)', ':-(', ':(', ':-P', ':-"', ':-x', ':-X', ':-D', '8-|', '8-O'),
 	array(
+		'<img src="' . $a->get_baseurl() . '/images/smiley-heart.gif" alt="<3" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="</3" />',
+		'<img src="' . $a->get_baseurl() . '/images/smiley-brokenheart.gif" alt="<\\3" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-smile.gif" alt=":-)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-wink.gif" alt=";-)" />',
 		'<img src="' . $a->get_baseurl() . '/images/smiley-frown.gif" alt=":-(" />',
@@ -2100,7 +2103,7 @@ function profile_sidebar($profile) {
 
 	$tabs = '';
 
-	$photo = '<div id="profile=photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
+	$photo = '<div id="profile-photo-wrapper"><img class="photo" src="' . $profile['photo'] . '" alt="' . $profile['name'] . '" /></div>';
 
 	$connect = (($profile['uid'] != local_user()) ? '<li><a id="dfrn-request-link" href="dfrn_request/' . $profile['nickname'] . '">' . t('Connect') . '</a></li>' : '');
  

database.sql

@@ -181,6 +181,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `object` text NOT NULL,
   `target-type` char(255) NOT NULL,
   `target` text NOT NULL,
+  `plink` char(255) NOT NULL, 
   `resource-id` char(255) NOT NULL,
   `tag` mediumtext NOT NULL,
   `inform` mediumtext NOT NULL,

include/acl_selectors.php

@@ -44,6 +44,8 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 function contact_select($selname, $selclass, $preselected = false, $size = 4, $privmail = false, $celeb = false, $privatenet = false) {
 
+	$a = get_app();
+
 	$o = '';
 
 	// When used for private messages, we limit correspondence to mutual friends and the selector

include/main.js

@@ -29,6 +29,7 @@
 
 	$(document).ready(function() {
 		$.ajaxSetup({cache: false});
+
 		msie = $.browser.msie ;
  		NavUpdate(); 
 		// Allow folks to stop the ajax page updates with the pause/break key
@@ -210,3 +211,23 @@
 		$('#panel').hide();
 	}
 
+	function post_comment(id) {
+		$.post(  
+             "item",  
+             $("#comment-edit-form-" + id).serialize(),
+			function(data) {
+				if(data.success) {
+					$("#comment-edit-wrapper-" + id).hide();
+					$("#comment-edit-text-" + id).val('');
+    	  			var tarea = document.getElementById("comment-edit-text-" + id);
+					if(tarea)
+						commentClose(tarea,id);
+					if(timer) clearTimeout(timer);
+					timer = setTimeout(NavUpdate,10);
+				}
+			},
+			"json"  
+         );  
+         return false;  
+	}
+

mod/dfrn_notify.php

@@ -2,8 +2,6 @@
 
 require_once('simplepie/simplepie.inc');
 require_once('include/items.php');
-
-
 function dfrn_notify_post(&$a) {
 
 	$dfrn_id      = ((x($_POST,'dfrn_id'))      ? notags(trim($_POST['dfrn_id']))   : '');
@@ -53,7 +51,13 @@ function dfrn_notify_post(&$a) {
 		 
 
 	$r = q("SELECT	`contact`.*, `contact`.`uid` AS `importer_uid`, 
-		`contact`.`pubkey` AS `cpubkey`, `contact`.`prvkey` AS `cprvkey`, `user`.* FROM `contact` 
+					`contact`.`pubkey` AS `cpubkey`, 
+					`contact`.`prvkey` AS `cprvkey`, 
+					`contact`.`thumb` AS `thumb`, 
+					`contact`.`url` as `url`,
+					`contact`.`name` as `senderName`,
+					`user`.* 
+			FROM `contact` 
 			LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` 
 			WHERE `contact`.`blocked` = 0 AND `contact`.`pending` = 0 
 				AND `user`.`nickname` = '%s' $sql_extra LIMIT 1",
@@ -169,29 +173,70 @@ function dfrn_notify_post(&$a) {
 		require_once('bbcode.php');
 		if($importer['notify-flags'] & NOTIFY_MAIL) {
 
-			$body = html_entity_decode(strip_tags(bbcode(stripslashes($msg['body']))),ENT_QUOTES,'UTF-8');
+			// generate a mime boundary
+			$msg['mimeboundary']   =rand(0,9)."-"
+				.rand(10000000000,9999999999)."-"
+				.rand(10000000000,9999999999)."=:"
+				.rand(10000,99999);
 
-			if(function_exists('quoted_printable_encode'))
+			// name of the automated email sender
-				$body = quoted_printable_encode($body);
+			$msg['notificationfromname']	= t('Administrator');
-			else
+			// noreply address to send from
-				$body = qp($body);
+			$msg['notificationfromemail']	= t('noreply') . '@' . $a->get_hostname();				
+			// message headers
+			$msg['headers'] =
+				"From: {$msg['notificationfromname']} <{$msg['notificationfromemail']}>\n" . 
+				"Reply-To: {$msg['notificationfromemail']}\n" .
+				"MIME-Version: 1.0\n" .
+				"Content-Type: multipart/alternative; boundary=\"{$msg['mimeboundary']}\"";
 
+			// text version
+			// process the message body to display properly in text mode
+			// 		1) substitute a \n character for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
+			//		2) remove escape slashes
+			//		3) decode any bbcode from the message editor
+			//		4) decode any encoded html tags
+			//		5) remove html tags
+			$msg['textversion']
+				= strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",$msg['body']))),ENT_QUOTES,'UTF-8'));
+				
+			// html version
+			// process the message body to display properly in text mode
+			// 		1) substitute a <br /> tag for the "\" then "n", so it behaves properly (it doesn't come in as a \n character)
+			//		2) remove escape slashes
+			//		3) decode any bbcode from the message editor
+			//		4) decode any encoded html tags
+			$msg['htmlversion']	
+				= html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "<br />\n",$msg['body']))));
+			
+			// load the template for private message notifications
 			$tpl = load_view_file('view/mail_received_eml.tpl');
+			
+			// import the data into the template			
 			$email_tpl = replace_macros($tpl, array(
-				'$sitename' => $a->config['sitename'],
+				'$siteName'		=> $a->config['sitename'],				// name of this site
-				'$siteurl' =>  $a->get_baseurl(),
+				'$siteurl'		=> $a->get_baseurl(),					// descriptive url of this site
-				'$username' => $importer['username'],
+				'$thumb'		=> $importer['thumb'],					// thumbnail url for sender icon
-				'$email' => $importer['email'],
+				'$email'		=> $importer['email'],					// email address to send to
-				'$from' => $msg['from-name'],
+				'$url'			=> $importer['url'],					// full url for the site
-				'$title' => stripslashes($msg['title']),
+				'$from'			=> $msg['from-name'],					// name of the person sending the message
-				'$body' => $body
+				'$title'		=> stripslashes($msg['title']),			// subject of the message
+				'$textversion'	=> $msg['textversion'],					// text version of the message
+				'$htmlversion'	=> $msg['htmlversion'],					// html version of the message
+				'$mimeboundary'	=> $msg['mimeboundary'],				// mime message divider
+				'$hostname'		=> $a->get_hostname()					// name of this host
 			));
 			
-			$res = mail($importer['email'], t('New mail received at ') . $a->config['sitename'],
+			logger("message headers: " . $msg['headers']);
-				$email_tpl, 'From: ' . t('Administrator') . '@' . $a->get_hostname() . "\r\n"
+			logger("message body: " . $mail_tpl);
-					. 'MIME-Version: 1.0' . "\r\n"
+			
-					. 'Content-type: text/plain; charset=UTF-8' . "\r\n" 
+			
-					. 'Content-transfer-encoding: quoted-printable' . "\r\n"
+			// send the message
+			$res = mail(
+				$importer['email'], 									// send to address
+				t('New mail received at ') . $a->config['sitename'],	// subject
+				$email_tpl, 											// message body
+				$msg['headers']											// message headers
 			);
 		}
 		xml_status(0);
@@ -391,8 +436,9 @@ function dfrn_notify_post(&$a) {
 						intval($importer['importer_uid'])
 					);
 					if(count($myconv)) {
+						$importer_url = $a->get_baseurl() . '/profile/' . $importer['nickname'];
 						foreach($myconv as $conv) {
-							if(! link_compare($conv['author-link'],$importer['url']))
+							if(! link_compare($conv['author-link'],$importer_url))
 								continue;
 							require_once('bbcode.php');
 							$from = stripslashes($datarray['author-name']);

mod/display.php

@@ -153,7 +153,7 @@ function display_content(&$a) {
 				}
 				if($item['last-child']) {
 					$comment = replace_macros($cmnt_tpl,array(
-						'$return_path' => $_SESSION['return_url'],
+						'$return_path' => '', // $_SESSION['return_url'],
 						'$type' => 'wall-comment',
 						'$id' => $item['item_id'],
 						'$parent' => $item['parent'],

mod/item.php

@@ -490,7 +490,12 @@ function item_post(&$a) {
 		}
 	}
 
+	if((x($_POST,'return')) && strlen($_POST['return']))
 		goaway($a->get_baseurl() . "/" . $_POST['return'] );
+
+	$json = array('success' => 1);
+	echo json_encode($json);
+	killme();
 	// NOTREACHED
 }
 

mod/network.php

@@ -340,7 +340,7 @@ function network_content(&$a, $update = 0) {
 
 			if($item['last-child']) {
 				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => $_SESSION['return_url'],
+					'$return_path' => '', // $_SESSION['return_url'],
 					'$type' => 'net-comment',
 					'$id' => $item['item_id'],
 					'$parent' => $item['parent'],

mod/photos.php

@@ -1048,7 +1048,7 @@ function photos_content(&$a) {
 				if($can_post || can_write_wall($a,$owner_uid)) {
 					if($link_item['last-child']) {
 						$o .= replace_macros($cmnt_tpl,array(
-							'$return_path' => $return_url,
+							'$return_path' => '', // $return_url,
 							'$type' => 'wall-comment',
 							'$id' => $link_item['id'],
 							'$parent' => $link_item['id'],

mod/profile.php

@@ -293,7 +293,7 @@ function profile_content(&$a, $update = 0) {
 				}
 				if($item['last-child']) {
 					$comment = replace_macros($cmnt_tpl,array(
-						'$return_path' => $_SESSION['return_url'],
+						'$return_path' => '', // $_SESSION['return_url'],
 						'$type' => 'wall-comment',
 						'$id' => $item['item_id'],
 						'$parent' => $item['parent'],

update.php

@@ -370,3 +370,7 @@ function update_1037() {
 
 }
 
+function update_1038() {
+ q("ALTER TABLE `item` ADD `plink` CHAR( 255 ) NOT NULL AFTER `target` ");
+}
+

view/comment_item.tpl

@@ -1,5 +1,5 @@
 		<div class="comment-$wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" >
+			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
@@ -13,9 +13,10 @@
 
 				<div class="comment-edit-text-end"></div>
 				<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-					<input type="submit" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
+					<input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="Submit" />
 				</div>
 
 				<div class="comment-edit-end"></div>
 			</form>
+
 		</div>

view/de/mail_received_eml.tpl

@@ -1,17 +1,47 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
-Lieber $username,
+Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.
 	
-du hast eine neue private Nachricht von '$from' auf '$sitename' erhhalten.
------
 $title
------
+
-$body
+$textversion
------
+
 Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu
 beantworten.
 
 Viele Grüße,
-    $sitename Administrator
+$siteName Administrator
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Nachricht</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten.</td></tr>
 
 
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu beantworten.</td></tr>
+	<tr><td></td><td>Viele Grüße,</td></tr>
+	<tr><td></td><td>$siteName Administrator</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
 
+--$mimeboundary--

view/de/msg-header.tpl

@@ -6,14 +6,14 @@ tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
+	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
+	theme_advanced_blockformats : "blockquote,code",
-	content_css : "bbcode.css",
+	paste_text_sticky : true,
 	entity_encoding : "raw",
 	add_unload_trigger : false,
 	remove_linebreaks : false,
@@ -45,6 +45,10 @@ tinyMCE.init({
 			}
 			$('#character-counter').text(text);
     	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
 	}
 });
 

view/de/strings.php

@@ -57,6 +57,18 @@ $a->strings['December'] = 'Dezember';
 $a->strings['Birthdays this week:'] = 'Geburtstage diese Woche:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28an die lokale Zeit angepasst\x29";
 $a->strings['[today]'] = '[heute]';
+$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[" commented on your item at "] = " commented on your item at ";
+$a->strings[" posted on your profile wall at "] = " posted on your profile wall at ";
+$a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
+$a->strings['This message was sent to you by '] = 'This message was sent to you by ';
+$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
+$a->strings['You may visit them online at'] = 'You may visit them online at';
+$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
+$a->strings['posted an update.'] = 'posted an update.';
+$a->strings['Item not found.'] = 'Item not found.';
 $a->strings["Invite Friends"] = "Freunde einladen";
 $a->strings['Connect/Follow [profile address]'] = 'Kontaktiere/Folge [Profil Adresse]';
 $a->strings['Example: bob@example.com, http://example.com/barbara'] = 'Beispiel: bob@example.com, http://example.com/barbara';
@@ -76,6 +88,9 @@ $a->strings['Contact not found.'] = 'Kontakt nicht gefunden.';
 $a->strings['Mutual Friendship'] = 'Beidseitige Freundschaft';
 $a->strings['is a fan of yours'] = 'ist ein Fan von dir';
 $a->strings['you are a fan of'] = 'du bist Fan von';
+$a->strings['Never'] = 'Niemals';
+$a->strings["\x28Update was successful\x29"] = "\x28Aktualisierung war erfolgreich\x29";
+$a->strings["\x28Update was not successful\x29"] = "\x28Aktualisierung war nicht erfolgreich\x29";
 $a->strings['Contact Editor'] = 'Kontakt Editor';
 $a->strings['Visit $name\'s profile'] = 'Besuche das Profil von $name';
 $a->strings['Block/Unblock contact'] = 'Kontakt blockieren/freischalten';
@@ -83,7 +98,6 @@ $a->strings['Ignore contact'] = 'Ignoriere den Kontakt';
 $a->strings['Delete contact'] = 'Lösche den Kontakt';
 $a->strings['Last updated: '] = 'Letzte Aktualisierung: ';
 $a->strings['Update public posts: '] = 'Aktualisierung öffentlicher Nachrichten: ';
-$a->strings['Never'] = 'Niemals';
 $a->strings['Update now'] = 'Jetzt aktualisieren';
 $a->strings['Unblock this contact'] = 'Blockade dieses Kontakts aufheben';
 $a->strings['Block this contact'] = 'Diesen Kontakt blockieren';
@@ -159,7 +173,6 @@ $a->strings['Your profile address:'] = 'Deine Profiladresse:';
 $a->strings['Submit Request'] = 'Anfrage abschicken';
 $a->strings['Cancel'] = 'Abbrechen';
 $a->strings['Global Directory'] = 'Weltweites Verzeichnis';
-$a->strings['Item not found.'] = 'Eintrag nicht gefunden.';
 $a->strings['Private Message'] = 'Private Nachricht';
 $a->strings['This is you'] = 'Das bist du';
 $a->strings['View $name\'s profile'] = 'Profile von $name';
@@ -215,16 +228,6 @@ $a->strings['Your message:'] = 'Deine Nachricht:';
 $a->strings['Please join my social network on '] = 'Bitte trete meinem sozialen Netzwerk bei ';
 $a->strings['To accept this invitation, please visit:'] = 'Um diese Einladung anzunehmen beuche bitte:';
 $a->strings['Once you have registered, please connect with me via my profile page at:'] = 'Sobald du registriert bist kontaktiere mich bitte auf meiner Profilseite:';
-$a->strings['Unable to locate original post.'] = 'Konnte das original Posting nicht finden.';
-$a->strings['Empty post discarded.'] = 'Leere Nachricht verworfen.';
-$a->strings['Wall Photos'] = 'Pinnwand Fotos';
-$a->strings[" commented on your item at "] = " kommentierte eines deiner Postings auf ";
-$a->strings[" posted on your profile wall at "] = " schrieb an deine Profilwand auf ";
-$a->strings['This message was sent to you by '] = 'This message was sent to you by ';
-$a->strings[', a member of the Friendika social network.'] = ', a member of the Friendika social network.';
-$a->strings['You may visit them online at'] = 'You may visit them online at';
-$a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
-$a->strings['posted an update.'] = 'posted an update.';
 $a->strings['photo'] = 'Foto';
 $a->strings['status'] = 'Status';
 $a->strings['likes'] = 'mag das';
@@ -356,7 +359,9 @@ $a->strings['Register'] = 'Registrieren';
 $a->strings['Please login.'] = 'Bitte melde dich an.';
 $a->strings['Registration revoked for '] = 'Registration zurückgezogen ';
 $a->strings['Account approved.'] = 'Account freigegeben.';
-$a->strings['View in context'] = 'Im Kontext betrachten';
+$a->strings['Remove My Account'] = 'Remove My Account';
+$a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.';
+$a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:';
 $a->strings['Passwords do not match. Password unchanged.'] = 'Die Passwörter stimmen nicht überein. Das Passwort bleibt unverändert.';
 $a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Leere Passwörter sind nicht erlaubt. Passwort bleibt unverändert.';
 $a->strings['Password changed.'] = 'Passwort ändern.';
@@ -364,6 +369,7 @@ $a->strings['Password update failed. Please try again.'] = 'Aktualisierung des P
 $a->strings[' Please use a shorter name.'] = ' Bitte verwende einen kürzeren Namen.';
 $a->strings[' Name too short.'] = ' Name ist zu kurz.';
 $a->strings[' Not valid email.'] = ' Keine gültige EMail.';
+$a->strings[' Cannot change to that email.'] = ' Cannot change to that email.';
 $a->strings['Settings updated.'] = 'Einstellungen aktualisiert.';
 $a->strings['Plugin Settings'] = 'Plugin Einstellungen';
 $a->strings['Account Settings'] = 'Account Einstellungen';
@@ -487,6 +493,23 @@ $a->strings['File has an invalid extension, it should be one of '] = 'Die Dateie
 $a->strings['Upload was cancelled, or server error encountered'] = 'Upload abgebrochen oder Serverfehler aufgetreten';
 $a->strings['Randplace Settings'] = 'Randplace Settings';
 $a->strings['Enable Randplace Plugin'] = 'Randplace Erweiterung aktivieren';
+$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';
+$a->strings['Base API Path (remember the trailing /] = 'Base API Path (remember the trailing /;
+$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['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['Send public postings to StatusNet'] = 'Send public postings to StatusNet';
+$a->strings['Clear OAuth configuration'] = 'Clear OAuth configuration';
+$a->strings['Twitter Posting Settings'] = 'Twitter Posting Settings';
+$a->strings['No consumer key pair for Twitter found. Please contact your site administrator.'] = 'No consumer key pair for Twitter found. Please contact your site administrator.';
+$a->strings['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.'] = '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.';
+$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['Africa/Abidjan'] = 'Africa/Abidjan';
 $a->strings['Africa/Accra'] = 'Africa/Accra';
 $a->strings['Africa/Addis_Ababa'] = 'Africa/Addis_Ababa';

view/en/mail_received_eml.tpl

@@ -1,16 +1,47 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
-Dear $username,
+$from sent you a new private message at $siteName.
 	
-	You've received a new private message at $sitename from '$from'.
------
 $title
------
+
-$body
+$textversion
------
+				
 Please login at $siteurl to read and reply to your private messages.
 
 Thank you,
-	$sitename administrator
+$siteName administrator
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Message</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">$from sent you a new private message at $siteName.</td></tr>
 
 
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Please login at $siteurl to read and reply to your private messages.</td></tr>
+	<tr><td></td><td>Thank You,</td></tr>
+	<tr><td></td><td>$siteName Administrator</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
+
+--$mimeboundary--
 

view/en/msg-header.tpl

@@ -6,14 +6,14 @@ tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
+	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
+	theme_advanced_blockformats : "blockquote,code",
-	content_css : "bbcode.css",
+	paste_text_sticky : true,
 	entity_encoding : "raw",
 	add_unload_trigger : false,
 	remove_linebreaks : false,
@@ -45,6 +45,10 @@ tinyMCE.init({
 			}
 			$('#character-counter').text(text);
     	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
 	}
 });
 

view/fr/mail_received_eml.tpl

@@ -1,16 +1,46 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
-Dear $username,
+$from t'a envoyŽ un message ˆ $siteName.
 	
-	You've received a new private message at $sitename from '$from'.
------
 $title
------
-$body
------
-Please login at $siteurl to read and reply to your private messages.
 
-Thank you,
+$textversion
-	$sitename administrator
+
+Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.
+
+Merci,
+$siteName Administrateur
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Message</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">$from t'a envoyŽ un message ˆ $siteName.</td></tr>
 
 
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Ouvrez une session svp ˆ $siteurl pour lire et rŽpondre ˆ vos messages privŽs.</td></tr>
+	<tr><td></td><td>Merci,</td></tr>
+	<tr><td></td><td>$siteName Administrateur</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
 
+--$mimeboundary--

view/fr/msg-header.tpl

@@ -6,14 +6,14 @@ tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
+	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
+	theme_advanced_blockformats : "blockquote,code",
-	content_css : "bbcode.css",
+	paste_text_sticky : true,
 	entity_encoding : "raw",
 	add_unload_trigger : false,
 	remove_linebreaks : false,
@@ -45,6 +45,10 @@ tinyMCE.init({
 			}
 			$('#character-counter').text(text);
     	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
 	}
 });
 

view/it/mail_received_eml.tpl

@@ -1,16 +1,46 @@
+--$mimeboundary
+Content-Type: text/plain; charset=utf-8
+Content-Transfer-Encoding: 8bit
 
-Caro/a $username,
+Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.
 	
-    Hai ricevuto un nuovo messsaggio privato su $sitename da '$from'.
------
 $title
------
+
-$body
+$textversion
------
+				
 Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.
 
 Grazie,
-	L'amministratore di $sitename
+L'amministratore di $siteName
+
+--$mimeboundary
+Content-Type: text/html; charset=utf-8
+Content-Transfer-Encoding: 8bit
+				
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional //EN">
+<html>
+<head>
+	<title>Friendika Messsaggio</title>
+	<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+</head>
+<body>
+<table style="border:1px solid #ccc">
+	<tbody>
+	<tr><td colspan="2" style="background:#3b5998; color:#FFFFFF; font-weight:bold; font-family:'lucida grande', tahoma, verdana,arial, sans-serif; padding: 4px 8px; vertical-align: middle; font-size:16px; letter-spacing: -0.03em; text-align: left;"><img style="width:32px;height:32px;" src='$hostname/images/ff-32.jpg'><span style="padding:7px;">Friendika</span></td></tr>
+
+	<tr><td style="padding-top:22px;" colspan="2">Hai ricevuto un nuovo messsaggio privato su $siteName da '$from'.</td></tr>
 
 
+	<tr><td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="$url"><img style="border:0px;width:48px;height:48px;" src="$thumb"></a></td>
+		<td style="padding-top:22px;"><a href="$url">$from</a></td></tr>
+	<tr><td style="font-weight:bold;padding-bottom:5px;">$title</td></tr>
+	<tr><td style="padding-right:22px;">$htmlversion</td></tr>
+	<tr><td style="padding-top:11px;padding-bottom:11px;" colspan="2">Accedi a $siteurl per leggere e rispondere ai tuoi messaggi privati.</td></tr>
+	<tr><td></td><td>Grazie,</td></tr>
+	<tr><td></td><td>L'amministratore di $siteName</td></tr>
+	</tbody>
+</table>
+</body>
+</html>
 
+--$mimeboundary--

view/it/msg-header.tpl

@@ -6,14 +6,14 @@ tinyMCE.init({
 	theme : "advanced",
 	mode : "specific_textareas",
 	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
+	plugins : "bbcode,paste",
 	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
 	theme_advanced_buttons2 : "",
 	theme_advanced_buttons3 : "",
 	theme_advanced_toolbar_location : "top",
 	theme_advanced_toolbar_align : "center",
-	theme_advanced_styles : "Code=codeStyle;Quote=quoteStyle",
+	theme_advanced_blockformats : "blockquote,code",
-	content_css : "bbcode.css",
+	paste_text_sticky : true,
 	entity_encoding : "raw",
 	add_unload_trigger : false,
 	remove_linebreaks : false,
@@ -45,6 +45,10 @@ tinyMCE.init({
 			}
 			$('#character-counter').text(text);
     	});
+
+		ed.onInit.add(function(ed) {
+			ed.pasteAsPlainText = true;
+		});
 	}
 });
 

view/theme/duepuntozero/style.css

@@ -605,6 +605,10 @@ input#dfrn-url {
 #profile-photo-link-select-wrapper {
 	margin-top: 2em;
 }
+#profile-photo-wrapper img {
+	width:175px;
+	height:175px;
+}
 
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
@@ -814,7 +818,7 @@ input#dfrn-url {
 .wall-item-wrapper {
 	float: left;
     margin-right: 5px;
-    width: 150px;
+    width: 250px;
 }
 .wall-item-lock {
 	height: 20px;
@@ -859,7 +863,7 @@ input#dfrn-url {
 	float: left;
 	/*width: 450px;*/
 	margin-left: 10px;
-	margin-bottom: 20px;
+/*	margin-bottom: 20px;*/
 	padding: 20px;
 	max-height: 400px;
 	overflow: auto;
@@ -874,7 +878,7 @@ input#dfrn-url {
 .wall-item-body {
 	float: left;
 	width: 450px;
-	margin-top: 30px;
+	margin-top: 10px;
 }
 
 .comment-edit-wrapper {
@@ -885,8 +889,8 @@ input#dfrn-url {
 
 .comment-wwedit-wrapper {
 	margin-top: 15px;
-	background: #CCCCCC;
+	background: #f3f3f3;
-	margin-left: 250px;
+	margin-left: 50px;
 }
 
 .comment-edit-photo {
@@ -1807,6 +1811,10 @@ a.mail-list-link {
 .contact-block-link {
 	float: left;
 }
+.contact-block-img {
+	width:48px;
+	height:48px;
+}
 
 #tag-remove {
 	margin-bottom: 15px;

view/theme/loozah/style.css

@@ -737,6 +737,10 @@ input#dfrn-url {
 #profile-photo-link-select-wrapper {
 	margin-top: 2em;
 }
+#profile-photo-wrapper img {
+	width:175px;
+	height:175px;
+}
 
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
@@ -1933,6 +1937,10 @@ a.mail-list-link {
 .contact-block-link {
 	float: left;
 }
+.contact-block-img {
+	width:48px;
+	height:48px;
+}
 
 #tag-remove {
 	margin-bottom: 15px;