Merge remote branch 'upstream/master'

2012-04-20 13:42:33 +02:00 · 2012-04-20 13:42:33 +02:00 · 9663299da1
parent 041f74dc77 0e25376e4a
commit 9663299da1
636 changed files with 115575 additions and 4050 deletions
--- a/boot.php
+++ b/boot.php
@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');

 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1313' );
+define ( 'FRIENDICA_VERSION',      '2.3.1314' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1138      );

--- a/include/Scrape.php
+++ b/include/Scrape.php
@ -593,7 +593,7 @@ function probe_url($url, $mode = PROBE_NORMAL) {
 			logger('probe_url: fetch feed: ' . $poll . ' returns: ' . $xml, LOGGER_DATA);
 			$a = get_app();

-			logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), $LOGGER_DATA);
+			logger('probe_url: scrape_feed: headers: ' . $a->get_curl_headers(), LOGGER_DATA);

   			$feed->set_raw_data($xml);

--- a/include/conversation.php
+++ b/include/conversation.php
@ -342,7 +342,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'body' => template_escape($body),
 					'text' => strip_tags(template_escape($body)),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'lock' => $lock,
 					'location' => template_escape($location),
 					'indent' => '',
 					'owner_name' => template_escape($owner_name),
@ -400,6 +399,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 			}

 			$comments_collapsed = false;
+			$comments_seen = 0;
 			$comment_lastcollapsed = false;
 			$comment_firstcollapsed = false;
 			$blowhard = 0;
@ -709,7 +709,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	}

 	$page_template = get_markup_template("conversation.tpl");
-	$o .= replace_macros($page_template, array(
+	$o = replace_macros($page_template, array(
 		'$baseurl' => $a->get_baseurl($ssl_state),
 		'$mode' => $mode,
 		'$user' => $a->user,
@ -1074,7 +1074,6 @@ function find_thread_parent_index($arr,$x) {
 }

 function render_location_google($item) {
-	$location = '';
 	$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
 	$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
 	if($coord) {
--- a/include/items.php
+++ b/include/items.php
@ -107,7 +107,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
 	if(! strlen($last_update))
 		$last_update = 'now -30 days';

-	if(x($category)) {
+	if(isset($category)) {
 		$sql_extra .= file_tag_file_query('item',$category,'category');
 	}

@ -588,20 +588,21 @@ function get_atom_elements($feed,$item) {

 	if($rawobj) {
 		$res['object'] = '<object>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['object-type'] = $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'];
-			$res['object'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['object-type'] = $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'];
+			$res['object'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
 		}	
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['object'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['object'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['object'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$res['object'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$res['object'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'title') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$res['object'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'content') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
 			if(! $body)
-				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
 			$res['object'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@ -626,20 +627,20 @@ function get_atom_elements($feed,$item) {

 	if($rawobj) {
 		$res['target'] = '<target>' . "\n";
-		if($rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
-			$res['target'] .= '<type>' . $rawobj[0]['child'][NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
+		$child = $rawobj[0]['child'];
+		if($child[NAMESPACE_ACTIVITY]['object-type'][0]['data']) {
+			$res['target'] .= '<type>' . $child[NAMESPACE_ACTIVITY]['object-type'][0]['data'] . '</type>' . "\n";
 		}	
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
-			$res['target'] .= '<id>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
-
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
-			$res['target'] .= '<link>' . encode_rel_links($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
-			$res['target'] .= '<title>' . $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
-		if($rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
-			$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'id') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'])
+			$res['target'] .= '<id>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['id'][0]['data'] . '</id>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'link') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['link'])
+			$res['target'] .= '<link>' . encode_rel_links($child[SIMPLEPIE_NAMESPACE_ATOM_10]['link']) . '</link>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'])
+			$res['target'] .= '<title>' . $child[SIMPLEPIE_NAMESPACE_ATOM_10]['title'][0]['data'] . '</title>' . "\n";
+		if(x($child[SIMPLEPIE_NAMESPACE_ATOM_10], 'data') && $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data']) {
+			$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['content'][0]['data'];
 			if(! $body)
-				$body = $rawobj[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
+				$body = $child[SIMPLEPIE_NAMESPACE_ATOM_10]['summary'][0]['data'];
 			// preserve a copy of the original body content in case we later need to parse out any microformat information, e.g. events
 			$res['target'] .= '<orig>' . xmlify($body) . '</orig>' . "\n";
 			if((strpos($body,'<') !== false) || (strpos($body,'>') !== false)) {
@ -1475,7 +1476,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 					if(! $item['deleted'])
 						logger('consume_feed: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);

-					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);
 						if($xt->type === ACTIVITY_OBJ_NOTE) {
@ -2091,7 +2092,7 @@ function local_delivery($importer,$data) {

 					logger('local_delivery: deleting item ' . $item['id'] . ' uri=' . $item['uri'], LOGGER_DEBUG);

-					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTVITY_OBJ_TAGTERM)) {
+					if(($item['verb'] === ACTIVITY_TAG) && ($item['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
 						$xo = parse_xml_string($item['object'],false);
 						$xt = parse_xml_string($item['target'],false);

@ -2476,7 +2477,7 @@ function local_delivery($importer,$data) {

 				// find out if our user is involved in this conversation and wants to be notified.
 			
-				if($datarray['type'] != 'activity') {
+				if(!x($datarray['type']) || $datarray['type'] != 'activity') {

 					$myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
 						dbesc($parent_uri),
@ -3048,7 +3049,7 @@ function item_expire($uid,$days) {
 function drop_items($items) {
 	$uid = 0;

-	if((! local_user()) && (! $remote_user()))
+	if(! local_user() && ! remote_user())
 		return;

 	if(count($items)) {
--- a/include/network.php
+++ b/include/network.php
@ -172,7 +172,7 @@ function post_url($url,$params, $headers = null, &$redirects = 0, $timeout = 0)
        $url_parsed = @parse_url($newurl);
        if (isset($url_parsed)) {
            $redirects++;
-            return fetch_url($newurl,$binary,$redirects,$timeout);
+            return fetch_url($newurl,false,$redirects,$timeout);
        }
    }
 	$a->set_curl_code($http_code);
@ -206,6 +206,7 @@ function xml_status($st, $message = '') {
 if(! function_exists('http_status_exit')) {
 function http_status_exit($val) {

+    $err = '';
 	if($val >= 400)
 		$err = 'Error';
 	if($val >= 200 && $val < 300)
@ -452,7 +453,7 @@ function lrdd($uri, $debug = false) {
 			logger('lrdd: parse error: ' . $e);
 		}

-		if($dom) {
+		if(isset($dom) && $dom) {
 			$items = $dom->getElementsByTagName('link');
 			foreach($items as $item) {
 				$x = $item->getAttribute('rel');
--- a/include/pgettext.php
+++ b/include/pgettext.php
@ -49,6 +49,7 @@ function get_language() {
 	if(isset($preferred))
 		return $preferred;

+    $a = get_app();
 	return ((isset($a->config['system']['language'])) ? $a->config['system']['language'] : 'en');
 }}

--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@ -2,7 +2,7 @@

 function advanced_profile(&$a) {

-	$o .= '';
+	$o = '';

 	$o .= '<h2>' . t('Profile') . '</h2>';

@ -69,13 +69,12 @@ function advanced_profile(&$a) {
 		if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);

 		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-	}
-

        return replace_macros($tpl, array(
            '$title' => t('Profile'),
            '$profile' => $profile,
        ));
+    }

-
+	return '';
 }
--- a/include/security.php
+++ b/include/security.php
@ -339,6 +339,7 @@ function check_form_security_token_redirectOnErr($err_redirect, $typename = '',
 }
 function check_form_security_token_ForbiddenOnErr($typename = '', $formname = 'form_security_token') {
 	if (!check_form_security_token($typename, $formname)) {
+	    $a = get_app();
 		logger('check_form_security_token failed: user ' . $a->user['guid'] . ' - form element ' . $typename);
 		logger('check_form_security_token failed: _REQUEST data: ' . print_r($_REQUEST, true), LOGGER_DATA);
 		header('HTTP/1.1 403 Forbidden');
--- a/js/main.js
+++ b/js/main.js
@ -17,6 +17,7 @@
  }


+
 	var src = null;
 	var prev = null;
 	var livetime = null;
@ -558,12 +559,36 @@ function notifyMarkAll() {
 }


+// code from http://www.tinymce.com/wiki.php/How-to_implement_a_custom_file_browser
+function fcFileBrowser (field_name, url, type, win) {
+    /* TODO: If you work with sessions in PHP and your client doesn't accept cookies you might need to carry
+       the session name and session ID in the request string (can look like this: "?PHPSESSID=88p0n70s9dsknra96qhuk6etm5").
+       These lines of code extract the necessary parameters and add them back to the filebrowser URL again. */
+
+
+    var cmsURL = baseurl+"/fbrowser/"+type+"/";
+
+    tinyMCE.activeEditor.windowManager.open({
+        file : cmsURL,
+        title : 'File Browser',
+        width : 420,  // Your dimensions may differ - toy around with them!
+        height : 400,
+        resizable : "yes",
+        inline : "yes",  // This parameter only has an effect if you use the inlinepopups plugin!
+        close_previous : "no"
+    }, {
+        window : win,
+        input : field_name
+    });
+    return false;
+  }
+
 function setupFieldRichtext(){
 	tinyMCE.init({
 		theme : "advanced",
 		mode : "specific_textareas",
 		editor_selector: "fieldRichtext",
-		plugins : "bbcode,paste",
+		plugins : "bbcode,paste, inlinepopups",
 		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 		theme_advanced_buttons2 : "",
 		theme_advanced_buttons3 : "",
@ -580,6 +605,7 @@ function setupFieldRichtext(){
 		convert_urls: false,
 		content_css: baseurl+"/view/custom_tinymce.css",
 		theme_advanced_path : false,
+		file_browser_callback : "fcFileBrowser",
 	});
 }

--- a/mod/admin.php
+++ b/mod/admin.php
@ -5,6 +5,10 @@
  */
 require_once("include/remoteupdate.php");

+
+/**
+ * @param App $a
+ */
 function admin_post(&$a){


@ -67,6 +71,10 @@ function admin_post(&$a){
 	return; // NOTREACHED	
 }

+/**
+ * @param App $a
+ * @return string
+ */
 function admin_content(&$a) {

 	if(!is_site_admin()) {
@ -74,7 +82,7 @@ function admin_content(&$a) {
 	}

 	if(x($_SESSION,'submanage') && intval($_SESSION['submanage']))
-		return;
+		return "";

 	/**
 	 * Side bar links
@ -147,6 +155,7 @@ function admin_content(&$a) {
 	if(is_ajax()) {
 		echo $o; 
 		killme();
+		return '';
 	} else {
 		return $o;
 	}
@ -155,6 +164,8 @@ function admin_content(&$a) {

 /**
 * Admin Summary Page
+ * @param App $a
+ * @return string
 */
 function admin_page_summary(&$a) {
 	$r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
@ -188,12 +199,15 @@ function admin_page_summary(&$a) {

 /**
 * Admin Site Page
+ *  @param App $a
 */
 function admin_page_site_post(&$a){
 	if (!x($_POST,"page_site")){
 		return;
 	}

+    check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
+
 	$sitename 			=	((x($_POST,'sitename'))			? notags(trim($_POST['sitename']))			: '');
 	$banner				=	((x($_POST,'banner'))      		? trim($_POST['banner'])					: false);
 	$language			=	((x($_POST,'language'))			? notags(trim($_POST['language']))			: '');
@ -298,7 +312,7 @@ function admin_page_site_post(&$a){
 	} else {
 		set_config('system','directory_submit_url', $global_directory);
 	}
-	set_config('system','directory_search_url', $global_search_url);
+
 	set_config('system','block_extended_register', $no_multi_reg);
 	set_config('system','no_openid', $no_openid);
 	set_config('system','no_regfullname', $no_regfullname);
@ -318,6 +332,10 @@ function admin_page_site_post(&$a){
 	
 }

+/**
+ * @param  App $a
+ * @return string
+ */
 function admin_page_site(&$a) {
 	
 	/* Installed langs */
@ -408,6 +426,7 @@ function admin_page_site(&$a) {
 		'$proxy'			=> array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
 		'$timeout'			=> array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),

+        '$form_security_token' => get_form_security_token("admin_site"),
 			
 	));

@ -416,11 +435,15 @@ function admin_page_site(&$a) {

 /**
 * Users admin page
+ *
+ * @param App $a
 */
 function admin_page_users_post(&$a){
 	$pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() );
 	$users = ( x($_POST, 'user') ? $_POST['user'] : Array() );

+    check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
+
 	if (x($_POST,'page_users_block')){
 		foreach($users as $uid){
 			q("UPDATE `user` SET `blocked`=1-`blocked` WHERE `uid`=%s",
@ -453,6 +476,10 @@ function admin_page_users_post(&$a){
 	return; // NOTREACHED	
 }

+/**
+ * @param App $a
+ * @return string
+ */
 function admin_page_users(&$a){
 	if ($a->argc>2) {
 		$uid = $a->argv[3];
@ -460,10 +487,11 @@ function admin_page_users(&$a){
 		if (count($user)==0){
 			notice( 'User not found' . EOL);
 			goaway($a->get_baseurl(true) . '/admin/users' );
-			return; // NOTREACHED						
+			return ''; // NOTREACHED
 		}		
 		switch($a->argv[2]){
 			case "delete":{
+                check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
 				// delete user
 				require_once("include/Contact.php");
 				user_remove($uid);
@ -471,6 +499,7 @@ function admin_page_users(&$a){
 				notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL);
 			}; break;
 			case "block":{
+                check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
 				q("UPDATE `user` SET `blocked`=%d WHERE `uid`=%s",
 					intval( 1-$user[0]['blocked'] ),
 					intval( $uid )
@ -479,7 +508,7 @@ function admin_page_users(&$a){
 			}; break;
 		}
 		goaway($a->get_baseurl(true) . '/admin/users' );
-		return; // NOTREACHED	
+		return ''; // NOTREACHED
 		
 	}
 	
@ -555,6 +584,7 @@ function admin_page_users(&$a){
 		'$confirm_delete_multi' => t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'),
 		'$confirm_delete' => t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'),

+        '$form_security_token' => get_form_security_token("admin_users"),

 		// values //
 		'$baseurl' => $a->get_baseurl(true),
@ -567,10 +597,12 @@ function admin_page_users(&$a){
 }


-/*
+/**
 * Plugins admin page
+ *
+ * @param App $a
+ * @return string
 */
-
 function admin_page_plugins(&$a){
 	
 	/**
@ -580,10 +612,12 @@ function admin_page_plugins(&$a){
 		$plugin = $a->argv[2];
 		if (!is_file("addon/$plugin/$plugin.php")){
 			notice( t("Item not found.") );
-			return;
+			return '';
 		}
 		
 		if (x($_GET,"a") && $_GET['a']=="t"){
+            check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
+
 			// Toggle plugin status
 			$idx = array_search($plugin, $a->plugins);
 			if ($idx !== false){
@ -597,7 +631,7 @@ function admin_page_plugins(&$a){
 			}
 			set_config("system","addon", implode(", ",$a->plugins));
 			goaway($a->get_baseurl(true) . '/admin/plugins' );
-			return; // NOTREACHED	
+			return ''; // NOTREACHED
 		}
 		// display plugin details
 		require_once('library/markdown.php');
@ -641,7 +675,9 @@ function admin_page_plugins(&$a){
 			'$admin_form' => $admin_form,
 			'$function' => 'plugins',
 			'$screenshot' => '',
-			'$readme' => $readme
+			'$readme' => $readme,
+
+            '$form_security_token' => get_form_security_token("admin_themes"),
 		));
 	} 
 	 
@ -670,10 +706,16 @@ function admin_page_plugins(&$a){
 		'$submit' => t('Submit'),
 		'$baseurl' => $a->get_baseurl(true),
 		'$function' => 'plugins',	
-		'$plugins' => $plugins
+		'$plugins' => $plugins,
+        '$form_security_token' => get_form_security_token("admin_themes"),
 	));
 }

+/**
+ * @param array $themes
+ * @param string $th
+ * @param int $result
+ */
 function toggle_theme(&$themes,$th,&$result) {
 	for($x = 0; $x < count($themes); $x ++) {
 		if($themes[$x]['name'] === $th) {
@ -689,6 +731,11 @@ function toggle_theme(&$themes,$th,&$result) {
 	}
 }

+/**
+ * @param array $themes
+ * @param string $th
+ * @return int
+ */
 function theme_status($themes,$th) {
 	for($x = 0; $x < count($themes); $x ++) {
 		if($themes[$x]['name'] === $th) {
@ -704,7 +751,10 @@ function theme_status($themes,$th) {
 }


-
+/**
+ * @param array $themes
+ * @return string
+ */
 function rebuild_theme_table($themes) {
 	$o = '';
 	if(count($themes)) {
@ -720,10 +770,12 @@ function rebuild_theme_table($themes) {
 }

 	
-/*
+/**
 * Themes admin page
+ *
+ * @param App $a
+ * @return string
 */
-
 function admin_page_themes(&$a){
 	
 	$allowed_themes_str = get_config('system','allowed_themes');
@ -740,7 +792,7 @@ function admin_page_themes(&$a){
        foreach($files as $file) {
            $f = basename($file);
            $is_experimental = intval(file_exists($file . '/experimental'));
-			$is_unsupported = 1-(intval(file_exists($file . '/unsupported')));
+			$is_supported = 1-(intval(file_exists($file . '/unsupported'))); // Is not used yet
 			$is_allowed = intval(in_array($f,$allowed_themes));
 			$themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
        }
@ -748,7 +800,7 @@ function admin_page_themes(&$a){

 	if(! count($themes)) {
 		notice( t('No themes found.'));
-		return;
+		return '';
 	}

 	/**
@ -759,10 +811,11 @@ function admin_page_themes(&$a){
 		$theme = $a->argv[2];
 		if(! is_dir("view/theme/$theme")){
 			notice( t("Item not found.") );
-			return;
+			return '';
 		}
 		
 		if (x($_GET,"a") && $_GET['a']=="t"){
+            check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');

 			// Toggle theme status

@ -775,7 +828,7 @@ function admin_page_themes(&$a){

 			set_config('system','allowed_themes',$s);
 			goaway($a->get_baseurl(true) . '/admin/themes' );
-			return; // NOTREACHED	
+			return ''; // NOTREACHED
 		}

 		// display theme details
@ -826,7 +879,9 @@ function admin_page_themes(&$a){
 			'$str_author' => t('Author: '),
 			'$str_maintainer' => t('Maintainer: '),
 			'$screenshot' => $screenshot,
-			'$readme' => $readme
+			'$readme' => $readme,
+
+			'$form_security_token' => get_form_security_token("admin_themes"),
 		));
 	} 
 	 
@ -852,17 +907,21 @@ function admin_page_themes(&$a){
 		'$function' => 'themes',
 		'$plugins' => $xthemes,
 		'$experimental' => t('[Experimental]'),
-		'$unsupported' => t('[Unsupported]')
+		'$unsupported' => t('[Unsupported]'),
+        '$form_security_token' => get_form_security_token("admin_themes"),
 	));
 }


 /**
 * Logs admin page
+ *
+ * @param App $a
 */
 
 function admin_page_logs_post(&$a) {
 	if (x($_POST,"page_logs")) {
+        check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');

 		$logfile 		=	((x($_POST,'logfile'))		? notags(trim($_POST['logfile']))	: '');
 		$debugging		=	((x($_POST,'debugging'))	? true								: false);
@ -880,6 +939,10 @@ function admin_page_logs_post(&$a) {
 	return; // NOTREACHED	
 }

+/**
+ * @param App $a
+ * @return string
+ */
 function admin_page_logs(&$a){
 	
 	$log_choices = Array(
@ -937,9 +1000,14 @@ readable.");
 		'$debugging' 		=> array('debugging', t("Debugging"),get_config('system','debugging'), ""),
 		'$logfile'			=> array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
 		'$loglevel' 		=> array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices),
+
+        '$form_security_token' => get_form_security_token("admin_logs"),
 	));
 }

+/**
+ * @param App $a
+ */
 function admin_page_remoteupdate_post(&$a) {
 	// this function should be called via ajax post
 	if(!is_site_admin()) {
@ -958,6 +1026,10 @@ function admin_page_remoteupdate_post(&$a) {
 	killme();
 }

+/**
+ * @param App $a
+ * @return string
+ */
 function admin_page_remoteupdate(&$a) {
 	if(!is_site_admin()) {
 		return login(false);
--- a/mod/fbrowser.php
+++ b/mod/fbrowser.php
@ -0,0 +1,99 @@
+<?php
+/**
+ * @package		Friendica\modules
+ * @subpackage	FileBrowser
+ * @author		Fabio Comuni <fabrixxm@kirgroup.com>
+ */
+ 
+/**
+ * @param App $a
+ */
+function fbrowser_content($a){
+	
+	if (!local_user())
+		killme();
+
+	if ($a->argc==1)
+		killme();
+	
+	//echo "<pre>"; var_dump($a->argv); killme();	
+	
+	switch($a->argv[1]){
+		case "image":
+			$path = array( array($a->get_baseurl()."/fbrowser/image/", t("Photos")));
+			$albums = false;
+			$sql_extra = "";
+			$sql_extra2 = " ORDER BY created DESC LIMIT 0, 10";
+			
+			if ($a->argc==2){
+				$albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d ",
+					intval(local_user())
+				);
+				// anon functions only from 5.3.0... meglio tardi che mai..
+				function folder1($el){return array(bin2hex($el['album']),$el['album']);}	
+				$albums = array_map( "folder1" , $albums);
+				
+			}
+			
+			$album = "";
+			if ($a->argc==3){
+				$album = hex2bin($a->argv[2]);
+				$sql_extra = sprintf("AND `album` = '%s' ",dbesc($album));
+				$sql_extra2 = "";
+				$path[]=array($a->get_baseurl()."/fbrowser/image/".$a->argv[2]."/", $album);
+			}
+				
+			$r = q("SELECT `resource-id`, `id`, `filename`, min(`scale`) AS `hiq`,max(`scale`) AS `loq`, `desc`  
+					FROM `photo` WHERE `uid` = %d $sql_extra
+					GROUP BY `resource-id` $sql_extra2",
+				intval(local_user())					
+			);
+			
+			
+			function files1($rr){ global $a; return array( $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.jpg', template_escape($rr['filename']), $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.jpg');  }
+			$files = array_map("files1", $r);
+			
+			$tpl = get_markup_template("filebrowser.tpl");
+			echo replace_macros($tpl, array(
+				'$type' => 'image',
+				'$baseurl' => $a->get_baseurl(),
+				'$path' => $path,
+				'$folders' => $albums,
+				'$files' =>$files,
+			));
+				
+				
+			break;
+		case "file":
+			if ($a->argc==2){
+				$files = q("SELECT id, filename, filetype FROM `attach` WHERE `uid` = %d ",
+					intval(local_user())
+				);
+				
+				function files2($rr){ global $a; 
+					list($m1,$m2) = explode("/",$rr['filetype']);
+					$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
+					return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
+				}
+				$files = array_map("files2", $files);
+				//echo "<pre>"; var_dump($files); killme();
+			
+							
+				$tpl = get_markup_template("filebrowser.tpl");
+				echo replace_macros($tpl, array(
+					'$type' => 'file',
+					'$baseurl' => $a->get_baseurl(),
+					'$path' => array( array($a->get_baseurl()."/fbrowser/image/", t("Files")) ),
+					'$folders' => false,
+					'$files' =>$files,
+				));
+				
+			}
+		
+			break;
+	}
+	
+
+	killme();
+	
+}
--- a/mod/install.php
+++ b/mod/install.php
@ -380,9 +380,9 @@ function check_funcs(&$checks) {
 	
 	if(function_exists('apache_get_modules')){
 		if (! in_array('mod_rewrite',apache_get_modules())) {
-			check_add($ck_funcs, t('Apace mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
+			check_add($ck_funcs, t('Apache mod_rewrite module'), false, true, t('Error: Apache webserver mod-rewrite module is required but not installed.'));
 		} else {
-			check_add($ck_funcs, t('Apace mod_rewrite module'), true, true, "");
+			check_add($ck_funcs, t('Apache mod_rewrite module'), true, true, "");
 		}
 	}
 	if(! function_exists('curl_init')){
@ -464,3 +464,6 @@ function load_database($db) {
 	}
 	return $errors;
 }
+
+
+
--- a/mod/photo.php
+++ b/mod/photo.php
@ -170,7 +170,7 @@ function photo_init(&$a) {
 	}

 	// Writing in cachefile
-	if ($cachefile != '')
+	if (isset($cachefile) && $cachefile != '')
 		file_put_contents($cachefile, $data);

 	if(function_exists('header_remove')) {
--- a/mod/photos.php
+++ b/mod/photos.php
@ -330,7 +330,6 @@ function photos_post(&$a) {
 			// Create item container

 			$title = '';
-			$basename = basename($filename);
 			$uri = item_new_uri($a->get_hostname(),$page_owner_uid);

 			$arr = array();
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@ -98,7 +98,12 @@ function wall_attach_post(&$a) {
 		killme();
 	}

-	echo  '<br /><br />[attachment]' . $r[0]['id'] . '[/attachment]' . '<br />';
+	$lf = '<br />';
+
+	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
+		$lf = "\n";
+
+	echo  $lf . $lf . '[attachment]' . $r[0]['id'] . '[/attachment]' . $lf;
 	
 	killme();
 	// NOTREACHED
--- a/util/messages.po
+++ b/util/messages.po
@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.3.1313\n"
+"Project-Id-Version: 2.3.1314\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-15 10:00-0700\n"
+"POT-Creation-Date: 2012-04-16 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@ -55,7 +55,7 @@ msgstr ""
 #: ../../mod/profiles.php:7 ../../mod/profiles.php:329
 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3142
+#: ../../addon/facebook/facebook.php:461 ../../include/items.php:3170
 #: ../../index.php:309
 msgid "Permission denied."
 msgstr ""
@ -142,8 +142,8 @@ msgstr ""
 #: ../../addon/oembed.old/oembed.php:41 ../../addon/impressum/impressum.php:80
 #: ../../addon/blockem/blockem.php:57 ../../addon/qcomment/qcomment.php:61
 #: ../../addon/openstreetmap/openstreetmap.php:70
-#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:94
-#: ../../addon/gravatar/gravatar.php:86
+#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
+#: ../../addon/blackout/blackout.php:94 ../../addon/gravatar/gravatar.php:86
 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
 #: ../../addon/statusnet/statusnet.php:278
 #: ../../addon/statusnet/statusnet.php:292
@ -540,14 +540,14 @@ msgstr ""
 msgid "I don't like this (toggle)"
 msgstr ""

-#: ../../mod/photos.php:1214 ../../include/conversation.php:960
+#: ../../mod/photos.php:1214 ../../include/conversation.php:956
 msgid "Share"
 msgstr ""

 #: ../../mod/photos.php:1215 ../../mod/editpost.php:104
 #: ../../mod/wallmessage.php:145 ../../mod/message.php:188
 #: ../../mod/message.php:357 ../../include/conversation.php:362
-#: ../../include/conversation.php:702 ../../include/conversation.php:979
+#: ../../include/conversation.php:698 ../../include/conversation.php:975
 msgid "Please wait"
 msgstr ""

@ -563,7 +563,7 @@ msgid "Comment"
 msgstr ""

 #: ../../mod/photos.php:1235 ../../mod/editpost.php:125
-#: ../../include/conversation.php:556 ../../include/conversation.php:997
+#: ../../include/conversation.php:556 ../../include/conversation.php:993
 msgid "Preview"
 msgstr ""

@ -636,7 +636,7 @@ msgstr ""
 msgid "Edit post"
 msgstr ""

-#: ../../mod/editpost.php:80 ../../include/conversation.php:946
+#: ../../mod/editpost.php:80 ../../include/conversation.php:942
 msgid "Post to Email"
 msgstr ""

@ -647,17 +647,17 @@ msgstr ""

 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
 #: ../../mod/message.php:186 ../../mod/message.php:355
-#: ../../include/conversation.php:961
+#: ../../include/conversation.php:957
 msgid "Upload photo"
 msgstr ""

-#: ../../mod/editpost.php:97 ../../include/conversation.php:963
+#: ../../mod/editpost.php:97 ../../include/conversation.php:959
 msgid "Attach file"
 msgstr ""

 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
 #: ../../mod/message.php:187 ../../mod/message.php:356
-#: ../../include/conversation.php:965
+#: ../../include/conversation.php:961
 msgid "Insert web link"
 msgstr ""

@ -673,35 +673,35 @@ msgstr ""
 msgid "Insert Vorbis [.ogg] audio"
 msgstr ""

-#: ../../mod/editpost.php:102 ../../include/conversation.php:971
+#: ../../mod/editpost.php:102 ../../include/conversation.php:967
 msgid "Set your location"
 msgstr ""

-#: ../../mod/editpost.php:103 ../../include/conversation.php:973
+#: ../../mod/editpost.php:103 ../../include/conversation.php:969
 msgid "Clear browser location"
 msgstr ""

-#: ../../mod/editpost.php:105 ../../include/conversation.php:980
+#: ../../mod/editpost.php:105 ../../include/conversation.php:976
 msgid "Permission settings"
 msgstr ""

-#: ../../mod/editpost.php:113 ../../include/conversation.php:989
+#: ../../mod/editpost.php:113 ../../include/conversation.php:985
 msgid "CC: email addresses"
 msgstr ""

-#: ../../mod/editpost.php:114 ../../include/conversation.php:990
+#: ../../mod/editpost.php:114 ../../include/conversation.php:986
 msgid "Public post"
 msgstr ""

-#: ../../mod/editpost.php:117 ../../include/conversation.php:976
+#: ../../mod/editpost.php:117 ../../include/conversation.php:972
 msgid "Set title"
 msgstr ""

-#: ../../mod/editpost.php:119 ../../include/conversation.php:978
+#: ../../mod/editpost.php:119 ../../include/conversation.php:974
 msgid "Categories (comma-separated list)"
 msgstr ""

-#: ../../mod/editpost.php:120 ../../include/conversation.php:992
+#: ../../mod/editpost.php:120 ../../include/conversation.php:988
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""

@ -818,7 +818,7 @@ msgstr ""
 msgid "Confirm"
 msgstr ""

-#: ../../mod/dfrn_request.php:628 ../../include/items.php:2662
+#: ../../mod/dfrn_request.php:628 ../../include/items.php:2690
 msgid "[Name Withheld]"
 msgstr ""

@ -1645,9 +1645,9 @@ msgstr ""
 #: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
 #: ../../mod/register.php:388 ../../mod/register.php:442
 #: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:732
-#: ../../addon/facebook/facebook.php:622
-#: ../../addon/facebook/facebook.php:1076
-#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2671
+#: ../../addon/facebook/facebook.php:625
+#: ../../addon/facebook/facebook.php:1090
+#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2699
 msgid "Administrator"
 msgstr ""

@ -1726,7 +1726,7 @@ msgid "Export personal data"
 msgstr ""

 #: ../../mod/settings.php:83 ../../mod/admin.php:631 ../../mod/admin.php:817
-#: ../../include/nav.php:137
+#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""

@ -1782,7 +1782,8 @@ msgstr ""
 #: ../../mod/settings.php:461 ../../addon/facebook/facebook.php:450
 #: ../../addon/impressum/impressum.php:75
 #: ../../addon/openstreetmap/openstreetmap.php:80
-#: ../../addon/piwik/piwik.php:105 ../../addon/twitter/twitter.php:370
+#: ../../addon/mathjax/mathjax.php:64 ../../addon/piwik/piwik.php:105
+#: ../../addon/twitter/twitter.php:370
 msgid "Settings updated."
 msgstr ""

@ -2279,7 +2280,7 @@ msgid "Personal Notes"
 msgstr ""

 #: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:680 ../../include/text.php:652
+#: ../../addon/facebook/facebook.php:683 ../../include/text.php:652
 msgid "Save"
 msgstr ""

@ -2313,7 +2314,7 @@ msgid "No recipient."
 msgstr ""

 #: ../../mod/wallmessage.php:124 ../../mod/message.php:169
-#: ../../include/conversation.php:914
+#: ../../include/conversation.php:910
 msgid "Please enter a link URL:"
 msgstr ""

@ -2707,7 +2708,7 @@ msgid "People Search"
 msgstr ""

 #: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1549
+#: ../../addon/facebook/facebook.php:1574
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
 #: ../../view/theme/diabook-red/theme.php:80
@ -2723,7 +2724,7 @@ msgstr ""
 msgid "status"
 msgstr ""

-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1553
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1578
 #: ../../addon/communityhome/communityhome.php:172
 #: ../../view/theme/diabook-red/theme.php:94
 #: ../../view/theme/diabook-blue/theme.php:94
@ -2741,7 +2742,7 @@ msgstr ""

 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:141
 #: ../../mod/admin.php:582 ../../mod/admin.php:761 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3054
+#: ../../mod/display.php:142 ../../include/items.php:3082
 msgid "Item not found."
 msgstr ""

@ -3845,7 +3846,7 @@ msgstr ""
 msgid "Edit visibility"
 msgstr ""

-#: ../../mod/filer.php:29 ../../include/conversation.php:918
+#: ../../mod/filer.php:29 ../../include/conversation.php:914
 msgid "Save to Folder:"
 msgstr ""

@ -4176,110 +4177,110 @@ msgstr ""
 msgid "Comma separated applications to ignore"
 msgstr ""

-#: ../../addon/facebook/facebook.php:620
+#: ../../addon/facebook/facebook.php:623
 msgid "Problems with Facebook Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:644
+#: ../../addon/facebook/facebook.php:647
 #: ../../include/contact_selectors.php:81
 msgid "Facebook"
 msgstr ""

-#: ../../addon/facebook/facebook.php:645
+#: ../../addon/facebook/facebook.php:648
 msgid "Facebook Connector Settings"
 msgstr ""

-#: ../../addon/facebook/facebook.php:656
+#: ../../addon/facebook/facebook.php:659
 msgid "Facebook API Key"
 msgstr ""

-#: ../../addon/facebook/facebook.php:665
+#: ../../addon/facebook/facebook.php:668
 msgid ""
 "Error: it appears that you have specified the App-ID and -Secret in your ."
 "htconfig.php file. As long as they are specified there, they cannot be set "
 "using this form.<br><br>"
 msgstr ""

-#: ../../addon/facebook/facebook.php:670
+#: ../../addon/facebook/facebook.php:673
 msgid ""
 "Error: the given API Key seems to be incorrect (the application access token "
 "could not be retrieved)."
 msgstr ""

-#: ../../addon/facebook/facebook.php:672
+#: ../../addon/facebook/facebook.php:675
 msgid "The given API Key seems to work correctly."
 msgstr ""

-#: ../../addon/facebook/facebook.php:674
+#: ../../addon/facebook/facebook.php:677
 msgid ""
 "The correctness of the API Key could not be detected. Somthing strange's "
 "going on."
 msgstr ""

-#: ../../addon/facebook/facebook.php:677
+#: ../../addon/facebook/facebook.php:680
 msgid "App-ID / API-Key"
 msgstr ""

-#: ../../addon/facebook/facebook.php:678
+#: ../../addon/facebook/facebook.php:681
 msgid "Application secret"
 msgstr ""

-#: ../../addon/facebook/facebook.php:679
+#: ../../addon/facebook/facebook.php:682
 #, php-format
 msgid "Polling Interval (min. %1$s minutes)"
 msgstr ""

-#: ../../addon/facebook/facebook.php:683
+#: ../../addon/facebook/facebook.php:686
 msgid "Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:687
+#: ../../addon/facebook/facebook.php:690
 msgid "Real-Time Updates are activated."
 msgstr ""

-#: ../../addon/facebook/facebook.php:688
+#: ../../addon/facebook/facebook.php:691
 msgid "Deactivate Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:693
 msgid "Real-Time Updates not activated."
 msgstr ""

-#: ../../addon/facebook/facebook.php:690
+#: ../../addon/facebook/facebook.php:693
 msgid "Activate Real-Time Updates"
 msgstr ""

-#: ../../addon/facebook/facebook.php:704
+#: ../../addon/facebook/facebook.php:707
 msgid "The new values have been saved."
 msgstr ""

-#: ../../addon/facebook/facebook.php:723
+#: ../../addon/facebook/facebook.php:726
 msgid "Post to Facebook"
 msgstr ""

-#: ../../addon/facebook/facebook.php:815
+#: ../../addon/facebook/facebook.php:818
 msgid ""
 "Post to Facebook cancelled because of multi-network access permission "
 "conflict."
 msgstr ""

-#: ../../addon/facebook/facebook.php:1033
+#: ../../addon/facebook/facebook.php:1039
 msgid "View on Friendica"
 msgstr ""

-#: ../../addon/facebook/facebook.php:1058
+#: ../../addon/facebook/facebook.php:1072
 msgid "Facebook post failed. Queued for retry."
 msgstr ""

-#: ../../addon/facebook/facebook.php:1094
+#: ../../addon/facebook/facebook.php:1108
 msgid "Your Facebook connection became invalid. Please Re-authenticate."
 msgstr ""

-#: ../../addon/facebook/facebook.php:1095
+#: ../../addon/facebook/facebook.php:1109
 msgid "Facebook connection became invalid"
 msgstr ""

-#: ../../addon/facebook/facebook.php:1096
+#: ../../addon/facebook/facebook.php:1110
 #, php-format
 msgid ""
 "Hi %1$s,\n"
@ -4801,6 +4802,27 @@ msgstr ""
 msgid "The default zoom level. (1:world, 18:highest)"
 msgstr ""

+#: ../../addon/mathjax/mathjax.php:37
+msgid ""
+"The MathJax addon renders mathematical formulae written using the LaTeX "
+"syntax surrounded by the usual $$ or an eqnarray block in the postings of "
+"your wall,network tab and private mail."
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:38
+msgid "Use the MathJax renderer"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid "MathJax Base URL"
+msgstr ""
+
+#: ../../addon/mathjax/mathjax.php:72
+msgid ""
+"The URL for the javascript file that should be included to use MathJax. Can "
+"be either the MathJax CDN or another installation of MathJax."
+msgstr ""
+
 #: ../../addon/editplain/editplain.php:46
 msgid "Editplain settings updated."
 msgstr ""
@ -6611,11 +6633,11 @@ msgstr ""
 msgid "Please visit %s to approve or reject the suggestion."
 msgstr ""

-#: ../../include/items.php:2669
+#: ../../include/items.php:2697
 msgid "A new person is sharing with you at "
 msgstr ""

-#: ../../include/items.php:2669
+#: ../../include/items.php:2697
 msgid "You have a new follower at "
 msgstr ""

@ -6646,30 +6668,30 @@ msgid ""
 "form has been opened for too long (>3 hours) before submitting it."
 msgstr ""

-#: ../../include/Contact.php:145 ../../include/conversation.php:813
+#: ../../include/Contact.php:145 ../../include/conversation.php:809
 msgid "View Status"
 msgstr ""

-#: ../../include/Contact.php:146 ../../include/conversation.php:814
+#: ../../include/Contact.php:146 ../../include/conversation.php:810
 msgid "View Profile"
 msgstr ""

-#: ../../include/Contact.php:147 ../../include/conversation.php:815
+#: ../../include/Contact.php:147 ../../include/conversation.php:811
 msgid "View Photos"
 msgstr ""

 #: ../../include/Contact.php:148 ../../include/Contact.php:161
-#: ../../include/conversation.php:816
+#: ../../include/conversation.php:812
 msgid "Network Posts"
 msgstr ""

 #: ../../include/Contact.php:149 ../../include/Contact.php:161
-#: ../../include/conversation.php:817
+#: ../../include/conversation.php:813
 msgid "Edit Contact"
 msgstr ""

 #: ../../include/Contact.php:150 ../../include/Contact.php:161
-#: ../../include/conversation.php:818
+#: ../../include/conversation.php:814
 msgid "Send PM"
 msgstr ""

@ -6686,13 +6708,13 @@ msgstr ""
 msgid "Select"
 msgstr ""

-#: ../../include/conversation.php:334 ../../include/conversation.php:672
-#: ../../include/conversation.php:673
+#: ../../include/conversation.php:334 ../../include/conversation.php:668
+#: ../../include/conversation.php:669
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr ""

-#: ../../include/conversation.php:344 ../../include/conversation.php:684
+#: ../../include/conversation.php:344 ../../include/conversation.php:680
 #, php-format
 msgid "%s from %s"
 msgstr ""
@ -6748,118 +6770,118 @@ msgstr ""
 msgid "save to folder"
 msgstr ""

-#: ../../include/conversation.php:674
+#: ../../include/conversation.php:670
 msgid "to"
 msgstr ""

-#: ../../include/conversation.php:675
+#: ../../include/conversation.php:671
 msgid "Wall-to-Wall"
 msgstr ""

-#: ../../include/conversation.php:676
+#: ../../include/conversation.php:672
 msgid "via Wall-To-Wall:"
 msgstr ""

-#: ../../include/conversation.php:721
+#: ../../include/conversation.php:717
 msgid "Delete Selected Items"
 msgstr ""

-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s likes this."
 msgstr ""

-#: ../../include/conversation.php:872
+#: ../../include/conversation.php:868
 #, php-format
 msgid "%s doesn't like this."
 msgstr ""

-#: ../../include/conversation.php:876
+#: ../../include/conversation.php:872
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""

-#: ../../include/conversation.php:878
+#: ../../include/conversation.php:874
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""

-#: ../../include/conversation.php:884
+#: ../../include/conversation.php:880
 msgid "and"
 msgstr ""

-#: ../../include/conversation.php:887
+#: ../../include/conversation.php:883
 #, php-format
 msgid ", and %d other people"
 msgstr ""

-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s like this."
 msgstr ""

-#: ../../include/conversation.php:888
+#: ../../include/conversation.php:884
 #, php-format
 msgid "%s don't like this."
 msgstr ""

-#: ../../include/conversation.php:913
+#: ../../include/conversation.php:909
 msgid "Visible to <strong>everybody</strong>"
 msgstr ""

-#: ../../include/conversation.php:915
+#: ../../include/conversation.php:911
 msgid "Please enter a video link/URL:"
 msgstr ""

-#: ../../include/conversation.php:916
+#: ../../include/conversation.php:912
 msgid "Please enter an audio link/URL:"
 msgstr ""

-#: ../../include/conversation.php:917
+#: ../../include/conversation.php:913
 msgid "Tag term:"
 msgstr ""

-#: ../../include/conversation.php:919
+#: ../../include/conversation.php:915
 msgid "Where are you right now?"
 msgstr ""

-#: ../../include/conversation.php:962
+#: ../../include/conversation.php:958
 msgid "upload photo"
 msgstr ""

-#: ../../include/conversation.php:964
+#: ../../include/conversation.php:960
 msgid "attach file"
 msgstr ""

-#: ../../include/conversation.php:966
+#: ../../include/conversation.php:962
 msgid "web link"
 msgstr ""

-#: ../../include/conversation.php:967
+#: ../../include/conversation.php:963
 msgid "Insert video link"
 msgstr ""

-#: ../../include/conversation.php:968
+#: ../../include/conversation.php:964
 msgid "video link"
 msgstr ""

-#: ../../include/conversation.php:969
+#: ../../include/conversation.php:965
 msgid "Insert audio link"
 msgstr ""

-#: ../../include/conversation.php:970
+#: ../../include/conversation.php:966
 msgid "audio link"
 msgstr ""

-#: ../../include/conversation.php:972
+#: ../../include/conversation.php:968
 msgid "set location"
 msgstr ""

-#: ../../include/conversation.php:974
+#: ../../include/conversation.php:970
 msgid "clear location"
 msgstr ""

-#: ../../include/conversation.php:981
+#: ../../include/conversation.php:977
 msgid "permissions"
 msgstr ""

--- a/view/admin_logs.tpl
+++ b/view/admin_logs.tpl
@ -2,6 +2,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/logs" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>

 	{{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
--- a/view/admin_plugins.tpl
+++ b/view/admin_plugins.tpl
@ -4,7 +4,7 @@
 		<ul id='pluginslist'>
 		{{ for $plugins as $p }}
 			<li class='plugin $p.1'>
-				<a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
+				<a class='toggleplugin' href='$baseurl/admin/$function/$p.0?a=t&amp;t=$form_security_token' title="{{if $p.1==on }}Disable{{ else }}Enable{{ endif }}" ><span class='icon $p.1'></span></a>
 				<a href='$baseurl/admin/$function/$p.0'><span class='name'>$p.2.name</span></a> - <span class="version">$p.2.version</span>
 				{{ if $p.2.experimental }} $experimental {{ endif }}{{ if $p.2.unsupported }} $unsupported {{ endif }}

--- a/view/admin_plugins_details.tpl
+++ b/view/admin_plugins_details.tpl
@ -1,7 +1,7 @@
 <div id='adminpage'>
 	<h1>$title - $page</h1>
 	
-	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t">$action</a></p>
+	<p><span class='toggleplugin icon $status'></span> $info.name - $info.version : <a href="$baseurl/admin/$function/$plugin/?a=t&amp;t=$form_security_token">$action</a></p>
 	<p>$info.description</p>
 	
 	<p class="author">$str_author
--- a/view/admin_site.tpl
+++ b/view/admin_site.tpl
@ -38,6 +38,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/site" method="post">
+    <input type='hidden' name='form_security_token' value='$form_security_token'>

 	{{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
 	{{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@ -14,6 +14,7 @@
 	<h1>$title - $page</h1>
 	
 	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
 		
 		<h3>$h_pending</h3>
 		{{ if $pending }}
@ -72,8 +73,8 @@
 						<td class='login_date'>$u.page-flags</td>
 						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
 						<td class="tools">
-							<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
-							<a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
 						</td>
 					</tr>
 				{{ endfor }}
--- a/view/ca/messages.po
+++ b/view/ca/messages.po
@ -2910,7 +2910,7 @@ msgstr "Comptes abandonats després de x dies"

 #: ../../mod/admin.php:330
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal."

--- a/view/ca/strings.php
+++ b/view/ca/strings.php
@ -654,7 +654,7 @@ $a->strings["Register policy"] = "Política per a registrar";
 $a->strings["Register text"] = "Text al registrar";
 $a->strings["Will be displayed prominently on the registration page."] = "Sea mostrat de forma peminent a la pagina durant el procés de registre.";
 $a->strings["Accounts abandoned after x days"] = "Comptes abandonats després de x dies";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creant enquestes des de llocs externos per a comptes abandonats. Introdueixi 0 per a cap límit temporal.";
 $a->strings["Allowed friend domains"] = "Dominis amics permesos";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Llista de dominis separada per comes, de adreçes de correu que són permeses per establir amistats. S'admeten comodins. Deixa'l buit per a acceptar tots els dominis.";
 $a->strings["Allowed email domains"] = "Dominis de correu permesos";
--- a/view/de/messages.po
+++ b/view/de/messages.po
--- a/view/de/strings.php
+++ b/view/de/strings.php
@ -128,7 +128,7 @@ $a->strings["Post to Email"] = "An E-Mail senden";
 $a->strings["Edit"] = "Bearbeiten";
 $a->strings["Upload photo"] = "Foto hochladen";
 $a->strings["Attach file"] = "Datei anhängen";
-$a->strings["Insert web link"] = "einen Weblink einfügen";
+$a->strings["Insert web link"] = "eine Kontaktanfrage";
 $a->strings["Insert YouTube video"] = "YouTube-Video einfügen";
 $a->strings["Insert Vorbis [.ogg] video"] = "Vorbis [.ogg] Video einfügen";
 $a->strings["Insert Vorbis [.ogg] audio"] = "Vorbis [.ogg] Audio einfügen";
@ -155,6 +155,8 @@ $a->strings["%s has received too many connection requests today."] = "%s hat heu
 $a->strings["Spam protection measures have been invoked."] = "Maßnahmen zum Spamschutz wurden ergriffen.";
 $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde sind angehalten, es in 24 Stunden erneut zu versuchen.";
 $a->strings["Invalid locator"] = "Ungültiger Locator";
+$a->strings["Invalid email address."] = "Ungültige E-Mail Adresse.";
+$a->strings["This account has not been configured for email. Request failed."] = "";
 $a->strings["Unable to resolve your name at the provided location."] = "Konnte deinen Namen an der angegebenen Stelle nicht finden.";
 $a->strings["You have already introduced yourself here."] = "Du hast dich hier bereits vorgestellt.";
 $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob du bereits mit %s befreundet bist.";
@ -365,6 +367,13 @@ $a->strings["Forgot your Password?"] = "Hast du dein Passwort vergessen?";
 $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib deine Email-Adresse an und fordere ein neues Passwort an. Es werden dir dann weitere Informationen per Mail zugesendet.";
 $a->strings["Nickname or Email: "] = "Spitzname oder Email:";
 $a->strings["Reset"] = "Zurücksetzen";
+$a->strings["Account settings"] = "Account Einstellungen";
+$a->strings["Display settings"] = "Anzeige Einstellungen";
+$a->strings["Connector settings"] = "Connector-Einstellungen";
+$a->strings["Plugin settings"] = "Plugin-Einstellungen";
+$a->strings["Connected apps"] = "Verbundene Programme";
+$a->strings["Export personal data"] = "Persönliche Daten exportieren";
+$a->strings["Settings"] = "Einstellungen";
 $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
 $a->strings["Update"] = "Aktualisierungen";
 $a->strings["Failed to connect with email account using the settings provided."] = "Konnte das Email Konto mit den angegebenen Einstellungen nicht erreichen.";
@ -378,12 +387,6 @@ $a->strings[" Name too short."] = " Name ist zu kurz.";
 $a->strings[" Not valid email."] = " Keine gültige E-Mail.";
 $a->strings[" Cannot change to that email."] = "Ändern der E-Mail nicht möglich. ";
 $a->strings["Settings updated."] = "Einstellungen aktualisiert.";
-$a->strings["Account settings"] = "Account Einstellungen";
-$a->strings["Display settings"] = "Anzeige Einstellungen";
-$a->strings["Connector settings"] = "Connector-Einstellungen";
-$a->strings["Plugin settings"] = "Plugin-Einstellungen";
-$a->strings["Connections"] = "Verbindungen";
-$a->strings["Export personal data"] = "Persönliche Daten exportieren";
 $a->strings["Add application"] = "Programm hinzufügen";
 $a->strings["Consumer Key"] = "Consumer Key";
 $a->strings["Consumer Secret"] = "Consumer Secret";
@ -471,6 +474,9 @@ $a->strings["Default Post Permissions"] = "Standard-Zugriffsrechte für Beiträg
 $a->strings["(click to open/close)"] = "(klicke zum öffnen/schließen)";
 $a->strings["Maximum private messages per day from unknown people:"] = "Maximale Anzahl von privaten Nachrichten, die dir unbekannte Personen pro Tag senden dürfen:";
 $a->strings["Notification Settings"] = "Benachrichtigungseinstellungen";
+$a->strings["By default post a status message when:"] = "";
+$a->strings["accepting a friend request"] = "akzeptieren einer Freundschaftsanfrage";
+$a->strings["making an <em>interesting</em> profile change"] = "";
 $a->strings["Send a notification email when:"] = "Benachrichtigungs-E-Mail senden wenn:";
 $a->strings["You receive an introduction"] = "- du eine Kontaktanfrage erhältst";
 $a->strings["Your introductions are confirmed"] = "- eine deiner Kontaktanfragen akzeptiert wurde";
@ -478,7 +484,7 @@ $a->strings["Someone writes on your profile wall"] = "- jemand etwas auf deine P
 $a->strings["Someone writes a followup comment"] = "- jemand auch einen Kommentar verfasst";
 $a->strings["You receive a private message"] = "- du eine private Nachricht erhältst";
 $a->strings["You receive a friend suggestion"] = "- du eine Empfehlung erhältst";
-$a->strings["You are tagged in a post"] = "Du wurdest in einem Beitrag erwähnt.";
+$a->strings["You are tagged in a post"] = "- du in einem Beitrag erwähnt wurdest";
 $a->strings["Advanced Page Settings"] = "Erweiterte Seiten-Einstellungen";
 $a->strings["Manage Identities and/or Pages"] = "Verwalte Identitäten und/oder Seiten";
 $a->strings["Toggle between different identities or community/group pages which share your account details or which you have been granted \"manage\" permissions"] = "Wechsle zwischen verschiedenen Identitäten oder Gemeinschafts-/Gruppen-Seiten, die deine Zugangsdetails teilen oder zu denen du \"Manage\" Befugnisse bekommen hast.";
@ -646,6 +652,7 @@ $a->strings["No secure communications available. You <strong>may</strong> be abl
 $a->strings["Send Reply"] = "Antwort senden";
 $a->strings["Friends of %s"] = "Freunde von %s";
 $a->strings["No friends to display."] = "Keine Freunde zum Anzeigen.";
+$a->strings["Theme settings updated."] = "Themen Einstellungen aktualisiert.";
 $a->strings["Site"] = "Seite";
 $a->strings["Users"] = "Nutzer";
 $a->strings["Plugins"] = "Plugins";
@ -672,7 +679,7 @@ $a->strings["Site name"] = "Seitenname";
 $a->strings["Banner/Logo"] = "Banner/Logo";
 $a->strings["System language"] = "Systemsprache";
 $a->strings["System theme"] = "Systemweites Thema";
-$a->strings["Default system theme - may be over-ridden by user profiles"] = "Standard Server Theme - kann von den Benutzereinstellungen überschrieben werden.";
+$a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = "";
 $a->strings["SSL link policy"] = "Regeln für SSL Links";
 $a->strings["Determines whether generated links should be forced to use SSL"] = "Bestimmt, ob generierte Links SSL verwenden müssen";
 $a->strings["Maximum image size"] = "Maximale Größe von Bildern";
@ -681,7 +688,7 @@ $a->strings["Register policy"] = "Registrierungsmethode";
 $a->strings["Register text"] = "Registrierungstext";
 $a->strings["Will be displayed prominently on the registration page."] = "Wird gut sichtbar auf der Registrierungs-Seite angezeigt.";
 $a->strings["Accounts abandoned after x days"] = "Accounts gelten nach x Tagen als unbenutzt";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Verschwende keine System-Ressourcen auf das Pollen externer Seiten, wenn Accounts nicht mehr benutzt werden. 0 eingeben für kein Limit.";
 $a->strings["Allowed friend domains"] = "Erlaubte Domains für Kontakte";
 $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = "Liste der Domains, die für Freundschaften erlaubt sind, durch Kommas getrennt. Platzhalter werden akzeptiert. Leer lassen, um alle Domains zu erlauben.";
 $a->strings["Allowed email domains"] = "Erlaubte Domains für Emails";
@ -696,8 +703,6 @@ $a->strings["Block multiple registrations"] = "Unterbinde Mehrfachregistrierung"
 $a->strings["Disallow users to register additional accounts for use as pages."] = "Benutzern nicht erlauben, weitere Accounts als zusätzliche Profile anzulegen.";
 $a->strings["OpenID support"] = "OpenID Unterstützung";
 $a->strings["OpenID support for registration and logins."] = "OpenID-Unterstützung für Registrierung und Login.";
-$a->strings["Gravatar support"] = "Gravatar Unterstützung";
-$a->strings["Search new user's photo on Gravatar."] = "Suchfunktion bei Gravatar für Profilbilder neuer Nutzer.";
 $a->strings["Fullname check"] = "Namen auf Vollständigkeit überprüfen";
 $a->strings["Force users to register with a space between firstname and lastname in Full name, as an antispam measure"] = "Leerzeichen zwischen Vor- und Nachname im vollständigen Namen erzwingen, um SPAM zu vermeiden.";
 $a->strings["UTF-8 Regular expressions"] = "UTF-8 Reguläre Ausdrücke";
@ -711,7 +716,7 @@ $a->strings["Provide built-in Diaspora network compatibility."] = "Verwende die
 $a->strings["Only allow Friendica contacts"] = "Nur Friendica-Kontakte erlauben";
 $a->strings["All contacts must use Friendica protocols. All other built-in communication protocols disabled."] = "Alle Kontakte müssen das Friendica Protokoll nutzen. Alle anderen Kommunikationsprotokolle werden deaktiviert.";
 $a->strings["Verify SSL"] = "SSL Überprüfen";
-$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle anstellen. Das bedeutet, das man zu keinen Seiten mit selbst unterzeichneten SSL eine Verbindung herstellen kann.";
+$a->strings["If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites."] = "Wenn gewollt, kann man hier eine strenge Zertifikat Kontrolle einstellen. Das bedeutet, dass man zu keinen Seiten mit selbst unterzeichnetem SSL eine Verbindung herstellen kann.";
 $a->strings["Proxy user"] = "Proxy Nutzer";
 $a->strings["Proxy URL"] = "Proxy URL";
 $a->strings["Network timeout"] = "Netzwerk Wartezeit";
@ -744,7 +749,6 @@ $a->strings["Plugin %s enabled."] = "Plugin %s aktiviert.";
 $a->strings["Disable"] = "Ausschalten";
 $a->strings["Enable"] = "Einschalten";
 $a->strings["Toggle"] = "Umschalten";
-$a->strings["Settings"] = "Einstellungen";
 $a->strings["Author: "] = "Autor:";
 $a->strings["Maintainer: "] = "Betreuer:";
 $a->strings["No themes found."] = "Keine Themen gefunden.";
@ -775,9 +779,10 @@ $a->strings["{0} is now friends with %s"] = "{0} ist jetzt mit %s befreundet";
 $a->strings["{0} posted"] = "{0} hat etwas veröffentlicht";
 $a->strings["{0} tagged %s's post with #%s"] = "{0} hat %ss Beitrag mit dem Schlagwort #%s versehen";
 $a->strings["{0} mentioned you in a post"] = "{0} hat dich in einem Beitrag erwähnt";
+$a->strings["Contacts who are not members of a group"] = "";
 $a->strings["OpenID protocol error. No ID returned."] = "OpenID Protokollfehler. Keine ID zurückgegeben.";
 $a->strings["Account not found and OpenID registration is not permitted on this site."] = "Account wurde nicht gefunden und OpenID Registrierung auf diesem Server nicht gestattet.";
-$a->strings["Login failed."] = "Anmeldung fehlgeschlagen.";
+$a->strings["Login failed."] = "Annmeldung fehlgeschlagen.";
 $a->strings["Connect URL missing."] = "Connect-URL fehlt";
 $a->strings["This site is not configured to allow communications with other networks."] = "Diese Seite ist so konfiguriert, dass keine Kommunikation mit anderen Netzwerken erfolgen kann.";
 $a->strings["No compatible communication protocols or feeds were discovered."] = "Es wurden keine kompatiblen Kommunikationsprotokolle oder Feeds gefunden.";
@ -796,7 +801,19 @@ $a->strings["No installed applications."] = "Keine Applikationen installiert.";
 $a->strings["Search This Site"] = "Diese Seite durchsuchen";
 $a->strings["Profile not found."] = "Profil nicht gefunden.";
 $a->strings["Profile Name is required."] = "Profilname ist erforderlich.";
+$a->strings["Marital Status"] = "";
+$a->strings["Romantic Partner"] = "";
+$a->strings["Work/Employment"] = "";
+$a->strings["Religion"] = "Religion";
+$a->strings["Political Views"] = "Politische Ansichten";
+$a->strings["Gender"] = "Geschlecht";
+$a->strings["Sexual Preference"] = "Sexuelle Vorlieben";
+$a->strings["Homepage"] = "Webseite";
+$a->strings["Interests"] = "Interessen";
+$a->strings["Location"] = "";
 $a->strings["Profile updated."] = "Profil aktualisiert.";
+$a->strings["public profile"] = "";
+$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = "";
 $a->strings["Profile deleted."] = "Profil gelöscht.";
 $a->strings["Profile-"] = "Profil-";
 $a->strings["New profile created."] = "Neues Profil angelegt.";
@ -924,7 +941,7 @@ $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"
 $a->strings["Facebook API Key"] = "Facebook API Schlüssel";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
 $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden).";
-$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren.";
+$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren.";
 $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
 $a->strings["App-ID / API-Key"] = "App-ID / API-Key";
 $a->strings["Application secret"] = "Anwendungs-Geheimnis";
@ -942,7 +959,6 @@ $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei
 $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich.";
 $a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden";
 $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du  %3\$sden Facebook-Connector neu Authentifizieren%4\$s.";
-$a->strings["link"] = "Verweis";
 $a->strings["%d person likes this"] = array(
 	0 => "%d Person mag das",
 	1 => "%d Leuten mögen das",
@ -975,6 +991,8 @@ $a->strings["Use /expression/ to provide regular expressions"] = "Verwende /expr
 $a->strings["NSFW Settings saved."] = "NSFW-Einstellungen gespeichert";
 $a->strings["%s - Click to open/close"] = "%s – Zum Öffnen/Schließen klicken";
 $a->strings["Forums"] = "Foren";
+$a->strings["Planets Settings"] = "Planeten Einstellungen";
+$a->strings["Enable Planets Plugin"] = "Aktiviere Planeten Plugin";
 $a->strings["Login"] = "Anmeldung";
 $a->strings["OpenID"] = "OpenID";
 $a->strings["Latest users"] = "Letzte Benutzer";
@ -1035,8 +1053,15 @@ $a->strings["Site Owner"] = "Betreiber der Seite";
 $a->strings["Email Address"] = "Email Adresse";
 $a->strings["Postal Address"] = "Postalische Anschrift";
 $a->strings["The impressum addon needs to be configured!<br />Please add at least the <tt>owner</tt> variable to your config file. For other variables please refer to the README file of the addon."] = "Das Impressums-Plugin muss noch konfiguriert werden.<br />Bitte gebe mindestens den <tt>Betreiber</tt> in der Konfiguration an. Alle weiteren Parameter werden in der README-Datei des Addons erläutert.";
+$a->strings["The page operators name."] = "Name des Server-Administrators";
 $a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
+$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators";
+$a->strings["How to contact the operator via snail mail."] = "Wie erreicht man den Betreiber der Seite postalisch.";
 $a->strings["Notes"] = "Hinweise";
+$a->strings["Additional notes that are displayed beneath the contact information."] = "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden.";
+$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)";
+$a->strings["Footer note"] = "Fußnote";
+$a->strings["Text for the footer."] = "Text für die Fußnote";
 $a->strings["Report Bug"] = "Fehlerreport erstellen";
 $a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen";
 $a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)";
@ -1056,9 +1081,26 @@ $a->strings["Tile Server URL"] = "Tile Server URL";
 $a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Eine Liste <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">öffentlicher Tile Server</a>";
 $a->strings["Default zoom"] = "Standard Zoom";
 $a->strings["The default zoom level. (1:world, 18:highest)"] = "Standard Zoomlevel (1: Welt; 18: höchstes)";
+$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "Mit dem MathJax Addon können mathematische Formeln, die mit LaTeX geschrieben wurden, dargestellt werden. Die Formel wird mit den üblichen $$ oder einem eqnarray Block gekennzeichnet. Formeln werden in allen Beiträgen auf deiner Pinnwand, dem Netzwerk-Stream sowie privaten Nachrichten gerendert.";
+$a->strings["Use the MathJax renderer"] = "MathJax verwenden";
+$a->strings["MathJax Base URL"] = "MathJax Basis-URL";
+$a->strings["The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax."] = "Die URL der MathJax Javascript-Datei, die verwendet werden soll. Diese kann entweder aus der MathJax CDN oder einer anderen Quelle stammen.";
 $a->strings["Editplain settings updated."] = "Editplain Einstellungen aktualisiert";
 $a->strings["Editplain Settings"] = "Editplain Einstellungen";
 $a->strings["Disable richtext status editor"] = "RichText Editor deaktivieren";
+$a->strings["generic profile image"] = "";
+$a->strings["random geometric pattern"] = "";
+$a->strings["monster face"] = "";
+$a->strings["computer generated face"] = "";
+$a->strings["retro arcade style face"] = "";
+$a->strings["Default avatar image"] = "Standard Profilbild ";
+$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "";
+$a->strings["Rating of images"] = "";
+$a->strings["Select the appropriate avatar rating for your site. See README"] = "";
+$a->strings["Gravatar settings updated."] = "";
+$a->strings["Your account on %s will expire in a few days."] = "Dein Konto auf %s wird in ein paar Tagen verfallen.";
+$a->strings["Your Friendica test account is about to expire."] = "Dein Friendica Test Konto wird bald verfallen.";
+$a->strings["Hi %1\$s,\n\nYour test account on %2\$s will expire in less than five days. We hope you enjoyed this test drive and use this opportunity to find a permanent Friendica website for your integrated social communications. A list of public sites is available at http://dir.friendica.com/siteinfo - and for more information on setting up your own Friendica server please see the Friendica project website at http://friendica.com."] = "";
 $a->strings["\"pageheader\" Settings"] = "\"pageheader\"-Einstellungen";
 $a->strings["pageheader Settings saved."] = "pageheader-Einstellungen gespeichert.";
 $a->strings["Post to Insanejournal"] = "Auf InsaneJournal posten.";
@ -1141,8 +1183,19 @@ $a->strings["Send public postings to Twitter by default"] = "Veröffentliche öf
 $a->strings["Send #tag links to Twitter"] = "#Tags nach Twitter senden";
 $a->strings["Consumer key"] = "Consumer Key";
 $a->strings["Consumer secret"] = "Consumer Secret";
+$a->strings["IRC Settings"] = "IRC Einstellungen";
+$a->strings["Channel(s) to auto connect (comma separated)"] = "";
+$a->strings["Popular Channels (comma separated)"] = "";
+$a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
 $a->strings["IRC Chatroom"] = "IRC Chatraum";
 $a->strings["Popular Channels"] = "Beliebte Räume";
+$a->strings["Post to blogger"] = "";
+$a->strings["Blogger Post Settings"] = "";
+$a->strings["Enable Blogger Post Plugin"] = "";
+$a->strings["Blogger username"] = "";
+$a->strings["Blogger password"] = "";
+$a->strings["Blogger API URL"] = "";
+$a->strings["Post to Blogger by default"] = "";
 $a->strings["Post to Posterous"] = "Nach Posterous senden";
 $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
 $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
@ -1161,7 +1214,7 @@ $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["PostIt to Friendica"] = "Bei Friendica posten";
 $a->strings["Post to Friendica"] = "Wenn du diesen Link";
-$a->strings[" from anywhere by bookmarking this Link."] = "zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
+$a->strings[" from anywhere by bookmarking this Link."] = " zu deinen Lesezeichen hinzufügst, kannst du von überallher Links bei Friendica veröffentlichen.";
 $a->strings["Your posts and conversations"] = "Deine Beiträge und Unterhaltungen";
 $a->strings["Your profile page"] = "Deine Profilseite";
 $a->strings["Your contacts"] = "Deine Kontakte";
@ -1171,6 +1224,9 @@ $a->strings["Your events"] = "Deine Ereignisse";
 $a->strings["Personal notes"] = "Persönliche Notizen";
 $a->strings["Your personal photos"] = "Deine privaten Fotos";
 $a->strings["Theme settings"] = "Themen Einstellungen";
+$a->strings["Set font-size for posts and comments"] = "";
+$a->strings["Set line-height for posts and comments"] = "";
+$a->strings["Set resolution for middle column"] = "";
 $a->strings["Alignment"] = "Ausrichtung";
 $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
@ -1234,7 +1290,7 @@ $a->strings["No Preference"] = "Keine Vorlieben";
 $a->strings["Bisexual"] = "Bisexuell";
 $a->strings["Autosexual"] = "Autosexual";
 $a->strings["Abstinent"] = "Abstinent";
-$a->strings["Virgin"] = "Jungfrau";
+$a->strings["Virgin"] = "Jungfrauen";
 $a->strings["Deviant"] = "Deviant";
 $a->strings["Fetish"] = "Fetish";
 $a->strings["Oodles"] = "Oodles";
@ -1243,6 +1299,8 @@ $a->strings["Single"] = "Single";
 $a->strings["Lonely"] = "Einsam";
 $a->strings["Available"] = "Verfügbar";
 $a->strings["Unavailable"] = "Nicht verfügbar";
+$a->strings["Has crush"] = "";
+$a->strings["Infatuated"] = "";
 $a->strings["Dating"] = "Dating";
 $a->strings["Unfaithful"] = "Untreu";
 $a->strings["Sex Addict"] = "Sexbesessen";
@ -1251,18 +1309,21 @@ $a->strings["Friends/Benefits"] = "Freunde/Zuwendungen";
 $a->strings["Casual"] = "Casual";
 $a->strings["Engaged"] = "Verlobt";
 $a->strings["Married"] = "Verheiratet";
+$a->strings["Imaginarily married"] = "";
 $a->strings["Partners"] = "Partner";
 $a->strings["Cohabiting"] = "zusammenlebend";
+$a->strings["Common law"] = "";
 $a->strings["Happy"] = "Glücklich";
-$a->strings["Not Looking"] = "Nicht auf der Suche";
+$a->strings["Not looking"] = "Nicht auf der Suche";
 $a->strings["Swinger"] = "Swinger";
 $a->strings["Betrayed"] = "Betrogen";
 $a->strings["Separated"] = "Getrennt";
 $a->strings["Unstable"] = "Unstabil";
 $a->strings["Divorced"] = "Geschieden";
+$a->strings["Imaginarily divorced"] = "";
 $a->strings["Widowed"] = "Verwitwet";
 $a->strings["Uncertain"] = "Unsicher";
-$a->strings["Complicated"] = "Kompliziert";
+$a->strings["It's complicated"] = "Ist kompliziert";
 $a->strings["Don't care"] = "Ist mir nicht wichtig";
 $a->strings["Ask me"] = "Frag mich";
 $a->strings["Starts:"] = "Beginnt:";
@ -1304,8 +1365,8 @@ $a->strings["remove"] = "löschen";
 $a->strings["[remove]"] = "[löschen]";
 $a->strings["Filed under:"] = "Abgelegt unter:";
 $a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
-$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["default"] = "standard";
+$a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["activity"] = "Aktivität";
 $a->strings["comment"] = "Kommentar";
 $a->strings["post"] = "Beitrag";
@ -1322,6 +1383,7 @@ $a->strings["edit"] = "bearbeiten";
 $a->strings["Groups"] = "Gruppen";
 $a->strings["Edit group"] = "Gruppe bearbeiten";
 $a->strings["Create a new group"] = "Neue Gruppe erstellen";
+$a->strings["Contacts not in any group"] = "";
 $a->strings["Logout"] = "Abmelden";
 $a->strings["End this session"] = "Diese Sitzung beenden";
 $a->strings["Status"] = "Status";
@ -1361,6 +1423,7 @@ $a->strings["Find People"] = "Leute finden";
 $a->strings["Enter name or interest"] = "Name oder Interessen eingeben";
 $a->strings["Connect/Follow"] = "Verbinden/Folgen";
 $a->strings["Examples: Robert Morgenstein, Fishing"] = "Beispiel: Robert Morgenstein, Angeln";
+$a->strings["Random Profile"] = "Zufälliges Profil";
 $a->strings["Networks"] = "Netzwerke";
 $a->strings["All Networks"] = "Alle Netzwerke";
 $a->strings["Saved Folders"] = "Gespeicherte Ordner";
@ -1438,14 +1501,16 @@ $a->strings["Please visit %s to approve or reject the suggestion."] = "Bitte bes
 $a->strings["A new person is sharing with you at "] = "Eine neue Person teilt mit dir auf ";
 $a->strings["You have a new follower at "] = "Du hast einen neuen Kontakt auf ";
 $a->strings["image/photo"] = "Bild/Foto";
+$a->strings["link"] = "Verweis";
 $a->strings["Welcome "] = "Willkommen ";
 $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
 $a->strings["Welcome back "] = "Willkommen zurück ";
-$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Der Formular-Sicherheits-Token war nicht korrekt. Der Grund ist wahrscheinlich, dass das Formular zu lange (>3 Stunden) offen war, bevor es abgeschickt wurde.";
-$a->strings["View status"] = "Status anzeigen";
-$a->strings["View profile"] = "Profil anzeigen";
-$a->strings["View photos"] = "Fotos ansehen";
-$a->strings["View recent"] = "Neueste anzeigen";
+$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "";
+$a->strings["View Status"] = "Pinnwand anschauen";
+$a->strings["View Profile"] = "Profil anschauen";
+$a->strings["View Photos"] = "Bilder anschauen";
+$a->strings["Network Posts"] = "Netzwerk Beiträge";
+$a->strings["Edit Contact"] = "Kontakt bearbeiten";
 $a->strings["Send PM"] = "Private Nachricht senden";
 $a->strings["post/item"] = "Nachricht/Beitrag";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
@ -1503,7 +1568,7 @@ $a->strings["Or login using OpenID: "] = "Oder melde dich mit deiner OpenID an:
 $a->strings["Forgot your password?"] = "Passwort vergessen?";
 $a->strings["Edit profile"] = "Profil bearbeiten";
 $a->strings["Message"] = "Nachricht";
-$a->strings["g A l F d"] = "l. d, F G \\U\\h\\\\r";
+$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
 $a->strings["F d"] = "d. F";
 $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
 $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
@ -1511,4 +1576,3 @@ $a->strings["[today]"] = "[heute]";
 $a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
 $a->strings["Events this week:"] = "Veranstaltungen diese Woche";
 $a->strings["[No description]"] = "[keine Beschreibung]";
-$a->strings['Update Error at %s'] = 'Fehler beim Updaten von %s'; 
--- a/view/en/follow_notify_eml.tpl
+++ b/view/en/follow_notify_eml.tpl
@ -1,14 +1,14 @@

-Dear $myname,
+Dear $[myname],

-You have a new follower at $sitename -  '$requestor'.
+You have a new follower at $[sitename] -  '$[requestor]'.

-You may visit their profile at $url.
+You may visit their profile at $[url].

 Please login to your site to approve or ignore/cancel the request.

-$siteurl
+$[siteurl]

 Regards,

-	$sitename administrator
+	$[sitename] administrator
--- a/view/en/friend_complete_eml.tpl
+++ b/view/en/friend_complete_eml.tpl
@ -1,22 +1,22 @@

-Dear $username,
+Dear $[username],

-	Great news... '$fn' at '$dfrn_url' has accepted 
-your connection request at '$sitename'.
+	Great news... '$[fn]' at '$[dfrn_url]' has accepted 
+your connection request at '$[sitename]'.

 You are now mutual friends and may exchange status updates, photos, and email
 without restriction.

-Please visit your 'Contacts' page at $sitename if you wish to make 
+Please visit your 'Contacts' page at $[sitename] if you wish to make 
 any changes to this relationship. 

-$siteurl
+$[siteurl]

 [For instance, you may create a separate profile with information that is not
-available to the general public - and assign viewing rights to '$fn'].
+available to the general public - and assign viewing rights to '$[fn]'].

 Sincerely,

-	$sitename Administrator
+	$[sitename] Administrator

 
--- a/view/en/intro_complete_eml.tpl
+++ b/view/en/intro_complete_eml.tpl
@ -1,22 +1,22 @@

-Dear $username,
+Dear $[username],

-	'$fn' at '$dfrn_url' has accepted 
-your connection request at '$sitename'.
+	'$[fn]' at '$[dfrn_url]' has accepted 
+your connection request at '$[sitename]'.

-	'$fn' has chosen to accept you a "fan", which restricts 
+	'$[fn]' has chosen to accept you a "fan", which restricts 
 some forms of communication - such as private messaging and some profile
 interactions. If this is a celebrity or community page, these settings were
 applied automatically.

-	'$fn' may choose to extend this into a two-way or more permissive 
+	'$[fn]' may choose to extend this into a two-way or more permissive 
 relationship in the future. 

-	You will start receiving public status updates from '$fn', 
+	You will start receiving public status updates from '$[fn]', 
 which will appear on your 'Network' page at  

-$siteurl
+$[siteurl]

 Sincerely,

-	$sitename Administrator
+	$[sitename] Administrator
--- a/view/en/lostpass_eml.tpl
+++ b/view/en/lostpass_eml.tpl
@ -1,6 +1,6 @@

-Dear $username,
-	A request was recently received at $sitename to reset your account 
+Dear $[username],
+	A request was recently received at $[sitename] to reset your account 
 password. In order to confirm this request, please select the verification link
 below or paste it into your web browser address bar. 

@ -12,7 +12,7 @@ issued this request.

 Follow this link to verify your identity:

-$reset_link
+$[reset_link]

 You will then receive a follow-up message containing the new password.

@ -20,13 +20,13 @@ You may change that password from your account settings page after logging in.

 The login details are as follows:

-Site Location:	$siteurl
-Login Name:	$email
+Site Location:	$[siteurl]
+Login Name:	$[email]




 Sincerely,
-	$sitename Administrator
+	$[sitename] Administrator

 
--- a/view/en/passchanged_eml.tpl
+++ b/view/en/passchanged_eml.tpl
@ -1,5 +1,5 @@

-Dear $username,
+Dear $[username],
 	Your password has been changed as requested. Please retain this 
 information for your records (or change your password immediately to 
 something that you will remember).
@ -7,14 +7,14 @@ something that you will remember).

 Your login details are as follows:

-Site Location:	$siteurl
-Login Name:	$email
-Password:	$new_password
+Site Location:	$[siteurl]
+Login Name:	$[email]
+Password:	$[new_password]

 You may change that password from your account settings page after logging in.


 Sincerely,
-	$sitename Administrator
+	$[sitename] Administrator

 
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
@ -1,12 +1,12 @@

-Dear $username,
-	Thank you for registering at $sitename. Your account has been created. 
+Dear $[username],
+	Thank you for registering at $[sitename]. Your account has been created. 
 The login details are as follows:


-Site Location:	$siteurl
-Login Name:	$email
-Password:	$password
+Site Location:	$[siteurl]
+Login Name:	$[email]
+Password:	$[password]

 You may change your password from your account "Settings" page after logging 
 in.
@ -26,9 +26,9 @@ If you are new and do not know anybody here, they may help
 you to make some new and interesting friends.  


-Thank you and welcome to $sitename.
+Thank you and welcome to $[sitename].

 Sincerely,
-	$sitename Administrator
+	$[sitename] Administrator

 
--- a/view/en/register_verify_eml.tpl
+++ b/view/en/register_verify_eml.tpl
@ -1,25 +1,25 @@

-A new user registration request was received at $sitename which requires 
+A new user registration request was received at $[sitename] which requires 
 your approval. 


 The login details are as follows:

-Full Name:	$username
-Site Location:	$siteurl
-Login Name:	$email
+Full Name:	$[username]
+Site Location:	$[siteurl]
+Login Name:	$[email]


 To approve this request please visit the following link:


-$siteurl/regmod/allow/$hash 
+$[siteurl]/regmod/allow/$[hash] 


 To deny the request and remove the account, please visit:


-$siteurl/regmod/deny/$hash
+$[siteurl]/regmod/deny/$[hash]


 Thank you.
--- a/view/en/request_notify_eml.tpl
+++ b/view/en/request_notify_eml.tpl
@ -1,17 +1,17 @@

-Dear $myname,
+Dear $[myname],

-You have just received a connection request at $sitename 
+You have just received a connection request at $[sitename] 

-from '$requestor'.
+from '$[requestor]'.

-You may visit their profile at $url.
+You may visit their profile at $[url].

 Please login to your site to view the complete introduction 
 and approve or ignore/cancel the request.

-$siteurl
+$[siteurl]

 Regards,

-	$sitename administrator
+	$[sitename] administrator
--- a/view/eo/messages.po
+++ b/view/eo/messages.po
--- a/view/eo/strings.php
+++ b/view/eo/strings.php
--- a/view/es/messages.po
+++ b/view/es/messages.po
@ -3136,7 +3136,7 @@ msgstr "Cuentas abandonadas después de x días"

 #: ../../mod/admin.php:313
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 "No gastará recursos del sistema creando encuestas desde sitios externos para"
--- a/view/es/strings.php
+++ b/view/es/strings.php
@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Tamaño máximo de la imagen";
 $a->strings["Register policy"] = "Política de registros";
 $a->strings["Register text"] = "Términos";
 $a->strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "No gastará recursos del sistema creando encuestas desde sitios externos para cuentas abandonadas. Introduzca 0 para ningún límite temporal.";
 $a->strings["Allowed friend domains"] = "Dominios amigos permitidos";
 $a->strings["Allowed email domains"] = "Dominios de correo permitidos";
 $a->strings["Block public"] = "Bloqueo público";
--- a/view/filebrowser.tpl
+++ b/view/filebrowser.tpl
@ -0,0 +1,84 @@
+<!DOCTYPE html>
+<html>
+	<head>
+	<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js"></script>
+	<style>
+		.panel_wrapper div.current{.overflow: auto; height: auto!important; }
+		.filebrowser.path { font-family: fixed; font-size: 10px; background-color: #f0f0ee; height:auto; overflow:auto;}
+		.filebrowser.path a { border-left: 1px solid #C0C0AA; background-color: #E0E0DD; display: block; float:left; padding: 0.3em 1em;}
+		.filebrowser ul{ list-style-type: none; padding:0px; }
+		.filebrowser.folders a { display: block; padding: 0.3em }
+		.filebrowser.folders a:hover { background-color: #f0f0ee; }
+		.filebrowser.files.image { overflow: auto; height: auto; }
+		.filebrowser.files.image img { height:50px;}
+		.filebrowser.files.image li { display: block; padding: 5px; float: left; }
+		.filebrowser.files.image span { display: none;}
+		.filebrowser.files.file img { height:16px; vertical-align: bottom;}
+		.filebrowser.files a { display: block;  padding: 0.3em}
+		.filebrowser.files a:hover { background-color: #f0f0ee; }
+		.filebrowser a { text-decoration: none; }
+	</style>
+	<script>
+		var FileBrowserDialogue = {
+			init : function () {
+				// Here goes your code for setting your custom things onLoad.
+			},
+			mySubmit : function (URL) {
+				//var URL = document.my_form.my_field.value;
+				var win = tinyMCEPopup.getWindowArg("window");
+
+				// insert information now
+				win.document.getElementById(tinyMCEPopup.getWindowArg("input")).value = URL;
+
+				// are we an image browser
+				if (typeof(win.ImageDialog) != "undefined") {
+					// we are, so update image dimensions...
+					if (win.ImageDialog.getImageData)
+						win.ImageDialog.getImageData();
+
+					// ... and preview if necessary
+					if (win.ImageDialog.showPreviewImage)
+						win.ImageDialog.showPreviewImage(URL);
+				}
+
+				// close popup window
+				tinyMCEPopup.close();
+			}
+		}
+
+		tinyMCEPopup.onInit.add(FileBrowserDialogue.init, FileBrowserDialogue);
+	</script>
+	</head>
+	<body>
+	
+	<div class="tabs">
+		<ul >
+			<li class="current"><span>FileBrowser</span></li>
+		</ul>
+	</div>
+	<div class="panel_wrapper">
+
+		<div id="general_panel" class="panel current">
+			<div class="filebrowser path">
+				{{ for $path as $p }}<a href="$p.0">$p.1</a>{{ endfor }}
+			</div>
+			<div class="filebrowser folders">
+				<ul>
+					{{ for $folders as $f }}<li><a href="$f.0/">$f.1</a></li>{{ endfor }}
+				</ul>
+			</div>
+			<div class="filebrowser files $type">
+				<ul>
+				{{ for $files as $f }}
+					<li><a href="#" onclick="FileBrowserDialogue.mySubmit('$f.0'); return false;"><img src="$f.2"><span>$f.1</span></a></li>
+				{{ endfor }}
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="mceActionPanel">
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
+	</div>	
+	</body>
+	
+</html>
--- a/view/fr/messages.po
+++ b/view/fr/messages.po
@ -3111,7 +3111,7 @@ msgstr "Les comptes sont abandonnés après x jours"

 #: ../../mod/admin.php:313
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 "Pour ne pas gaspiller les ressources système, on cesse d'interroger les "
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Taille maximale des images";
 $a->strings["Register policy"] = "Politique d'inscription";
 $a->strings["Register text"] = "Texte d'inscription";
 $a->strings["Accounts abandoned after x days"] = "Les comptes sont abandonnés après x jours";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Pour ne pas gaspiller les ressources système, on cesse d'interroger les sites distants pour les comptes abandonnés. Mettre 0 pour désactiver cette fonction.";
 $a->strings["Allowed friend domains"] = "Domaines autorisés";
 $a->strings["Allowed email domains"] = "Domaines courriel autorisés";
 $a->strings["Block public"] = "Interdire la publication globale";
--- a/view/it/messages.po
+++ b/view/it/messages.po
@ -3104,7 +3104,7 @@ msgstr "Account abbandonati dopo x giorni"

 #: ../../mod/admin.php:313
 msgid ""
-"Will not waste system resources polling external sites for abandonded "
+"Will not waste system resources polling external sites for abandoned "
 "accounts. Enter 0 for no time limit."
 msgstr ""
 "Non spreca risorse di sistema controllando siti esterni per gli account "
--- a/view/it/strings.php
+++ b/view/it/strings.php
@ -674,7 +674,7 @@ $a->strings["Maximum image size"] = "Massima dimensione immagini";
 $a->strings["Register policy"] = "Politica di registrazione";
 $a->strings["Register text"] = "Testo registrazione";
 $a->strings["Accounts abandoned after x days"] = "Account abbandonati dopo x giorni";
-$a->strings["Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
+$a->strings["Will not waste system resources polling external sites for abandoned accounts. Enter 0 for no time limit."] = "Non spreca risorse di sistema controllando siti esterni per gli account abbandonati. Immettere 0 per nessun limite di tempo.";
 $a->strings["Allowed friend domains"] = "Domini amici consentiti";
 $a->strings["Allowed email domains"] = "Domini email consentiti";
 $a->strings["Block public"] = "Blocca pagine pubbliche";
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@ -26,7 +26,7 @@ function initEditor(cb){
 			mode : "specific_textareas",
 			editor_selector: $editselect,
 			auto_focus: "profile-jot-text",
-			plugins : "bbcode,paste,autoresize",
+			plugins : "bbcode,paste,autoresize, inlinepopups",
 			theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
 			theme_advanced_buttons2 : "",
 			theme_advanced_buttons3 : "",
@ -44,6 +44,7 @@ function initEditor(cb){
 			convert_urls: false,
 			content_css: "$baseurl/view/custom_tinymce.css",
 			theme_advanced_path : false,
+			file_browser_callback : "fcFileBrowser",
 			setup : function(ed) {
 				cPopup = null;
 				ed.onKeyDown.add(function(ed,e) {
--- a/view/theme/diabook-aerith/admin_users.tpl
+++ b/view/theme/diabook-aerith/admin_users.tpl
@ -0,0 +1,89 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
--- a/view/theme/diabook-aerith/ch_directory_item.tpl
+++ b/view/theme/diabook-aerith/ch_directory_item.tpl
@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>
--- a/view/theme/diabook-aerith/comment_item.tpl
+++ b/view/theme/diabook-aerith/comment_item.tpl
@ -12,13 +12,13 @@
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/communityhome.tpl
@ -42,13 +42,6 @@ $nv.search
 {{ endif }}
 </div>

-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>
-
 <div id="close_lastusers">
 {{ if $lastusers_title }}
 <h3>$lastusers_title<a id="close_lastusers_icon" onClick="close_lastusers()" class="icon close_box" title="close"></a></h3>
--- a/view/theme/diabook-aerith/config.php
+++ b/view/theme/diabook-aerith/config.php
@ -11,8 +11,9 @@ function theme_content(&$a){
 	
 	$font_size = get_pconfig(local_user(), 'diabook-aerith', 'font_size' );
 	$line_height = get_pconfig(local_user(), 'diabook-aerith', 'line_height' );
+	$resolution = get_pconfig(local_user(), 'diabook-aerith', 'resolution' );
 	
-	return diabook_form($a,$font_size, $line_height);
+	return diabook_form($a,$font_size, $line_height,$resolution);
 }

 function theme_post(&$a){
@ -22,6 +23,7 @@ function theme_post(&$a){
 	if (isset($_POST['diabook-aerith-settings-submit'])){
 		set_pconfig(local_user(), 'diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
 		set_pconfig(local_user(), 'diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
+		set_pconfig(local_user(), 'diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);	
 	}
 }

@ -29,33 +31,43 @@ function theme_post(&$a){
 function theme_admin(&$a){
 	$font_size = get_config('diabook-aerith', 'font_size' );
 	$line_height = get_config('diabook-aerith', 'line_height' );
+	$resolution = get_config('diabook-aerith', 'resolution' );
 	
-	return diabook_form($a,$font_size, $line_height);
+	return diabook_form($a,$font_size, $line_height,$resolution);
 }

 function theme_admin_post(&$a){
 	if (isset($_POST['diabook-aerith-settings-submit'])){
 		set_config('diabook-aerith', 'font_size', $_POST['diabook-aerith_font_size']);
 		set_config('diabook-aerith', 'line_height', $_POST['diabook-aerith_line_height']);
+		set_config('diabook-aerith', 'resolution', $_POST['diabook-aerith_resolution']);
 	}
 }


-function diabook_form(&$a, $font_size, $line_height){
+function diabook_form(&$a, $font_size, $line_height, $resolution){
 	$line_heights = array(
-		"1.4"=>"1.4",
 		"1.3"=>"1.3",
+		"---"=>"---",
+		"1.5"=>"1.5",		
+		"1.4"=>"1.4",
 		"1.2"=>"1.2",
 		"1.1"=>"1.1",
 	);
 	
 	$font_sizes = array(
+		'13'=>'13',
+		"---"=>"---",
+		"15"=>"15",
 		'14'=>'14',
 		'13.5'=>'13.5',		
-		'13'=>'13',
 		'12.5'=>'12.5',
 		'12'=>'12',
 		);
+	$resolutions = array(
+		'normal'=>'normal',
+		'wide'=>'wide',		
+		);
 	
 	
 	
@ -66,6 +78,7 @@ function diabook_form(&$a, $font_size, $line_height){
 		'$title' => t("Theme settings"),
 		'$font_size' => array('diabook-aerith_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
 		'$line_height' => array('diabook-aerith_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+		'$resolution' => array('diabook-aerith_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
 	));
 	return $o;
 }
--- a/view/theme/diabook-aerith/directory_item.tpl
+++ b/view/theme/diabook-aerith/directory_item.tpl
@ -7,4 +7,5 @@
 			</a>
 		</div>
 	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
 </div>
--- a/view/theme/diabook-aerith/fpostit/README
+++ b/view/theme/diabook-aerith/fpostit/README
@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
--- a/view/theme/diabook-aerith/fpostit/fpostit.js
+++ b/view/theme/diabook-aerith/fpostit/fpostit.js
@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
--- a/view/theme/diabook-aerith/fpostit/fpostit.php
+++ b/view/theme/diabook-aerith/fpostit/fpostit.php
@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
--- a/view/theme/diabook-aerith/fpostit/friendika-32.png
+++ b/view/theme/diabook-aerith/fpostit/friendika-32.png
--- a/view/theme/diabook-aerith/group_side.tpl
+++ b/view/theme/diabook-aerith/group_side.tpl
@ -25,5 +25,10 @@
 			{{ endfor }}
 		</ul>
 	</div>
+	 {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>	

--- a/view/theme/diabook-aerith/icons/block.png
+++ b/view/theme/diabook-aerith/icons/block.png
--- a/view/theme/diabook-aerith/jot.tpl
+++ b/view/theme/diabook-aerith/jot.tpl
@ -14,6 +14,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
 		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
--- a/view/theme/diabook-aerith/login.tpl
+++ b/view/theme/diabook-aerith/login.tpl
@ -0,0 +1,33 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>	
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@ -26,6 +26,7 @@
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
+
 			{{ endif }}
 			
 			{{ if $nav.messages }}
@ -35,8 +36,6 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
 			</li>		
@ -63,6 +62,8 @@
 		</li>		
 		{{ endif }}	
 		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
@ -82,13 +83,13 @@
 			</ul>		
 		</li>
 		
+		
 		{{ if $nav.directory }}
 		<li id="nav-directory-link" class="nav-menu $sel.directory">
 			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 		</li>
 		{{ endif }}
 		
-		
 		{{ if $nav.apps }}
 			<li id="nav-apps-link" class="nav-menu $sel.apps">
 				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
@ -100,7 +101,7 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.settings }}
+      {{ if $nav.home }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
 				<span id="home-update" class="nav-notify"></span></a>
@ -137,9 +138,10 @@
 </nav>


-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-aerith/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-aerith/icons/bluebug.png" title="report bugs for the theme diabook-aerith"/></a></div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+



--- a/view/theme/diabook-aerith/nets.tpl
+++ b/view/theme/diabook-aerith/nets.tpl
@ -1,11 +1,15 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
+<div id="profile_side">
+	<h3 style="margin-left: 2px;">$title</h3>
 	<div id="nets-desc">$desc</div>
   
-	<ul class="nets-ul">
-	<li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
--- a/view/theme/diabook-aerith/screenshot.png
+++ b/view/theme/diabook-aerith/screenshot.png
--- a/view/theme/diabook-aerith/style-network-wide.css
+++ b/view/theme/diabook-aerith/style-network-wide.css
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@ -1064,6 +1064,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
@ -1389,7 +1393,7 @@ transition: all 0.2s ease-in-out;

 .wall-item-container .wall-item-content img {
  max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
  display: table-cell;
@ -2357,7 +2361,7 @@ a.mail-list-link {
 }

 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
        margin-left: 10px;
--- a/view/theme/diabook-aerith/style-profile-wide.css
+++ b/view/theme/diabook-aerith/style-profile-wide.css
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@ -1367,7 +1367,7 @@ transition: all 0.2s ease-in-out;

 .wall-item-container .wall-item-content img {
  max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
  display: table-cell;
@ -2331,7 +2331,7 @@ a.mail-list-link {
 }

 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
        margin-left: 10px;
--- a/view/theme/diabook-aerith/style-wide.css
+++ b/view/theme/diabook-aerith/style-wide.css
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@ -169,13 +169,17 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  


 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
@ -428,6 +432,12 @@ body {
  margin: 50px auto auto;
  display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
  font-size: 1.1em;
 }
@ -1231,7 +1241,7 @@ aside #likes a:hover{
  margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@ -1935,7 +1945,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
  margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
    
  	 border-radius: 5px 5px 5px 5px;
    font-weight: bold;
@ -2618,16 +2628,39 @@ a.mail-list-link {
 }

 .vevent {
-        border: 1px solid #CCCCCC;
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
 }
-.vevent .event-description, .vevent .event-location {
+.vevent .event-location {
        margin-left: 10px;
        margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
 }
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+

 #new-event-link {
        margin-bottom: 10px;
@ -2641,7 +2674,7 @@ a.mail-list-link {
 }

 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
        margin-right: 15px;
 }

@ -2654,7 +2687,6 @@ a.mail-list-link {
 .event-start .dtstart, .event-end .dtend {
        float: right;
 }
-
 .event-list-date {
        margin-bottom: 10px;
 }
--- a/view/theme/diabook-aerith/style.php
+++ b/view/theme/diabook-aerith/style.php
@ -1,24 +1,42 @@
 <?php
 	$line_height=false;
 	$diabook_font_size=false;
+	$resolution=false;
 	$site_line_height = get_config("diabook-aerith","line_height");
 	$site_diabook_font_size = get_config("diabook-aerith", "font_size" );
+	$site_resolution = get_config("diabook-aerith", "resolution" );
+	
 	
 	if (local_user()) {
 		$line_height = get_pconfig(local_user(), "diabook-aerith","line_height");
 		$diabook_font_size = get_pconfig(local_user(), "diabook-aerith", "font_size");
+		$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
 	}
 	
 	if ($line_height===false) $line_height=$site_line_height;
 	if ($line_height===false) $line_height="1.3";
 	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
 	if ($diabook_font_size===false) $diabook_font_size="13";
+	if ($resolution===false) $resolution=$site_resolution;
+	if ($resolution===false) $resolution="normal";
 	
 	
+	if($resolution == "normal") {	
 	if (file_exists("$THEMEPATH/style.css")){
 		echo file_get_contents("$THEMEPATH/style.css");
 	}

+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
 	if($diabook_font_size == "14"){
 		echo "
 			.wall-item-container .wall-item-content {
@ -74,6 +92,17 @@
  					}
 		";
 	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
 	if($line_height == "1.4"){
 		echo "
 			.wall-item-container .wall-item-content {
@ -118,3 +147,131 @@
  					}
 		";
 	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/style-wide.css");
+	}
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@ -3,19 +3,21 @@
 /*
 * Name: Diabook-aerith
 * Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.020)
 * Author: 
 */


 //print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.018)";
+$diabook_version = "Diabook-aerith (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);


 //change css on network and profilepages
 $cssFile = null;
-
+$resolution=false;
+$resolution = get_pconfig(local_user(), "diabook-aerith", "resolution");
+if ($resolution===false) $resolution="normal";

 /**
 * prints last community activity
@ -36,7 +38,7 @@ function diabook_aerith_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@ -115,7 +117,7 @@ function diabook_aerith_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
@ -131,14 +133,7 @@ function diabook_aerith_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
 	
-   $aside['$fostitJS'] = $fostitJS;
   
   //nav FIND FRIENDS
 	if(local_user()) {
@ -206,13 +201,7 @@ function diabook_aerith_community_info(){
 	
 	$aside['$con_services'] = $con_services;
   //end connectable services
-   //postit
-   $postit = array();
-	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
   
-	$aside['$postit'] = $postit;
-   //end postit
  
   //get_baseurl	      
   $url = $a->get_baseurl($ssl_state);   
@ -255,14 +244,15 @@ if ($a->argv[0] === "network" && local_user()){

 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_aerith_community_info();
 	
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-network-wide.css";}
 	}
 }

@ -270,12 +260,13 @@ if ($a->argv[0] === "network" && local_user()){

 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_aerith_community_info();
 	
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-aerith/style-profile-wide.css";}
 	}
 }

@ -369,7 +360,7 @@ $a->page['htmlhead'] .= '
 </script>';


-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@ -394,10 +385,6 @@ $("right_aside").ready(function(){
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie("close_postit") == "1") 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
 	if($.cookie("close_lastusers") == "1") 
 		{
@ -436,10 +423,6 @@ function close_friends(){
 $.cookie("close_friends","1", { expires: 365, path: "/" });
 };

-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
 
 function close_lastusers(){
 document.getElementById( "close_lastusers" ).style.display = "none";
@ -464,7 +447,6 @@ function restore_boxes(){
 	$.cookie("close_helpers","2", { expires: 365, path: "/" });
 	$.cookie("close_services","2", { expires: 365, path: "/" });
 	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_postit","2", { expires: 365, path: "/" });
 	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
 	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
--- a/view/theme/diabook-aerith/theme_settings.tpl
+++ b/view/theme/diabook-aerith/theme_settings.tpl
@ -2,6 +2,8 @@

 {{inc field_select.tpl with $field=$line_height}}{{endinc}}

+{{inc field_select.tpl with $field=$resolution}}{{endinc}}
+
 <div class="settings-submit-wrapper">
 	<input type="submit" value="$submit" class="settings-submit" name="diabook-aerith-settings-submit" />
 </div>
--- a/view/theme/diabook-blue/admin_users.tpl
+++ b/view/theme/diabook-blue/admin_users.tpl
@ -0,0 +1,89 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
--- a/view/theme/diabook-blue/ch_directory_item.tpl
+++ b/view/theme/diabook-blue/ch_directory_item.tpl
@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>
--- a/view/theme/diabook-blue/comment_item.tpl
+++ b/view/theme/diabook-blue/comment_item.tpl
@ -12,13 +12,13 @@
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
--- a/view/theme/diabook-blue/communityhome.tpl
+++ b/view/theme/diabook-blue/communityhome.tpl
@ -42,12 +42,6 @@ $nv.search
 {{ endif }}
 </div>

-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>

 <div id="close_lastusers">
 {{ if $lastusers_title }}
--- a/view/theme/diabook-blue/config.php
+++ b/view/theme/diabook-blue/config.php
@ -11,8 +11,9 @@ function theme_content(&$a){
 	
 	$font_size = get_pconfig(local_user(), 'diabook-blue', 'font_size' );
 	$line_height = get_pconfig(local_user(), 'diabook-blue', 'line_height' );
+	$resolution = get_pconfig(local_user(), 'diabook-blue', 'resolution' );
 	
-	return diabook_form($a,$font_size, $line_height);
+	return diabook_form($a,$font_size, $line_height,$resolution);
 }

 function theme_post(&$a){
@ -22,6 +23,7 @@ function theme_post(&$a){
 	if (isset($_POST['diabook-blue-settings-submit'])){
 		set_pconfig(local_user(), 'diabook-blue', 'font_size', $_POST['diabook-blue_font_size']);
 		set_pconfig(local_user(), 'diabook-blue', 'line_height', $_POST['diabook-blue_line_height']);
+		set_pconfig(local_user(), 'diabook-blue', 'resolution', $_POST['diabook-blue_resolution']);	
 	}
 }

@ -29,33 +31,43 @@ function theme_post(&$a){
 function theme_admin(&$a){
 	$font_size = get_config('diabook-blue', 'font_size' );
 	$line_height = get_config('diabook-blue', 'line_height' );
+	$resolution = get_config('diabook-blue', 'resolution' );
 	
-	return diabook_form($a,$font_size, $line_height);
+	return diabook_form($a,$font_size, $line_height,$resolution);
 }

 function theme_admin_post(&$a){
 	if (isset($_POST['diabook-blue-settings-submit'])){
 		set_config('diabook-blue', 'font_size', $_POST['diabook-blue_font_size']);
 		set_config('diabook-blue', 'line_height', $_POST['diabook-blue_line_height']);
+		set_config('diabook-blue', 'resolution', $_POST['diabook-blue_resolution']);
 	}
 }


-function diabook_form(&$a, $font_size, $line_height){
+function diabook_form(&$a, $font_size, $line_height, $resolution){
 	$line_heights = array(
-		"1.4"=>"1.4",
 		"1.3"=>"1.3",
+		"---"=>"---",
+		"1.5"=>"1.5",		
+		"1.4"=>"1.4",
 		"1.2"=>"1.2",
 		"1.1"=>"1.1",
 	);
 	
 	$font_sizes = array(
+		'13'=>'13',
+		"---"=>"---",
+		"15"=>"15",
 		'14'=>'14',
 		'13.5'=>'13.5',		
-		'13'=>'13',
 		'12.5'=>'12.5',
 		'12'=>'12',
 		);
+	$resolutions = array(
+		'normal'=>'normal',
+		'wide'=>'wide',		
+		);
 	
 	
 	
@ -66,6 +78,7 @@ function diabook_form(&$a, $font_size, $line_height){
 		'$title' => t("Theme settings"),
 		'$font_size' => array('diabook-blue_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
 		'$line_height' => array('diabook-blue_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+		'$resolution' => array('diabook-blue_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
 	));
 	return $o;
 }
--- a/view/theme/diabook-blue/directory_item.tpl
+++ b/view/theme/diabook-blue/directory_item.tpl
@ -7,4 +7,5 @@
 			</a>
 		</div>
 	</div>
+	<div class="contact-name" id="directory-name-$id">$name</div>
 </div>
--- a/view/theme/diabook-blue/fpostit/README
+++ b/view/theme/diabook-blue/fpostit/README
@ -1,8 +0,0 @@
-fpostit
-
-original author: Devlon Duthied
-
-see his blog posting:
-http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/
-
-original published at github https://github.com/duthied/Friendika-Bookmarklet
--- a/view/theme/diabook-blue/fpostit/fpostit.js
+++ b/view/theme/diabook-blue/fpostit/fpostit.js
@ -1,6 +0,0 @@
-javascript: (function() {
-    					the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()"
--- a/view/theme/diabook-blue/fpostit/fpostit.php
+++ b/view/theme/diabook-blue/fpostit/fpostit.php
@ -1,135 +0,0 @@
-<?php
-if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = '';
-if (!isset($_COOKIE['username'])) $_COOKIE['username'] = '';
-if (!isset($_COOKIE['password'])) $_COOKIE['password'] = '';
-if (!isset($hostname)) $hostname = '';
-if (!isset($username)) $username = '';
-
-
-if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-	setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300);
-	setcookie("password", $_POST["friendika_password"], time()+60*60*24*300);
-}
-
-?>
-<html>
-<head>
-	<style>
-		body {
-			font-family: arial, Helvetica,sans-serif;
-			margin: 0px;
-		}
-		.wrap1 {
-			padding: 2px 5px;
-			background-color: #000;
-			margin-bottom: 10px;
-		}
-		.wrap2 {
-			margin-left: 10px;
-			font-size: 12px;
-		}
-		.logo {
-			margin-left: 3px;
-			margin-right: 5px;
-			float: left;
-		}
-		h2 {
-			color: #ffffff;
-		}
-		.error {
-			background-color: #FFFF66;
-			font-size: 12px;
-			margin-left: 10px;
-		}
-	</style>
-</head>
-
-<body>
-<?php
-
-if (isset($_GET['title'])) {
-	$title = $_GET['title'];
-}
-if (isset($_GET['text'])) {
-	$text = $_GET['text'];
-}
-if (isset($_GET['url'])) {
-	$url = $_GET['url'];
-}
-
-if ((isset($title)) && (isset($text)) && (isset($url))) {
-	$content = "$title\nsource:$url\n\n$text";
-} else {
-	$content = $_POST['content'];
-}
-
-if (isset($_POST['submit'])) {
-	
-	if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) {
-		$acctname = $_POST["friendika_acct_name"];
-		$tmp_account_array = explode("@", $acctname);
-		if (isset($tmp_account_array[1])) {
-			$username = $tmp_account_array[0];
-			$hostname = $tmp_account_array[1];
-		}
-		$password = $_POST["friendika_password"];
-		$content = $_POST["content"];
-
-		$url = "http://" . $hostname . '/api/statuses/update';
-		$data = array('status' => $content);
-		
-		// echo "posting to: $url<br/>";
-
-		$c = curl_init();
-		curl_setopt($c, CURLOPT_URL, $url); 
-		curl_setopt($c, CURLOPT_USERPWD, "$username:$password");
-		curl_setopt($c, CURLOPT_POSTFIELDS, $data); 
-		curl_setopt($c, CURLOPT_RETURNTRANSFER, true); 
-		curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
-		$c_result = curl_exec($c); 
-		if(curl_errno($c)){ 
-			$error = curl_error($c);
-			showForm($error, $content);
-		}
-		
-		curl_close($c);
-		if (!isset($error)) {
-			echo '<script language="javascript" type="text/javascript">window.close();</script>';
-		}
-		
-	} else {
-		$error = "Missing account name and/or password...try again please";
-		showForm($error, $content);
-	}
-	
-} else {
-	showForm(null, $content);
-}
-
-function showForm($error, $content) {
-	$username_cookie = $_COOKIE['username'];
-	$password_cookie = $_COOKIE['password'];
-	
-	echo <<<EOF
-	<div class='wrap1'>
-		<h2><img class='logo' src='friendika-32.png' align='middle';/>
-		Friendica Bookmarklet</h2>
-	</div>
-
-	<div class="wrap2">
-		<form method="post" action="{$_SERVER['PHP_SELF']}">
-			Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)<br /><br />
-			Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br />
-			Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br />
-			<textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br />
-			<input type="submit" value="PostIt!" name="submit" />&nbsp;&nbsp;<span class='error'>$error</span>
-		</form>
-		<p></p>
-	</div>
-EOF;
-	
-}
-?>
-
-</body>
-</html>
--- a/view/theme/diabook-blue/fpostit/friendika-32.png
+++ b/view/theme/diabook-blue/fpostit/friendika-32.png
--- a/view/theme/diabook-blue/group_side.tpl
+++ b/view/theme/diabook-blue/group_side.tpl
@ -25,5 +25,10 @@
 			{{ endfor }}
 		</ul>
 	</div>
+	 {{ if $ungrouped }}
+  <div id="sidebar-ungrouped">
+  <a href="nogroup">$ungrouped</a>
+  </div>
+  {{ endif }}
 </div>	

--- a/view/theme/diabook-blue/icons/block.png
+++ b/view/theme/diabook-blue/icons/block.png
--- a/view/theme/diabook-blue/jot.tpl
+++ b/view/theme/diabook-blue/jot.tpl
@ -14,6 +14,7 @@
 		<input type="hidden" name="post_id" value="$post_id" />
 		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
+		<div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="$placeholdercategory" value="$category" class="jothidden" style="display:none" /></div>				
 		<div id="character-counter" class="grey"></div>		
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
 		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
--- a/view/theme/diabook-blue/login.tpl
+++ b/view/theme/diabook-blue/login.tpl
@ -0,0 +1,33 @@
+
+<form action="$dest_url" method="post" >
+	<input type="hidden" name="auth-params" value="login" />
+
+	<div id="login_standard">
+	{{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+	{{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
+	</div>
+	
+	{{ if $openid }}
+			<div id="login_openid">
+			{{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
+			</div>
+	{{ endif }}
+	
+	<div id="login-submit-wrapper" >
+		<input type="submit" name="submit" id="login-submit-button" value="$login" />
+	</div>
+	
+   <div id="login-extra-links">
+		{{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
+        <a href="lostpass" title="$lostpass" id="lost-password-link" >$lostlink</a>
+	</div>	
+	
+	{{ for $hiddens as $k=>$v }}
+		<input type="hidden" name="$k" value="$v" />
+	{{ endfor }}
+	
+	
+</form>
+
+
+<script type="text/javascript"> $(document).ready(function() { $("#id_$lname.0").focus();} );</script>
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@ -26,6 +26,7 @@
 					<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
 				</ul>
 			</li>	
+
 			{{ endif }}
 			
 			{{ if $nav.messages }}
@ -35,8 +36,6 @@
 				<span id="mail-update" class="nav-notify"></span></a>
 				<ul id="nav-messages-menu" class="menu-popup">
 					<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
-					<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
 					<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
 				</ul>
 			</li>		
@ -63,6 +62,8 @@
 		</li>		
 		{{ endif }}	
 		
+		<li  style="width: 1%; height: 1px;float: right;"></li>	
+		
 		<li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
 			<ul id="nav-site-menu" class="menu-popup">
 				{{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}				
@ -82,13 +83,13 @@
 			</ul>		
 		</li>
 		
+		
 		{{ if $nav.directory }}
 		<li id="nav-directory-link" class="nav-menu $sel.directory">
 			<a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 		</li>
 		{{ endif }}
 		
-		
 		{{ if $nav.apps }}
 			<li id="nav-apps-link" class="nav-menu $sel.apps">
 				<a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
@ -100,7 +101,7 @@
 			</li>	
 		{{ endif }}		
 		
-      {{ if $nav.settings }}
+      {{ if $nav.home }}
 			<li id="nav-home-link" class="nav-menu $sel.home">
 				<a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
 				<span id="home-update" class="nav-notify"></span></a>
@ -143,6 +144,7 @@



+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
 	<li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
--- a/view/theme/diabook-blue/nets.tpl
+++ b/view/theme/diabook-blue/nets.tpl
@ -1,11 +1,15 @@
-<div id="nets-sidebar" class="widget">
-	<h3>$title</h3>
+<div id="profile_side">
+	<h3 style="margin-left: 2px;">$title</h3>
 	<div id="nets-desc">$desc</div>
   
-	<ul class="nets-ul">
-	<li class="tool"><a style="text-decoration: none;" href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a></li>
+	<ul class="menu-profile-side">
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $sel_all }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a style="text-decoration: none;" href="$base" class="menu-profile-list-item">$all</a></li>
 	{{ for $nets as $net }}
-	<li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+	<li class="menu-profile-list">
+	<span class="menu-profile-icon {{ if $net.selected }}group_selected{{else}}group_unselected{{ endif }}"></span>	
+	<a href="$base?nets=$net.ref" class="menu-profile-list-item">$net.name</a></li>
 	{{ endfor }}
 	</ul>
 </div>
--- a/view/theme/diabook-blue/screenshot.png
+++ b/view/theme/diabook-blue/screenshot.png
--- a/view/theme/diabook-blue/style-network-wide.css
+++ b/view/theme/diabook-blue/style-network-wide.css
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@ -1030,6 +1030,10 @@ aside #search-text {
 border-top-right-radius: 15px;
 border-bottom-right-radius: 15px;
 border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+  -moz-border-top-colors: #999;
+  -moz-border-left-colors: #999;
+  -moz-border-right-colors: #dbdbdb;
 }
 aside #side-follow-url {
 	width: 150px;
@ -1351,7 +1355,7 @@ transition: all 0.2s ease-in-out;

 .wall-item-container .wall-item-content img {
  max-width: 400px; 
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
  display: table-cell;
@ -2318,7 +2322,7 @@ a.mail-list-link {
 }

 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
        margin-left: 10px;
--- a/view/theme/diabook-blue/style-profile-wide.css
+++ b/view/theme/diabook-blue/style-profile-wide.css
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@ -1334,7 +1334,7 @@ transition: all 0.2s ease-in-out;

 .wall-item-container .wall-item-content img {
  max-width: 400px;
-  max-height: 400px;
+
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
  display: table-cell;
@ -2298,7 +2298,7 @@ a.mail-list-link {
 }

 .vevent {
-        border: 1px solid #CCCCCC;
+
 }
 .vevent .event-description, .vevent .event-location {
        margin-left: 10px;
--- a/view/theme/diabook-blue/style-wide.css
+++ b/view/theme/diabook-blue/style-wide.css
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@ -168,13 +168,17 @@
 			  }
 .edit    {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png"); 
 			  display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-			  
+.icon.block   {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim  {background-image: url("../../../view/theme/diabook/icons/block.png"); 
+			  display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop 	{ background-image: url("../../../view/theme/diabook/icons/drop.png");
+			  display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}			  
 			  


 .article	{ background-position: -50px  0px;}
 /*.audio 		{ background-position: -70px  0px;}*/
-.block 		{ background-position: -90px  0px;}
 /*.drop 		{ background-position: -110px 0px;}*/
 /*.drophide 	{ background-position: -130px 0px;}*/
 /*.edit 		{ background-position: -150px 0px;}*/
@ -427,6 +431,12 @@ body {
  margin: 50px auto auto;
  display: table;
 }
+
+#jappix_mini {
+right: 45px !important;
+}
+
+
 h4 {
  font-size: 1.1em;
 }
@ -1191,7 +1201,7 @@ aside #side-peoplefind-url {
  margin-right: 20px;		
 	}
 #login-submit-wrapper{
-  margin-top: 20px;
+margin-bottom: 15px;
 	}
 .group_selected {
  background: url("../../../view/theme/diabook/icons/selected.png") no-repeat left center;
@ -1893,7 +1903,7 @@ body .pageheader{
 #jot #jot-tools li.loading img {
  margin-top: 10px;
 }
-#profile-jot-form #jot-title {
+#profile-jot-form #jot-title, #profile-jot-form #jot-category {
    
  	 border-radius: 5px 5px 5px 5px;
    font-weight: bold;
@ -2575,16 +2585,39 @@ a.mail-list-link {
 }

 .vevent {
-        border: 1px solid #CCCCCC;
+position: relative;
+width: 400px;
+padding: 20px;
+padding-top: 10px;
+margin: 0 0px;
+margin-bottom: 10px;
+background-color: white;
+-webkit-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+-moz-box-shadow: 0 0 4px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
+box-shadow: 0 0 5px rgba(0, 0, 0, 0.2), inset 0 0 50px rgba(0, 0, 0, 0.1);
 }
-.vevent .event-description, .vevent .event-location {
+.vevent .event-location {
        margin-left: 10px;
        margin-right: 10px;
 }
-.vevent .event-start {
-        margin-left: 10px;
-        margin-right: 10px;
+.vevent .event-description {
+margin-left: 10px;
+margin-right: 10px;
+font-size: 1.1em;
+font-weight: bolder;
 }
+.vevent .event-start, .vevent .event-end {
+
+margin-right: 20px;
+margin-bottom: 2px;
+margin-top: 2px;
+font-size: 0.9em;
+text-align: left;
+}
+.event-start .dtstart, .event-end .dtend {
+float: right;
+}
+

 #new-event-link {
        margin-bottom: 10px;
@ -2598,7 +2631,7 @@ a.mail-list-link {
 }

 .event-description:before {
-        content: url('../../../images/calendar.png');
+        content:   url("../../../view/theme/diabook/icons/events2.png") !important;
        margin-right: 15px;
 }

--- a/view/theme/diabook-blue/style.php
+++ b/view/theme/diabook-blue/style.php
@ -1,24 +1,42 @@
 <?php
 	$line_height=false;
 	$diabook_font_size=false;
+	$resolution=false;
 	$site_line_height = get_config("diabook-blue","line_height");
 	$site_diabook_font_size = get_config("diabook-blue", "font_size" );
+	$site_resolution = get_config("diabook-blue", "resolution" );
+	
 	
 	if (local_user()) {
 		$line_height = get_pconfig(local_user(), "diabook-blue","line_height");
 		$diabook_font_size = get_pconfig(local_user(), "diabook-blue", "font_size");
+		$resolution = get_pconfig(local_user(), "diabook-blue", "resolution");
 	}
 	
 	if ($line_height===false) $line_height=$site_line_height;
 	if ($line_height===false) $line_height="1.3";
 	if ($diabook_font_size===false) $diabook_font_size=$site_diabook_font_size;
 	if ($diabook_font_size===false) $diabook_font_size="13";
+	if ($resolution===false) $resolution=$site_resolution;
+	if ($resolution===false) $resolution="normal";
 	
 	
+	if($resolution == "normal") {	
 	if (file_exists("$THEMEPATH/style.css")){
 		echo file_get_contents("$THEMEPATH/style.css");
 	}

+   if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}	
 	if($diabook_font_size == "14"){
 		echo "
 			.wall-item-container .wall-item-content {
@ -74,6 +92,17 @@
  					}
 		";
 	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
 	if($line_height == "1.4"){
 		echo "
 			.wall-item-container .wall-item-content {
@ -118,3 +147,131 @@
  					}
 		";
 	}
+	}
+	
+	if($resolution == "wide") {	
+	if (file_exists("$THEMEPATH/style-wide.css")){
+		echo file_get_contents("$THEMEPATH/style-wide.css");
+	}
+	if($diabook_font_size == "15"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 15px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 15px;
+  					}
+		";
+	}
+	if($diabook_font_size == "14"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 14px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 14px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "13"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 13px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 13px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12.5px;
+  					}
+		";
+	}
+	if($diabook_font_size == "12"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					font-size: 12px;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+  					font-size: 12px;
+  					}
+		";
+	}
+	if($line_height == "1.5"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.5;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.5;
+  					}
+		";
+	}	
+	if($line_height == "1.4"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.4;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.4;
+  					}
+		";
+	}
+	if($line_height == "1.3"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.3;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.3;
+  					}
+		";
+	}
+	if($line_height == "1.2"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.2;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.2;
+  					}
+		";
+	}
+	if($line_height == "1.1"){
+		echo "
+			.wall-item-container .wall-item-content {
+  					line-height: 1.1;
+  					}
+  					
+			.wall-item-photo-container .wall-item-content {
+ 					line-height: 1.1;
+  					}
+		";
+	}
+	}
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@ -3,18 +3,20 @@
 /*
 * Name: Diabook-blue
 * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.020)
 * Author: 
 */


 //print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.018)";
+$diabook_version = "Diabook-blue (Version: 1.020)";
 $a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);

 //change css on network and profilepages
 $cssFile = null;
-
+$resolution=false;
+$resolution = get_pconfig(local_user(), "diabook-blue", "resolution");
+if ($resolution===false) $resolution="normal";

 /**
 * prints last community activity
@ -35,7 +37,7 @@ function diabook_blue_community_info(){
 		0,
 		9
 	);
-	$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+	$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 	if(count($r)) {
 		$photo = 'thumb';
 		foreach($r as $rr) {
@ -114,7 +116,7 @@ function diabook_blue_community_info(){
 				dbesc(t('Profile Photos'))
 				);
 		if(count($r)) {
-		$tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+		$tpl = file_get_contents( dirname(__file__).'/ch_directory_item.tpl');
 		foreach($r as $rr) {
 			$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
 			$photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
@ -130,14 +132,6 @@ function diabook_blue_community_info(){
 		}
 	}
 	
-	$fostitJS = "javascript: (function() {
-    					the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook-blue/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text));
-    						a_funct = function() {
-        						if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url};
-    							if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} 
-    							else {a_funct()}})()" ;
-  
-   $aside['$fostitJS'] = $fostitJS;
   
   //nav FIND FRIENDS
 	if(local_user()) {
@ -205,13 +199,7 @@ function diabook_blue_community_info(){
 	
 	$aside['$con_services'] = $con_services;
   //end connectable services
-   //postit
-   $postit = array();
-	$postit['title'] = Array("", t('PostIt to Friendica'), t('Post to Friendica'), "");
-	$postit['text'] = Array("", t(' from anywhere by bookmarking this Link.'), "", "");
   
-	$aside['$postit'] = $postit;
-   //end postit
  
   //get_baseurl   
   $url = $a->get_baseurl($ssl_state);   
@ -254,14 +242,15 @@ if ($a->argv[0] === "network" && local_user()){

 	}
 	
-	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_postit'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
+	$ccCookie = $_COOKIE['close_pages'] + $_COOKIE['close_helpers'] + $_COOKIE['close_services'] + $_COOKIE['close_friends'] + $_COOKIE['close_lastusers'] + $_COOKIE['close_lastphotos'] + $_COOKIE['close_lastlikes'];
 	
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_blue_community_info();
 	
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network-wide.css";}
 	}
 }

@ -269,12 +258,13 @@ if ($a->argv[0] === "network" && local_user()){

 //right_aside at profile pages
 if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname']){
-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 	// COMMUNITY
 	diabook_blue_community_info();
 	
 	// CUSTOM CSS
-	$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";
+	if($resolution == "normal") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css";}
+	if($resolution == "wide") {$cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile-wide.css";}
 	}
 }

@ -369,7 +359,7 @@ $a->page['htmlhead'] .= '
 </script>';


-	if($ccCookie != "8") {
+	if($ccCookie != "7") {
 $a->page['htmlhead'] .= '
 <script>
 $("right_aside").ready(function(){
@ -394,10 +384,6 @@ $("right_aside").ready(function(){
 		document.getElementById( "close_friends" ).style.display = "none";
 			};
 	
-	if($.cookie("close_postit") == "1") 
-		{
-		document.getElementById( "close_postit" ).style.display = "none";
-			};
 			
 	if($.cookie("close_lastusers") == "1") 
 		{
@ -436,11 +422,6 @@ function close_friends(){
 $.cookie("close_friends","1", { expires: 365, path: "/" });
 };
 
-function close_postit(){
- document.getElementById( "close_postit" ).style.display = "none";
- $.cookie("close_postit","1", { expires: 365, path: "/" });
- };
- 
 function close_lastusers(){
 document.getElementById( "close_lastusers" ).style.display = "none";
 $.cookie("close_lastusers","1", { expires: 365, path: "/" });
@ -464,7 +445,6 @@ function restore_boxes(){
 	$.cookie("close_helpers","2", { expires: 365, path: "/" });
 	$.cookie("close_services","2", { expires: 365, path: "/" });
 	$.cookie("close_friends","2", { expires: 365, path: "/" });
-	$.cookie("close_postit","2", { expires: 365, path: "/" });
 	$.cookie("close_lastusers","2", { expires: 365, path: "/" });
 	$.cookie("close_lastphotos","2", { expires: 365, path: "/" });
 	$.cookie("close_lastlikes","2", { expires: 365, path: "/" });
--- a/view/theme/diabook-blue/theme_settings.tpl
+++ b/view/theme/diabook-blue/theme_settings.tpl
@ -2,6 +2,8 @@

 {{inc field_select.tpl with $field=$line_height}}{{endinc}}

+{{inc field_select.tpl with $field=$resolution}}{{endinc}}
+
 <div class="settings-submit-wrapper">
 	<input type="submit" value="$submit" class="settings-submit" name="diabook-blue-settings-submit" />
 </div>
--- a/view/theme/diabook-red/admin_users.tpl
+++ b/view/theme/diabook-red/admin_users.tpl
@ -0,0 +1,89 @@
+<script>
+	function confirm_delete(uname){
+		return confirm( "$confirm_delete".format(uname));
+	}
+	function confirm_delete_multi(){
+		return confirm("$confirm_delete_multi");
+	}
+	function selectall(cls){
+		$("."+cls).attr('checked','checked');
+		return false;
+	}
+</script>
+<div id='adminpage'>
+	<h1>$title - $page</h1>
+	
+	<form action="$baseurl/admin/users" method="post">
+        <input type='hidden' name='form_security_token' value='$form_security_token'>
+		
+		<h3>$h_pending</h3>
+		{{ if $pending }}
+			<table id='pending'>
+				<thead>
+				<tr>
+					{{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+			{{ for $pending as $u }}
+				<tr>
+					<td class="created">$u.created</td>
+					<td class="name">$u.name</td>
+					<td class="email">$u.email</td>
+					<td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+					<td class="tools">
+						<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+						<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+					</td>
+				</tr>
+			{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>			
+		{{ else }}
+			<p>$no_pending</p>
+		{{ endif }}
+	
+	
+		
+	
+		<h3>$h_users</h3>
+		{{ if $users }}
+			<table id='users'>
+				<thead>
+				<tr>
+					<th></th>
+					{{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+					<th></th>
+					<th></th>
+				</tr>
+				</thead>
+				<tbody>
+				{{ for $users as $u }}
+					<tr>
+						<td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+						<td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+						<td class='email'>$u.email</td>
+						<td class='register_date'>$u.register_date</td>
+						<td class='login_date'>$u.login_date</td>
+						<td class='lastitem_date'>$u.lastitem_date</td>
+						<td class='login_date'>$u.page-flags</td>
+						<td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+						<td class="tools" style="width:60px;">
+							<a href="$baseurl/admin/users/block/$u.uid?t=$form_security_token" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+							<a href="$baseurl/admin/users/delete/$u.uid?t=$form_security_token" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+						</td>
+					</tr>
+				{{ endfor }}
+				</tbody>
+			</table>
+			<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+			<div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>						
+		{{ else }}
+			NO USERS?!?
+		{{ endif }}
+	</form>
+</div>
--- a/view/theme/diabook-red/ch_directory_item.tpl
+++ b/view/theme/diabook-red/ch_directory_item.tpl
@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+	<div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+		<div class="directory-photo" id="directory-photo-$id" >
+			<a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+				<img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+			</a>
+		</div>
+	</div>
+</div>
--- a/view/theme/diabook-red/comment_item.tpl
+++ b/view/theme/diabook-red/comment_item.tpl
@ -12,13 +12,13 @@
 				</div>
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);tautogrow($id)" onBlur="commentClose(this,$id);" >$comment</textarea>
-				<a class="icon bb-image" onclick="insertFormatting('$comment','img',$id);">img</a>	
-				<a class="icon bb-url" onclick="insertFormatting('$comment','url',$id);">url</a>
-				<a class="icon bb-video" onclick="insertFormatting('$comment','video',$id);">video</a>														
-				<a class="icon underline" onclick="insertFormatting('$comment','u',$id);">u</a>
-				<a class="icon italic" onclick="insertFormatting('$comment','i',$id);">i</a>
-				<a class="icon bold" onclick="insertFormatting('$comment','b',$id);">b</a>
-				<a class="icon quote" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
+				<a class="icon bb-image" style="cursor: pointer;" onclick="insertFormatting('$comment','img',$id);">img</a>	
+				<a class="icon bb-url" style="cursor: pointer;" onclick="insertFormatting('$comment','url',$id);">url</a>
+				<a class="icon bb-video" style="cursor: pointer;" onclick="insertFormatting('$comment','video',$id);">video</a>														
+				<a class="icon underline" style="cursor: pointer;" onclick="insertFormatting('$comment','u',$id);">u</a>
+				<a class="icon italic" style="cursor: pointer;" onclick="insertFormatting('$comment','i',$id);">i</a>
+				<a class="icon bold" style="cursor: pointer;" onclick="insertFormatting('$comment','b',$id);">b</a>
+				<a class="icon quote" style="cursor: pointer;" onclick="insertFormatting('$comment','quote',$id);">quote</a>																			
 				{{ if $qcomment }}
 					<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
 					<option value=""></option>
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/communityhome.tpl
@ -42,12 +42,6 @@ $nv.search
 {{ endif }}
 </div>

-<div id="close_postit">
-{{ if $lastusers_title }}
-<h3>$postit.title.1<a id="close_postit_icon" onClick="close_postit()" class="icon close_box" title="close"></a></h3>
-<div style="padding-left: 10px;font-size: 12px;"><span ><a href="$fostitJS" title="PostIt">$postit.title.2</a>$postit.text.1</span></div>
-{{ endif }}
-</div>

 <div id="close_lastusers">
 {{ if $lastusers_title }}
--- a/view/theme/diabook-red/config.php
+++ b/view/theme/diabook-red/config.php
@ -11,8 +11,9 @@ function theme_content(&$a){
 	
 	$font_size = get_pconfig(local_user(), 'diabook-red', 'font_size' );
 	$line_height = get_pconfig(local_user(), 'diabook-red', 'line_height' );
+	$resolution = get_pconfig(local_user(), 'diabook-red', 'resolution' );
 	
-	return diabook_form($a,$font_size, $line_height);
+	return diabook_form($a,$font_size, $line_height,$resolution);
 }

 function theme_post(&$a){
@ -22,6 +23,7 @@ function theme_post(&$a){
 	if (isset($_POST['diabook-blue-settings-submit'])){
 		set_pconfig(local_user(), 'diabook-red', 'font_size', $_POST['diabook-red_font_size']);
 		set_pconfig(local_user(), 'diabook-red', 'line_height', $_POST['diabook-red_line_height']);
+		set_pconfig(local_user(), 'diabook-red', 'resolution', $_POST['diabook-red_resolution']);	
 	}
 }

@ -29,33 +31,43 @@ function theme_post(&$a){
 function theme_admin(&$a){
 	$font_size = get_config('diabook-red', 'font_size' );
 	$line_height = get_config('diabook-red', 'line_height' );
+	$resolution = get_config('diabook-red', 'resolution' );
 	
-	return diabook_form($a,$font_size, $line_height);
+	return diabook_form($a,$font_size, $line_height,$resolution);
 }

 function theme_admin_post(&$a){
 	if (isset($_POST['diabook-red-settings-submit'])){
 		set_config('diabook-red', 'font_size', $_POST['diabook-red_font_size']);
 		set_config('diabook-red', 'line_height', $_POST['diabook-red_line_height']);
+		set_config('diabook-red', 'resolution', $_POST['diabook-red_resolution']);
 	}
 }


-function diabook_form(&$a, $font_size, $line_height){
+function diabook_form(&$a, $font_size, $line_height, $resolution){
 	$line_heights = array(
-		"1.4"=>"1.4",
 		"1.3"=>"1.3",
+		"---"=>"---",
+		"1.5"=>"1.5",		
+		"1.4"=>"1.4",
 		"1.2"=>"1.2",
 		"1.1"=>"1.1",
 	);
 	
 	$font_sizes = array(
+		'13'=>'13',
+		"---"=>"---",
+		"15"=>"15",
 		'14'=>'14',
 		'13.5'=>'13.5',		
-		'13'=>'13',
 		'12.5'=>'12.5',
 		'12'=>'12',
 		);
+	$resolutions = array(
+		'normal'=>'normal',
+		'wide'=>'wide',		
+		);
 	
 	
 	
@ -66,6 +78,7 @@ function diabook_form(&$a, $font_size, $line_height){
 		'$title' => t("Theme settings"),
 		'$font_size' => array('diabook-red_font_size', t('Set font-size for posts and comments'), $font_size, '', $font_sizes),
 		'$line_height' => array('diabook-red_line_height', t('Set line-height for posts and comments'), $line_height, '', $line_heights),
+		'$resolution' => array('diabook-red_resolution', t('Set resolution for middle column'), $resolution, '', $resolutions),	
 	));
 	return $o;
 }
--- a/Show More
+++ b/Show More