From 35128ef2c95d8f76afd3edea594623cc265da673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Mon, 27 Feb 2012 22:01:17 +0000
Subject: [PATCH 01/19] Avoid a Notice

---
 include/event.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/event.php b/include/event.php
index 4a9a9a004..29202badd 100755
--- a/include/event.php
+++ b/include/event.php
@@ -163,7 +163,7 @@ function bbtoevent($s) {
 	if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
 		$ev['adjust'] = $match[1];
 	$match = '';
-	$ev['nofinish'] = (($ev['start'] && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
+	$ev['nofinish'] = (((x($ev, 'start') && $ev['start']) && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
 	return $ev;
 
 }

From e33c2b8f89d0174b6b2bcbd31d8d89c2ee664340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Mon, 27 Feb 2012 22:08:00 +0000
Subject: [PATCH 02/19] Avoid a Notice

---
 include/items.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/include/items.php b/include/items.php
index 7d52571c2..5452dfbda 100755
--- a/include/items.php
+++ b/include/items.php
@@ -682,7 +682,7 @@ function item_store($arr,$force_parent = false) {
 		unset($arr['dsprsig']);
 	}
 
-	if($arr['gravity'])
+	if(x($arr, 'gravity'))
 		$arr['gravity'] = intval($arr['gravity']);
 	elseif($arr['parent-uri'] === $arr['uri'])
 		$arr['gravity'] = 0;
@@ -800,6 +800,8 @@ function item_store($arr,$force_parent = false) {
 				logger('item_store: item parent was not found - ignoring item');
 				return 0;
 			}
+			
+			$parent_deleted = 0;
 		}
 	}
 

From 7c30fca98186538eff731519bdd0c76527237192 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Mon, 27 Feb 2012 22:17:57 +0000
Subject: [PATCH 03/19] Avoid a Notice

---
 boot.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/boot.php b/boot.php
index 54f318e5e..c89dae27c 100755
--- a/boot.php
+++ b/boot.php
@@ -1335,7 +1335,7 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){
 		array(
 			'label' => t('Profile'),
 			'url' 	=> $url.'/?tab=profile',
-			'sel'	=> (($tab=='profile')?'active':''),
+			'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
 		),
 		array(
 			'label' => t('Photos'),

From e55d13c2b4425183dde64da8ca27c794f4c04900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Tue, 28 Feb 2012 12:56:16 +0000
Subject: [PATCH 04/19] Avoid a notice

---
 include/items.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/items.php b/include/items.php
index 5452dfbda..5268dfc1d 100755
--- a/include/items.php
+++ b/include/items.php
@@ -742,6 +742,7 @@ function item_store($arr,$force_parent = false) {
 
 	if($arr['parent-uri'] === $arr['uri']) {
 		$parent_id = 0;
+		$parent_deleted = 0;
 		$allow_cid = $arr['allow_cid'];
 		$allow_gid = $arr['allow_gid'];
 		$deny_cid  = $arr['deny_cid'];

From 1204210c69eade767bb19af5a5a18cee4a9db215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Tue, 28 Feb 2012 13:01:58 +0000
Subject: [PATCH 05/19]  wasn't actually changed before

---
 include/conversation.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 53369cf20..6f0dc3687 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -976,8 +976,8 @@ function conv_sort($arr,$order) {
 		usort($parents,'sort_thr_commented');
 
 	if(count($parents))
-		foreach($parents as $x) 
-			$x['children'] = array();
+		foreach($parents as $i=>$_x) 
+			$parents[$i]['children'] = array();
 
 	foreach($arr as $x) {
 		if($x['id'] != $x['parent']) {

From f48556cbc08c0600e256f5964a553c666ee66372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Tue, 28 Feb 2012 13:40:41 +0000
Subject: [PATCH 06/19] contact.network is used later to check if a direct link
 or a redirect by /redir/contactid should be used

---
 mod/message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/message.php b/mod/message.php
index 4b494e906..e293d62d9 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -176,7 +176,7 @@ function message_content(&$a) {
 			$a->set_pager_total($r[0]['total']);
 	
 		$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, 
-			`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
+			`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`  
 			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
 			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC  LIMIT %d , %d ",
 			intval(local_user()),

From 36a1a43f06dc2a0d55463c83154cce55fa3948ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Tue, 28 Feb 2012 13:42:12 +0000
Subject: [PATCH 07/19] Avoid notices

---
 boot.php             | 2 +-
 mod/dfrn_request.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index c89dae27c..e39504e11 100755
--- a/boot.php
+++ b/boot.php
@@ -1209,7 +1209,7 @@ function current_theme(){
 	$a = get_app();
 	
 	$system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : '');
-	$theme_name = ((is_array($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
+	$theme_name = ((isset($_SESSION) && x($_SESSION,'theme')) ? $_SESSION['theme'] : $system_theme);
 	
 	if($theme_name && file_exists('view/theme/' . $theme_name . '/style.css'))
 		return($theme_name);
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index bc159137d..452fec166 100755
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -43,7 +43,7 @@ function dfrn_request_post(&$a) {
 		return;
 
 
-	if($_POST['cancel']) {
+	if(x($_POST, 'cancel')) {
 		goaway(z_root());
 	} 
 

From 5bb8ed4b8b5310acc8556ef2fba7b3958284b2a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Tue, 28 Feb 2012 21:56:42 +0000
Subject: [PATCH 08/19] Mostly some checks in order to avoid Notices; 1 real
 bugfix in /mod/network.php

---
 include/conversation.php       |  5 +++--
 include/oembed.php             |  2 +-
 include/template_processor.php |  9 +++++++--
 mod/network.php                | 14 ++++++++------
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/include/conversation.php b/include/conversation.php
index 9f564843e..bd9b11bee 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -373,7 +373,8 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						$comments[$item['parent']] = 1;
 					else
 						$comments[$item['parent']] += 1;
-				}
+				} elseif(! x($comments,$item['parent'])) 
+					$comments[$item['parent']] = 0; // avoid notices later on
 			}
 
 			// map all the like/dislike activities for each parent item 
@@ -921,7 +922,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 	$o .= replace_macros($tpl,array(
 		'$return_path' => $a->cmd,
 		'$action' =>  $a->get_baseurl().'/item',
-		'$share' => (($x['button']) ? $x['button'] : t('Share')),
+		'$share' => (x($x,'button') ? $x['button'] : t('Share')),
 		'$upload' => t('Upload photo'),
 		'$shortupload' => t('upload photo'),
 		'$attach' => t('Attach file'),
diff --git a/include/oembed.php b/include/oembed.php
index 5c3c595f5..52068efc7 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -62,7 +62,7 @@ function oembed_fetch_url($embedurl){
 	
 function oembed_format_object($j){
 	$embedurl = $j->embedurl;
-	$jhtml = oembed_iframe($j->embedurl,$j->width,$j->height );
+	$jhtml = oembed_iframe($j->embedurl,(isset($j->width) ? $j->width : null), (isset($j->height) ? $j->height : null) );
 	$ret="<span class='oembed ".$j->type."'>";
 	switch ($j->type) {
 		case "video": {
diff --git a/include/template_processor.php b/include/template_processor.php
index 28c3f07dd..7a4cba64e 100755
--- a/include/template_processor.php
+++ b/include/template_processor.php
@@ -92,8 +92,13 @@
 		 */
 		private function _replcb_for($args){
 			$m = array_map('trim', explode(" as ", $args[2]));
-			list($keyname, $varname) = explode("=>",$m[1]);
-			if (is_null($varname)) { $varname=$keyname; $keyname=""; }
+			$x = explode("=>",$m[1]);
+			if (count($x) == 1) {
+				$varname = $x[0];
+				$keyname = "";
+			} else {
+				list($keyname, $varname) = $x;
+			}
 			if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
 			//$vals = $this->r[$m[0]];
 			$vals = $this->_get_var($m[0]);
diff --git a/mod/network.php b/mod/network.php
index 03a671b61..26265f5a0 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -44,7 +44,7 @@ function network_init(&$a) {
 	}
 	
 	$a->page['aside'] .= group_side('network','network',true,$group_id);
-	$a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(($_GET['nets']) ? $_GET['nets'] : ''));
+	$a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
 	$a->page['aside'] .= saved_searches($search);
 
 }
@@ -130,15 +130,15 @@ function network_content(&$a, $update = 0) {
 		$starred_active = 'active';
 	}
 	
-	if($_GET['bmark']) {
+	if(x($_GET,'bmark')) {
 		$bookmarked_active = 'active';
 	}
 
-	if($_GET['conv']) {
+	if(x($_GET,'conv')) {
 		$conv_active = 'active';
 	}
 
-	if($_GET['spam']) {
+	if(x($_GET,'spam')) {
 		$spam_active = 'active';
 	}
 
@@ -245,7 +245,7 @@ function network_content(&$a, $update = 0) {
 		$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
 
 	if(! $update) {
-		if(group) {
+		if($group) {
 			if(($t = group_public_members($group)) && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {
 				notice( sprintf( tt('Warning: This group contains %s member from an insecure network.',
 									'Warning: This group contains %s members from an insecure network.',
@@ -492,7 +492,9 @@ function network_content(&$a, $update = 0) {
 
 			$items = conv_sort($items,$ordering);
 
-		}	
+		} else {
+			$items = array();
+		}
 	}
 
 

From 02a9fd5dc1d1d9e848e2f406f2e13c4cf0ce228b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Sat, 3 Mar 2012 10:44:34 +0000
Subject: [PATCH 09/19] A 'PHP Fatal error:  Call to a member function
 getElementsByTagName() on a non-object in mod/parse_url.php on line 191'
 occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't
 be link to in the editor therefore.

---
 mod/parse_url.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/parse_url.php b/mod/parse_url.php
index e0b378f68..27dac4d5d 100755
--- a/mod/parse_url.php
+++ b/mod/parse_url.php
@@ -188,7 +188,7 @@ function parse_url_content(&$a) {
 
 	if(! $text) {
 		logger('parsing meta');
-		$items = $domhead->getElementsByTagName('meta');
+		$items = (isset($domhead) && is_object($domhead) ? $domhead->getElementsByTagName('meta') : null);
 		if($items) {
 			foreach($items as $item) {
 				$property = $item->getAttribute('property');

From 59766b944c9ea3a45b1d7e8593f7bb5d4a0b8445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Mon, 12 Mar 2012 20:17:37 +0000
Subject: [PATCH 10/19] Some security against XSRF-attacks

---
 include/security.php            | 46 +++++++++++++++++++++++++
 mod/profile_photo.php           | 18 ++++++----
 mod/profiles.php                | 26 ++++++++++++---
 mod/settings.php                | 59 +++++++++++++++++++++------------
 view/cropbody.tpl               |  1 +
 view/profile_edit.tpl           |  5 +--
 view/profile_listing_header.tpl |  2 +-
 view/profile_photo.tpl          |  1 +
 view/settings.tpl               |  2 +-
 view/settings_addons.tpl        |  1 +
 view/settings_connectors.tpl    |  1 +
 view/settings_oauth.tpl         |  5 +--
 view/settings_oauth_edit.tpl    |  2 ++
 13 files changed, 131 insertions(+), 38 deletions(-)

diff --git a/include/security.php b/include/security.php
index 8c536b656..6ea515bff 100755
--- a/include/security.php
+++ b/include/security.php
@@ -288,3 +288,49 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
 }
 
 
+/*
+ * Functions used to protect against Cross-Site Request Forgery
+ * The security token has to base on at least one value that an attacker can't know - here it's the session ID and the private key.
+ * In this implementation, a security token is reusable (if the user submits a form, goes back and resubmits the form, maybe with small changes;
+ * or if the security token is used for ajax-calls that happen several times), but only valid for a certain amout of time (3hours).
+ * The "typename" seperates the security tokens of different types of forms. This could be relevant in the following case:
+ *    A security token is used to protekt a link from CSRF (e.g. the "delete this profile"-link).
+ *    If the new page contains by any chance external elements, then the used security token is exposed by the referrer.
+ *    Actually, important actions should not be triggered by Links / GET-Requests at all, but somethimes they still are,
+ *    so this mechanism brings in some damage control (the attacker would be able to forge a request to a form of this type, but not to forms of other types).
+ */ 
+function get_form_security_token($typename = "") {
+	$a = get_app();
+	
+	$timestamp = time();
+	$sec_hash = hash('whirlpool', $a->user["guid"] . $a->user["prvkey"] . session_id() . $timestamp . $typename);
+	
+	return $timestamp . "." . $sec_hash;
+}
+
+function check_form_security_token($typename = "", $formname = 'form_security_token') {
+	if (!x($_REQUEST, $formname)) return false;
+	$hash = $_REQUEST[$formname];
+	
+	$max_livetime = 10800; // 3 hours
+	
+	$a = get_app();
+	
+	$x = explode(".", $hash);
+	if (time() > (IntVal($x[0]) + $max_livetime)) return false;
+	
+	$sec_hash = hash('whirlpool', $a->user["guid"] . $a->user["prvkey"] . session_id() . $x[0] . $typename);
+	
+	return ($sec_hash == $x[1]);
+}
+
+function check_form_security_std_err_msg() {
+	return t('The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before subitting it.') . EOL;
+}
+function check_form_security_token_redirectOnErr($err_redirect, $typename = "", $formname = 'form_security_token') {
+	if (!check_form_security_token($typename, $formname)) {
+		$a = get_app();
+		notice( check_form_security_std_err_msg() );
+		goaway($a->get_baseurl() . $err_redirect );
+	}
+}
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index e3dbdaf39..d1fd08eba 100755
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -15,11 +15,13 @@ function profile_photo_init(&$a) {
 
 function profile_photo_post(&$a) {
 
-        if(! local_user()) {
-                notice ( t('Permission denied.') . EOL );
-                return;
-        }
-
+	if(! local_user()) {
+		notice ( t('Permission denied.') . EOL );
+		return;
+	}
+	
+	check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+        
 	if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
 
 		// phase 2 - we have finished cropping
@@ -148,7 +150,9 @@ function profile_photo_content(&$a) {
 			notice( t('Permission denied.') . EOL );
 			return;
 		};
-			
+		
+		check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
+        
 		$resource_id = $a->argv[2];
 		//die(":".local_user());
 		$r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
@@ -203,6 +207,7 @@ function profile_photo_content(&$a) {
 			'$lbl_upfile' => t('Upload File:'),
 			'$title' => t('Upload Profile Photo'),
 			'$submit' => t('Upload'),
+			'$form_security_token' => get_form_security_token("profile_photo"),
 			'$select' => sprintf('%s %s', t('or'), ($newuser) ? '<a href="' . $a->get_baseurl() . '">' . t('skip this step') . '</a>' : '<a href="'. $a->get_baseurl() . '/photos/' . $a->user['nickname'] . '">' . t('select a photo from your photo albums') . '</a>')
 		));
 
@@ -218,6 +223,7 @@ function profile_photo_content(&$a) {
 			'$image_url' => $a->get_baseurl() . '/photo/' . $filename,
 			'$title' => t('Crop Image'),
 			'$desc' => t('Please adjust the image cropping for optimum viewing.'),
+			'$form_security_token' => get_form_security_token("profile_photo"),
 			'$done' => t('Done Editing')
 		));
 		return $o;
diff --git a/mod/profiles.php b/mod/profiles.php
index ccd7d5474..b307a2d43 100755
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -21,6 +21,9 @@ function profiles_post(&$a) {
 			notice( t('Profile not found.') . EOL);
 			return;
 		}
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_edit');
+		
 		$is_default = (($orig[0]['is-default']) ? 1 : 0);
 
 		$profile_name = notags(trim($_POST['profile_name']));
@@ -240,6 +243,8 @@ function profiles_content(&$a) {
 			goaway($a->get_baseurl() . '/profiles');
 			return; // NOTREACHED
 		}
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_drop', 't');
 
 		// move every contact using this profile as their default to the user default
 
@@ -264,6 +269,8 @@ function profiles_content(&$a) {
 
 
 	if(($a->argc > 1) && ($a->argv[1] === 'new')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
@@ -291,10 +298,13 @@ function profiles_content(&$a) {
 		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
 			goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
+		
 		goaway($a->get_baseurl() . '/profiles');
-	}		 
+	} 
 
 	if(($a->argc > 2) && ($a->argv[1] === 'clone')) {
+		
+		check_form_security_token_redirectOnErr('/profiles', 'profile_clone', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
@@ -330,9 +340,11 @@ function profiles_content(&$a) {
 		info( t('New profile created.') . EOL);
 		if(count($r3) == 1)
 			goaway($a->get_baseurl() . '/profiles/' . $r3[0]['id']);
-	goaway($a->get_baseurl() . '/profiles');
-	return; // NOTREACHED
-	}		 
+		
+		goaway($a->get_baseurl() . '/profiles');
+		
+		return; // NOTREACHED
+	}
 
 
 	if(($a->argc > 1) && (intval($a->argv[1]))) {
@@ -371,6 +383,9 @@ function profiles_content(&$a) {
 		$is_default = (($r[0]['is-default']) ? 1 : 0);
 		$tpl = get_markup_template("profile_edit.tpl");
 		$o .= replace_macros($tpl,array(
+			'$form_security_token' => get_form_security_token("profile_edit"),
+			'$profile_clone_link' => 'profiles/clone/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_clone"),
+			'$profile_drop_link' => 'profiles/drop/' . $r[0]['id'] . '?t=' . get_form_security_token("profile_drop"),
 			'$banner' => t('Edit Profile Details'),
 			'$submit' => t('Submit'),
 			'$viewprof' => t('View this profile'),
@@ -460,7 +475,8 @@ function profiles_content(&$a) {
 			$o .= replace_macros($tpl_header,array(
 				'$header' => t('Edit/Manage Profiles'),
 				'$chg_photo' => t('Change profile photo'),
-				'$cr_new' => t('Create New Profile')
+				'$cr_new' => t('Create New Profile'),
+				'$cr_new_link' => 'profiles/new?t=' . get_form_security_token("profile_new")
 			));
 
 
diff --git a/mod/settings.php b/mod/settings.php
index 2ef582fdf..f42fdb397 100755
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -53,6 +53,8 @@ function settings_post(&$a) {
 	$old_page_flags = $a->user['page-flags'];
 
 	if(($a->argc > 1) && ($a->argv[1] === 'oauth') && x($_POST,'remove')){
+		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+		
 		$key = $_POST['remove'];
 		q("DELETE FROM tokens WHERE id='%s' AND uid=%d",
 			dbesc($key),
@@ -63,6 +65,8 @@ function settings_post(&$a) {
 
 	if(($a->argc > 2) && ($a->argv[1] === 'oauth')  && ($a->argv[2] === 'edit'||($a->argv[2] === 'add')) && x($_POST,'submit')) {
 		
+		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
+		
 		$name   	= ((x($_POST,'name')) ? $_POST['name'] : '');
 		$key		= ((x($_POST,'key')) ? $_POST['key'] : '');
 		$secret		= ((x($_POST,'secret')) ? $_POST['secret'] : '');
@@ -105,13 +109,18 @@ function settings_post(&$a) {
 	}
 
 	if(($a->argc > 1) && ($a->argv[1] == 'addon')) {
+		check_form_security_token_redirectOnErr('/settings/addon', 'settings_addon');
+		
 		call_hooks('plugin_settings_post', $_POST);
 		return;
 	}
 
 	if(($a->argc > 1) && ($a->argv[1] == 'connectors')) {
-
-		if(x($_POST['imap-submit'])) {
+		
+		check_form_security_token_redirectOnErr('/settings/connectors', 'settings_connectors');
+		
+		if(x($_POST, 'imap-submit')) {
+			
 			$mail_server       = ((x($_POST,'mail_server')) ? $_POST['mail_server'] : '');
 			$mail_port         = ((x($_POST,'mail_port')) ? $_POST['mail_port'] : '');
 			$mail_ssl          = ((x($_POST,'mail_ssl')) ? strtolower(trim($_POST['mail_ssl'])) : '');
@@ -185,7 +194,8 @@ function settings_post(&$a) {
 		return;
 	}
 
-
+	check_form_security_token_redirectOnErr('/settings', 'settings');
+	
 	call_hooks('settings_post', $_POST);
 
 	if((x($_POST,'npassword')) || (x($_POST,'confirm'))) {
@@ -460,6 +470,7 @@ function settings_content(&$a) {
 		if(($a->argc > 2) && ($a->argv[2] === 'add')) {
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
+				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$tabs'		=> $tabs,
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Submit'),
@@ -486,6 +497,7 @@ function settings_content(&$a) {
 			
 			$tpl = get_markup_template("settings_oauth_edit.tpl");
 			$o .= replace_macros($tpl, array(
+				'$form_security_token' => get_form_security_token("settings_oauth"),
 				'$tabs'		=> $tabs,
 				'$title'	=> t('Add application'),
 				'$submit'	=> t('Update'),
@@ -500,6 +512,8 @@ function settings_content(&$a) {
 		}
 		
 		if(($a->argc > 3) && ($a->argv[2] === 'delete')) {
+			check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth', 't');
+		
 			$r = q("DELETE FROM clients WHERE client_id='%s' AND uid=%d",
 					dbesc($a->argv[3]),
 					local_user());
@@ -518,6 +532,7 @@ function settings_content(&$a) {
 		
 		$tpl = get_markup_template("settings_oauth.tpl");
 		$o .= replace_macros($tpl, array(
+			'$form_security_token' => get_form_security_token("settings_oauth"),
 			'$baseurl'	=> $a->get_baseurl(),
 			'$title'	=> t('Connected Apps'),
 			'$add'		=> t('Add application'),
@@ -544,6 +559,7 @@ function settings_content(&$a) {
 		
 		$tpl = get_markup_template("settings_addons.tpl");
 		$o .= replace_macros($tpl, array(
+			'$form_security_token' => get_form_security_token("settings_addons"),
 			'$title'	=> t('Plugin Settings'),
 			'$tabs'		=> $tabs,
 			'$settings_addons' => $settings_addons
@@ -586,28 +602,28 @@ function settings_content(&$a) {
 
 	$tpl = get_markup_template("settings_connectors.tpl");
 		$o .= replace_macros($tpl, array(
+			'$form_security_token' => get_form_security_token("settings_connectors"),
+			
 			'$title'	=> t('Connector Settings'),
 			'$tabs'		=> $tabs,
 
-		'$diasp_enabled' => $diasp_enabled,
-		'$ostat_enabled' => $ostat_enabled,
-
-		'$h_imap' => t('Email/Mailbox Setup'),
-		'$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
-		'$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $mail_chk,''),
-		'$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
-		'$mail_server'	=> array('mail_server',  t('IMAP server name:'), $mail_server, ''),
-		'$mail_port'	=> array('mail_port', 	 t('IMAP port:'), $mail_port, ''),
-		'$mail_ssl'		=> array('mail_ssl', 	 t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
-		'$mail_user'	=> array('mail_user',    t('Email login name:'), $mail_user, ''),
-		'$mail_pass'	=> array('mail_pass', 	 t('Email password:'), '', ''),
-		'$mail_replyto'	=> array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
-		'$mail_pubmail'	=> array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
-		'$mail_action'	=> array('mail_action',	 t('Action after import:'), $mail_action, '', array(0=>t('None'), 1=>t('Delete'), 2=>t('Mark as seen'), 3=>t('Move to folder'))),
-		'$mail_movetofolder'	=> array('mail_movetofolder',	 t('Move to folder:'), $mail_movetofolder, ''),
-		'$submit' => t('Submit'),
-
+			'$diasp_enabled' => $diasp_enabled,
+			'$ostat_enabled' => $ostat_enabled,
 
+			'$h_imap' => t('Email/Mailbox Setup'),
+			'$imap_desc' => t("If you wish to communicate with email contacts using this service \x28optional\x29, please specify how to connect to your mailbox."),
+			'$imap_lastcheck' => array('imap_lastcheck', t('Last successful email check:'), $mail_chk,''),
+			'$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
+			'$mail_server'	=> array('mail_server',  t('IMAP server name:'), $mail_server, ''),
+			'$mail_port'	=> array('mail_port', 	 t('IMAP port:'), $mail_port, ''),
+			'$mail_ssl'		=> array('mail_ssl', 	 t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
+			'$mail_user'	=> array('mail_user',    t('Email login name:'), $mail_user, ''),
+			'$mail_pass'	=> array('mail_pass', 	 t('Email password:'), '', ''),
+			'$mail_replyto'	=> array('mail_replyto', t('Reply-to address:'), '', 'Optional'),
+			'$mail_pubmail'	=> array('mail_pubmail', t('Send public posts to all email contacts:'), $mail_pubmail, ''),
+			'$mail_action'	=> array('mail_action',	 t('Action after import:'), $mail_action, '', array(0=>t('None'), 1=>t('Delete'), 2=>t('Mark as seen'), 3=>t('Move to folder'))),
+			'$mail_movetofolder'	=> array('mail_movetofolder',	 t('Move to folder:'), $mail_movetofolder, ''),
+			'$submit' => t('Submit'),
 
 			'$settings_connectors' => $settings_connectors
 		));
@@ -805,6 +821,7 @@ function settings_content(&$a) {
 		'$submit' 	=> t('Submit'),
 		'$baseurl' => $a->get_baseurl(),
 		'$uid' => local_user(),
+		'$form_security_token' => get_form_security_token("settings"),
 		
 		'$nickname_block' => $prof_addr,
 		
diff --git a/view/cropbody.tpl b/view/cropbody.tpl
index c9c0f84de..b484d15bf 100755
--- a/view/cropbody.tpl
+++ b/view/cropbody.tpl
@@ -40,6 +40,7 @@ $desc
 </script>
 
 <form action="profile_photo/$resource" id="crop-image-form" method="post" />
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <input type="hidden" name="cropfinal" value="1" />
 <input type="hidden" name="xstart" id="x1" />
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index 8dab72649..e5c7162d0 100755
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -5,9 +5,9 @@ $default
 <div id="profile-edit-links">
 <ul>
 <li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="$viewprof">$viewprof</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
+<li><a href="$profile_clone_link" id="profile-edit-clone-link" title="$cr_prof">$cl_prof</a></li>
 <li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
+<li><a href="$profile_drop_link" id="profile-edit-drop-link" title="$del_prof" $disabled >$del_prof</a></li>
 
 </ul>
 </div>
@@ -17,6 +17,7 @@ $default
 
 <div id="profile-edit-wrapper" >
 <form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >$lbl_profname </label>
diff --git a/view/profile_listing_header.tpl b/view/profile_listing_header.tpl
index 09e4fc9b2..61a273792 100755
--- a/view/profile_listing_header.tpl
+++ b/view/profile_listing_header.tpl
@@ -3,6 +3,6 @@
 <a href="profile_photo" >$chg_photo</a>
 </p>
 <div id="profile-listing-new-link-wrapper" class="button" >
-<a href="profiles/new" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
+<a href="$cr_new_link" id="profile-listing-new-link" title="$cr_new" >$cr_new</a>
 </div>
 
diff --git a/view/profile_photo.tpl b/view/profile_photo.tpl
index f258b5b86..0b3a1cac1 100755
--- a/view/profile_photo.tpl
+++ b/view/profile_photo.tpl
@@ -1,6 +1,7 @@
 <h1>$title</h1>
 
 <form enctype="multipart/form-data" action="profile_photo" method="post">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <div id="profile-photo-upload-wrapper">
 <label id="profile-photo-upload-label" for="profile-photo-upload">$lbl_upfile </label>
diff --git a/view/settings.tpl b/view/settings.tpl
index 46c737b23..25479b5bf 100755
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -5,7 +5,7 @@ $tabs
 $nickname_block
 
 <form action="settings" id="settings-form" method="post" autocomplete="off" >
-
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 <h3 class="settings-heading">$h_pass</h3>
 
diff --git a/view/settings_addons.tpl b/view/settings_addons.tpl
index 2cbfd17e9..28fca5362 100755
--- a/view/settings_addons.tpl
+++ b/view/settings_addons.tpl
@@ -4,6 +4,7 @@ $tabs
 
 
 <form action="settings/addon" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 $settings_addons
 
diff --git a/view/settings_connectors.tpl b/view/settings_connectors.tpl
index 9493c8bf7..43c0346bb 100755
--- a/view/settings_connectors.tpl
+++ b/view/settings_connectors.tpl
@@ -6,6 +6,7 @@ $tabs
 <div class="connector_statusmsg">$ostat_enabled</div>
 
 <form action="settings/connectors" method="post" autocomplete="off">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
 
 $settings_connectors
 
diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl
index 0de0dbe98..da1398ab9 100755
--- a/view/settings_oauth.tpl
+++ b/view/settings_oauth.tpl
@@ -4,7 +4,8 @@ $tabs
 
 
 <form action="settings/oauth" method="post" autocomplete="off">
-	
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
 	<div id="profile-edit-links">
 		<ul>
 			<li>
@@ -24,7 +25,7 @@ $tabs
 		{{ endif }}
 		{{ if $app.my }}
 		<a href="$baseurl/settings/oauth/edit/$app.client_id" class="icon s22 edit" title="$edit">&nbsp;</a>
-		<a href="$baseurl/settings/oauth/delete/$app.client_id" class="icon s22 delete" title="$delete">&nbsp;</a>
+		<a href="$baseurl/settings/oauth/delete/$app.client_id?t=$form_security_token" class="icon s22 delete" title="$delete">&nbsp;</a>
 		{{ endif }}		
 	</div>
 	{{ endfor }}
diff --git a/view/settings_oauth_edit.tpl b/view/settings_oauth_edit.tpl
index 98b7457aa..d29341386 100755
--- a/view/settings_oauth_edit.tpl
+++ b/view/settings_oauth_edit.tpl
@@ -3,6 +3,8 @@ $tabs
 <h1>$title</h1>
 
 <form method="POST">
+<input type='hidden' name='form_security_token' value='$form_security_token'>
+
 {{ inc field_input.tpl with $field=$name }}{{ endinc }}
 {{ inc field_input.tpl with $field=$key }}{{ endinc }}
 {{ inc field_input.tpl with $field=$secret }}{{ endinc }}

From 5a1e2c32fe4a36b1dbbaa6b224c8ced6cb3358c4 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 12 Mar 2012 17:12:01 -0400
Subject: [PATCH 11/19] Merge branch 'master', remote-tracking branch
 'remotes/upstream/master'

* remotes/upstream/master:
  add lightbox, fixex in css
  more save to file backend
  backend for "save to file" feature

* master:

From 5a4167646553e589cf9647c0e0d0446e3f5fd672 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 13 Mar 2012 04:04:26 -0700
Subject: [PATCH 12/19] initial tag display for categories and save-to-file -
 suitable for testing but needs cleanup, links to delete term,  and theming.

---
 include/text.php | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/include/text.php b/include/text.php
index 011006b76..2663bdeba 100644
--- a/include/text.php
+++ b/include/text.php
@@ -913,6 +913,33 @@ function prepare_body($item,$attach = false) {
 		}
 		$s .= '<div class="clear"></div></div>';
 	}
+	$matches = false;
+	$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
+	if($cnt) {
+		logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG);
+		foreach($matches as $mtch) {
+			if(strlen($x))
+				$x .= ',';
+			$x .= file_tag_decode($mtch[1]);
+		}
+		if(strlen($x))
+			$s .= '<div class="categorytags"><span>' . t('Categories:') . ' </span>' . $x . '</div>'; 
+
+
+	}
+	$matches = false;
+	$x = '';
+	$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
+	if($cnt) {
+		logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG);
+		foreach($matches as $mtch) {
+			if(strlen($x))
+				$x .= ',';
+			$x .= file_tag_decode($mtch[1]);
+		}
+		if(strlen($x) && (local_user() == $item['uid']))
+			$s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>'; 
+	}
 
 
 	$prep_arr = array('item' => $item, 'html' => $s);

From 7868e3897b0f282611f1ccb1715a30a93404ddc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu>
Date: Tue, 13 Mar 2012 21:46:57 +0000
Subject: [PATCH 13/19] In HTML2BBCode: fetch the URL of [EMBED] using
 JavaScript instead of an ajax-call to a php-script. Once there actually is
 embedded Code in the HTML, this function is called after every single
 keypress. Not only is making an ajax-call every keypress bandith intensive -
 it also made typing hard / slow. Making a lot of
 JavaScript-RegExp-Computation every keypress isn't exactly great either, but
 still performs better.

---
 .../plugins/bbcode/editor_plugin_src.js       | 262 ++++++++++--------
 1 file changed, 140 insertions(+), 122 deletions(-)

diff --git a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
index 44d1473a9..183f2bc68 100755
--- a/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
+++ b/library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js
@@ -44,61 +44,79 @@
 		_dfrn_html2bbcode : function(s) {
 			s = tinymce.trim(s);
 
-			function rep(re, str) {
-
-				//modify code to keep stuff intact within [code][/code] blocks
-				//Waitman Gobble NO WARRANTY
-
-
-				var o = new Array();
-				var x = s.split("[code]");
-				var i = 0;
-
-				var si = "";
-				si = x.shift();
-				si = si.replace(re,str);
-				o.push(si);
-
-				for (i = 0; i < x.length; i++) {
-					var no = new Array();
-					var j = x.shift();
-					var g = j.split("[/code]");
-					no.push(g.shift());
-					si = g.shift();
-					si = si.replace(re,str);
-					no.push(si);
-					o.push(no.join("[/code]"));
-				}
-
-				s = o.join("[code]");
-
-			};
-
-
-
-
-			/* oembed */
-			function _h2b_cb(match) {
-				function s_h2b(data) {
-						match = data;
+			function rep(re, str) {
+
+				//modify code to keep stuff intact within [code][/code] blocks
+				//Waitman Gobble NO WARRANTY
+
+
+				var o = new Array();
+				var x = s.split("[code]");
+				var i = 0;
+
+				var si = "";
+				si = x.shift();
+				si = si.replace(re,str);
+				o.push(si);
+
+				for (i = 0; i < x.length; i++) {
+					var no = new Array();
+					var j = x.shift();
+					var g = j.split("[/code]");
+					no.push(g.shift());
+					si = g.shift();
+					si = si.replace(re,str);
+					no.push(si);
+					o.push(no.join("[/code]"));
+				}
+
+				s = o.join("[code]");
+
+			};
+
+
+
+
+			/* oembed */
+			function _h2b_cb(match) {
+				/*
+				function s_h2b(data) {
+						match = data;
 				}
 				$.ajax({
-					type:"POST",
+					type:"POST",
 					url: 'oembed/h2b',
-					data: {text: match},
-					async: false,
-					success: s_h2b,
-					dataType: 'html'
-				});
-				return match;
-			}
+					data: {text: match},
+					async: false,
+					success: s_h2b,
+					dataType: 'html'
+				});
+				*/
+				
+				var f, g, tof = [], tor = [];
+				var find_spanc = /<span [^>]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:<span[^>]*>(.*?)<\/span *>)*.*?)<\/span *>/ig;
+				while (f = find_spanc.exec(match)) {
+					var find_a = /<a([^>]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig;
+					if (g = find_a.exec(f[1])) {
+						var find_href = /href=[\"']([^\"']*)[\"']/ig;
+						var m2 = find_href.exec(g[1]);
+						if (m2[1]) {
+							tof.push(f[0]);
+							tor.push("[EMBED]" + m2[1] + "[/EMBED]");
+						}
+					}
+				}
+				for (var i = 0; i < tof.length; i++) match = match.replace(tof[i], tor[i]);
+				
+				return match;
+			}
 			if (s.indexOf('class="oembed')>=0){
 				//alert("request oembed html2bbcode");
 				s = _h2b_cb(s);
 			}
-			
-			/* /oembed */
-
+			
+			/* /oembed */
+
 
 			// example: <strong> to [b]
 			rep(/<a class=\"bookmark\" href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[bookmark=$1]$2[/bookmark]");
@@ -111,16 +129,16 @@
 			rep(/<img.*?src=\"(.*?)\".*?height=\"(.*?)\".*?width=\"(.*?)\".*?\/>/gi,"[img=$3x$2]$1[/img]");
 			rep(/<img.*?src=\"(.*?)\".*?width=\"(.*?)\".*?height=\"(.*?)\".*?\/>/gi,"[img=$2x$3]$1[/img]");
 			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");
-
-			rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");
-			rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");
-			rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");
-			rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");
-			rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");
-			rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");
-			rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");
-			rep(/<li>(.*?)<\/li>/gi,'[li]$1[/li]');
-
+
+			rep(/<ul class=\"listbullet\" style=\"list-style-type\: circle\;\">(.*?)<\/ul>/gi,"[list]$1[/list]");
+			rep(/<ul class=\"listnone\" style=\"list-style-type\: none\;\">(.*?)<\/ul>/gi,"[list=]$1[/list]");
+			rep(/<ul class=\"listdecimal\" style=\"list-style-type\: decimal\;\">(.*?)<\/ul>/gi,"[list=1]$1[/list]");
+			rep(/<ul class=\"listlowerroman\" style=\"list-style-type\: lower-roman\;\">(.*?)<\/ul>/gi,"[list=i]$1[/list]");
+			rep(/<ul class=\"listupperroman\" style=\"list-style-type\: upper-roman\;\">(.*?)<\/ul>/gi,"[list=I]$1[/list]");
+			rep(/<ul class=\"listloweralpha\" style=\"list-style-type\: lower-alpha\;\">(.*?)<\/ul>/gi,"[list=a]$1[/list]");
+			rep(/<ul class=\"listupperalpha\" style=\"list-style-type\: upper-alpha\;\">(.*?)<\/ul>/gi,"[list=A]$1[/list]");
+			rep(/<li>(.*?)<\/li>/gi,'[li]$1[/li]');
+
 			rep(/<code>(.*?)<\/code>/gi,"[code]$1[/code]");
 			rep(/<\/(strong|b)>/gi,"[/b]");
 			rep(/<(strong|b)>/gi,"[b]");
@@ -149,42 +167,42 @@
 		// BBCode -> HTML from DFRN dialect
 		_dfrn_bbcode2html : function(s) {
 			s = tinymce.trim(s);
-
-
-                        function rep(re, str) {
-
-                                //modify code to keep stuff intact within [code][/code] blocks
-                                //Waitman Gobble NO WARRANTY
-
-
-                                var o = new Array();
-                                var x = s.split("[code]");
-                                var i = 0;
-
-                                var si = "";
-                                si = x.shift();
-                                si = si.replace(re,str);
-                                o.push(si);
-
-                                for (i = 0; i < x.length; i++) {
-                                        var no = new Array();
-                                        var j = x.shift();
-                                        var g = j.split("[/code]");
-                                        no.push(g.shift());
-                                        si = g.shift();
-                                        si = si.replace(re,str);
-                                        no.push(si);
-                                        o.push(no.join("[/code]"));
-                                }
-
-                                s = o.join("[code]");
-
-                        };
-
-
-
-
-
+
+
+                        function rep(re, str) {
+
+                                //modify code to keep stuff intact within [code][/code] blocks
+                                //Waitman Gobble NO WARRANTY
+
+
+                                var o = new Array();
+                                var x = s.split("[code]");
+                                var i = 0;
+
+                                var si = "";
+                                si = x.shift();
+                                si = si.replace(re,str);
+                                o.push(si);
+
+                                for (i = 0; i < x.length; i++) {
+                                        var no = new Array();
+                                        var j = x.shift();
+                                        var g = j.split("[/code]");
+                                        no.push(g.shift());
+                                        si = g.shift();
+                                        si = si.replace(re,str);
+                                        no.push(si);
+                                        o.push(no.join("[/code]"));
+                                }
+
+                                s = o.join("[code]");
+
+                        };
+
+
+
+
+
 			// example: [b] to <strong>
 			rep(/\n/gi,"<br />");
 			rep(/\[b\]/gi,"<strong>");
@@ -193,43 +211,43 @@
 			rep(/\[\/i\]/gi,"</em>");
 			rep(/\[u\]/gi,"<u>");
 			rep(/\[\/u\]/gi,"</u>");
-			rep(/\[hr\]/gi,"<hr />");
+			rep(/\[hr\]/gi,"<hr />");
 			rep(/\[bookmark=([^\]]+)\](.*?)\[\/bookmark\]/gi,"<a class=\"bookmark\" href=\"$1\">$2</a>");
 			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");
 			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");
 			rep(/\[img=(.*?)x(.*?)\](.*?)\[\/img\]/gi,"<img width=\"$1\" height=\"$2\" src=\"$3\" />");
 			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");
-
-			rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');
-			rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');
-			rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');
-			rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');
-			rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');
-			rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');
-			rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');
-			rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');
+
+			rep(/\[list\](.*?)\[\/list\]/gi, '<ul class="listbullet" style="list-style-type: circle;">$1</ul>');
+			rep(/\[list=\](.*?)\[\/list\]/gi, '<ul class="listnone" style="list-style-type: none;">$1</ul>');
+			rep(/\[list=1\](.*?)\[\/list\]/gi, '<ul class="listdecimal" style="list-style-type: decimal;">$1</ul>');
+			rep(/\[list=i\](.*?)\[\/list\]/gi,'<ul class="listlowerroman" style="list-style-type: lower-roman;">$1</ul>');
+			rep(/\[list=I\](.*?)\[\/list\]/gi, '<ul class="listupperroman" style="list-style-type: upper-roman;">$1</ul>');
+			rep(/\[list=a\](.*?)\[\/list\]/gi, '<ul class="listloweralpha" style="list-style-type: lower-alpha;">$1</ul>');
+			rep(/\[list=A\](.*?)\[\/list\]/gi, '<ul class="listupperalpha" style="list-style-type: upper-alpha;">$1</ul>');
+			rep(/\[li\](.*?)\[\/li\]/gi, '<li>$1</li>');
 			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<span style=\"color: $1;\">$2</span>");
 			rep(/\[size=(.*?)\](.*?)\[\/size\]/gi,"<span style=\"font-size: $1;\">$2</span>");
 			rep(/\[code\](.*?)\[\/code\]/gi,"<code>$1</code>");
 			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<blockquote>$1</blockquote>");
-
-			/* oembed */
-			function _b2h_cb(match, url) {
-				url = bin2hex(url);
-				function s_b2h(data) {
-						match = data;
-				}
-				$.ajax({
-					url: 'oembed/b2h?url=' + url,
-					async: false,
-					success: s_b2h,
-					dataType: 'html'
-				});
-				return match;
-			}
-			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);
-			
-			/* /oembed */
+
+			/* oembed */
+			function _b2h_cb(match, url) {
+				url = bin2hex(url);
+				function s_b2h(data) {
+						match = data;
+				}
+				$.ajax({
+					url: 'oembed/b2h?url=' + url,
+					async: false,
+					success: s_b2h,
+					dataType: 'html'
+				});
+				return match;
+			}
+			s = s.replace(/\[embed\](.*?)\[\/embed\]/gi, _b2h_cb);
+			
+			/* /oembed */
 
 			return s; 
 		}

From dc84da520d7bde3f2e160d2573a549829fd022cf Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 13 Mar 2012 15:40:16 -0700
Subject: [PATCH 14/19] invite potential connectees to the free social web

---
 boot.php              | 2 +-
 mod/dfrn_request.php  | 8 +++++++-
 view/auto_request.tpl | 7 +++++++
 view/dfrn_request.tpl | 4 ++++
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/boot.php b/boot.php
index ace358faa..8f0e8345f 100755
--- 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.1279' );
+define ( 'FRIENDICA_VERSION',      '2.3.1280' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1131      );
 
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index bc159137d..1043d6daf 100755
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -666,7 +666,11 @@ function dfrn_request_content(&$a) {
 		$page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), 
 			$target_addr) . EOL . EOL;
 
-		$page_desc .= t("Please enter your 'Identity Address' from one of the following supported social networks:");
+		$page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+
+		$emailnet = t("<strike>Connect as an email follower</strike> \x28Coming soon\x29");
+
+		$invite_desc = t('If you are not yet a member of the free social web, <a href="http://dir.friendica.com/siteinfo">follow this link to find a public Friendica site and join us today</a>.');
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Friend/Connection Request'),
@@ -682,6 +686,8 @@ function dfrn_request_content(&$a) {
 			'$diaspora' => t('Diaspora'),
 			'$diasnote' => t('- please share from your own site as noted above'),
 			'$your_address' => t('Your Identity Address:'),
+			'$invite_desc' => $invite_desc,
+			'$emailnet' => $emailnet,
 			'$submit' => t('Submit Request'),
 			'$cancel' => t('Cancel'),
 			'$nickname' => $a->argv[1],
diff --git a/view/auto_request.tpl b/view/auto_request.tpl
index 204fcf247..2958397c9 100755
--- a/view/auto_request.tpl
+++ b/view/auto_request.tpl
@@ -7,8 +7,15 @@ $page_desc<br />
 <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
+<li>$emailnet</li>
 </ul>
 </p>
+<p>
+$invite_desc
+</p>
+<p>
+$desc
+</p>
 
 <form action="dfrn_request/$nickname" method="post" />
 
diff --git a/view/dfrn_request.tpl b/view/dfrn_request.tpl
index cd98a4daa..d8aa8b181 100755
--- a/view/dfrn_request.tpl
+++ b/view/dfrn_request.tpl
@@ -7,7 +7,11 @@ $page_desc<br />
 <li><a href="http://friendica.com" title="$friendica">$friendica</a></li>
 <li><a href="http://joindiaspora.com" title="$diaspora">$diaspora</a> $diasnote</li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a></li>
+<li>$emailnet</li>
 </ul>
+$invite_desc
+</p>
+<p>
 $desc
 </p>
 

From db80ffa0ff0cf796eddede0ab439ffbd0c4e66a3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 13 Mar 2012 16:02:20 -0700
Subject: [PATCH 15/19] don't count self in number of contatcs

---
 mod/contacts.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/mod/contacts.php b/mod/contacts.php
index 001bf12af..38ca570dd 100755
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -445,7 +445,7 @@ function contacts_content(&$a) {
 
 	
 	$r = q("SELECT COUNT(*) AS `total` FROM `contact` 
-		WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
+		WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
 		intval($_SESSION['uid']));
 	if(count($r)) {
 		$a->set_pager_total($r[0]['total']);
@@ -454,7 +454,7 @@ function contacts_content(&$a) {
 
 
 
-	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
+	$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
 		intval($_SESSION['uid']),
 		intval($a->pager['start']),
 		intval($a->pager['itemspage'])
@@ -465,8 +465,6 @@ function contacts_content(&$a) {
 	if(count($r)) {
 
 		foreach($r as $rr) {
-			if($rr['self'])
-				continue;
 
 			switch($rr['rel']) {
 				case CONTACT_IS_FRIEND:

From be48fff1570aa1d04e049a6fd1665f4fc9634a62 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 13 Mar 2012 18:13:03 -0700
Subject: [PATCH 16/19] file as widget and basic filing implementation for
 duepuntozero,slackr much more work needed - this is just for test/evaluation
 currently

---
 include/contact_widgets.php           |  29 ++++++++++++++++++++++++++
 include/conversation.php              |   2 ++
 include/text.php                      |   2 +-
 mod/filer.php                         |  23 ++++++++++++++++++++
 mod/network.php                       |   1 +
 view/fileas_widget.tpl                |  12 +++++++++++
 view/jot-header.tpl                   |  12 +++++++++++
 view/theme/duepuntozero/file.gif      | Bin 0 -> 615 bytes
 view/theme/duepuntozero/style.css     |  23 +++++++++++++++++---
 view/theme/duepuntozero/wall_item.tpl |   1 +
 view/theme/greenzero/file.gif         | Bin 0 -> 614 bytes
 11 files changed, 101 insertions(+), 4 deletions(-)
 create mode 100755 mod/filer.php
 create mode 100755 view/fileas_widget.tpl
 create mode 100644 view/theme/duepuntozero/file.gif
 create mode 100644 view/theme/greenzero/file.gif

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index caa0572d2..605a3eb78 100755
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -75,4 +75,33 @@ function networks_widget($baseurl,$selected = '') {
 	));
 }
 
+function fileas_widget($baseurl,$selected = '') {
+	$a = get_app();
+	if(! local_user())
+		return '';
+
+	$saved = get_pconfig(local_user(),'system','filetags');
+	if(! strlen($saved))
+		return;
+
+	$matches = false;
+	$terms = array();
+    $cnt = preg_match_all('/\[(.*?)\]/',$saved,$matches,PREG_SET_ORDER);
+    if($cnt) {
+		foreach($matches as $mtch) {
+			$unescaped = file_tag_decode($mtch[1]);
+			$terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : ''));
+		}
+	}
+
+	return replace_macros(get_markup_template('fileas_widget.tpl'),array(
+		'$title' => t('File Selections'),
+		'$desc' => '',
+		'$sel_all' => (($selected == '') ? 'selected' : ''),
+		'$all' => t('Everything'),
+		'$terms' => $terms,
+		'$base' => $baseurl,
+
+	));
+}
 
diff --git a/include/conversation.php b/include/conversation.php
index 4b2ca316b..a420e9923 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -572,6 +572,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 						'classundo' => (($item['starred']) ? "" : "hidden"),
 						'starred' =>  t('starred'),
 						'tagger' => t("add tag"),
+						'filer' => t("file as"),
 						'classtagger' => "",
 					);
 				}
@@ -874,6 +875,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
 		'$vidurl' => t("Please enter a video link/URL:"),
 		'$audurl' => t("Please enter an audio link/URL:"),
 		'$term' => t('Tag term:'),
+		'$fileas' => t('File as:'),
 		'$whereareu' => t('Where are you right now?'),
 		'$title' => t('Enter a title for this item') 
 	));
diff --git a/include/text.php b/include/text.php
index 2663bdeba..c44b4d178 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1294,7 +1294,7 @@ function file_tag_save_file($uid,$item,$file) {
 	if(count($r)) {
 		if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
 			q("update item set file = '%s' where id = %d and uid = %d limit 1",
-				dbesc($r[0]['file'] . '[' . $file_tag_encode($file) . ']'),
+				dbesc($r[0]['file'] . '[' . file_tag_encode($file) . ']'),
 				intval($item),
 				intval($uid)
 			);
diff --git a/mod/filer.php b/mod/filer.php
new file mode 100755
index 000000000..a9e213536
--- /dev/null
+++ b/mod/filer.php
@@ -0,0 +1,23 @@
+<?php
+
+require_once('include/security.php');
+require_once('include/bbcode.php');
+require_once('include/items.php');
+
+
+function filer_content(&$a) {
+
+	if(! local_user()) {
+		killme();
+	}
+
+	$term = notags(trim($_GET['term']));
+	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+
+	logger('filer: tag ' . $term . ' item ' . $item_id);
+
+	if($item_id && strlen($term))
+		file_tag_save_file(local_user(),$item_id,$term);
+
+	killme();
+}
diff --git a/mod/network.php b/mod/network.php
index 7e7a95841..4f58fc4fb 100755
--- a/mod/network.php
+++ b/mod/network.php
@@ -46,6 +46,7 @@ function network_init(&$a) {
 	$a->page['aside'] .= group_side('network','network',true,$group_id);
 	$a->page['aside'] .= networks_widget($a->get_baseurl() . '/network',(x($_GET, 'nets') ? $_GET['nets'] : ''));
 	$a->page['aside'] .= saved_searches($search);
+	$a->page['aside'] .= fileas_widget($a->get_baseurl() . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
 
 }
 
diff --git a/view/fileas_widget.tpl b/view/fileas_widget.tpl
new file mode 100755
index 000000000..54fba7435
--- /dev/null
+++ b/view/fileas_widget.tpl
@@ -0,0 +1,12 @@
+<div id="fileas-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="fileas-ul">
+		<li class="tool"><a href="$base" class="fileas-link fileas-all{{ if $sel_all }} fileas-selected{{ endif }}">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="tool"><a href="$base?f=&file=$term.name" class="fileas-link{{ if $term.selected }} fileas-selected{{ endif }}">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index d6b172b6a..88df73494 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -262,6 +262,18 @@ function enableOnUser(){
 		}
 	}
 
+	function itemFiler(id) {
+		reply = prompt("$fileas");
+		if(reply && reply.length) {
+			commentBusy = true;
+			$('body').css('cursor', 'wait');
+			$.get('filer/' + id + '?term=' + reply);
+			if(timer) clearTimeout(timer);
+			timer = setTimeout(NavUpdate,3000);
+			liking = 1;
+		}
+	}
+
 	function jotClearLocation() {
 		$('#jot-coord').val('');
 		$('#profile-nolocation-wrapper').hide();
diff --git a/view/theme/duepuntozero/file.gif b/view/theme/duepuntozero/file.gif
new file mode 100644
index 0000000000000000000000000000000000000000..7885b998d578d4523103e1f5dfbcd8133a7f0fe7
GIT binary patch
literal 615
zcmZ?wbhEHb6krfwIF`)7#xKb(Aj2uD!Xs-asNo`J94_scC*xeG;M1rUF;y*cx?0ps
z_2^mZF>^Fx=V~P{*G^rfleShbd#hf~c7uYwhQ)`B%8nbAoir{#Wm<X0y!wn~%^9oO
zvo>{SZR^k3H=J{9Jm=JO-lh4xYs&@q)(f6(7rfdp`gC0M@46J&eJQBta!B9h@CjEU
zCtit~bTwx3)z~T5;-_9qoOUf~`t_6<*HdTSNS}2hbM}p#xi@p?-O8VTt6<^nlEt^n
zm)@yZcDHury{0wy+t)wn*zmAx<HO!9kNUShnzG~Z)SXYJ?|L$0_tQChpDsA?e9^(@
zOAb9>dicePqc2w-f4Szw%e5z8tv~f@)0x*>&c5Dp;q9)AZ+BmMxA*e9{a4-{xcdI^
z^$$mHd^mpV!>KzTPv8A?_TH!S_doro4N&~a!pOx?&!EEq1fV!!U_a7O-_+dF+SU>!
zFQMYz-Xh@HBp)OYX*7MhPg@W#w~=pBQbN3eZz~TMmqFs9_?SQ)4OK-ssb;;n#j&A*
zd-rW?(vFUgwX!ldG1S#kSCW^J(hQGrGYyNp5g8E{5^SNR78+&d5VFtD$HU2(Cq_BY
z%_KY^(BH??#leP8tzN;;s4bxJl1t}A1>2$$i-f1=+Y}7fSVT6ZoamP|_An?=&^XL3
nuk6%xBcZXWg@e6|V^=`pp=K5i9uWlt2ZjcQz9KFz76xkoO@B#U

literal 0
HcmV?d00001

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index acd97eb94..10ddb0090 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -309,7 +309,7 @@ div.wall-item-content-wrapper.shiny {
 	margin-bottom: 10px;
 }
 
-.group-selected, .nets-selected {
+.group-selected, .nets-selected, .fileas-selected {
 	padding: 3px;
 	-moz-border-radius: 3px;
 	border-radius: 3px;	
@@ -1024,6 +1024,10 @@ input#dfrn-url {
 	float: left;	
 }
 
+.filer-item {
+	margin-left: 10px;
+	float: left;
+}
 
 .wall-item-links-wrapper {
 	float: left;
@@ -1864,11 +1868,11 @@ a.mail-list-link {
 	margin-top: 10px;
 }
 
-.nets-ul {
+.nets-ul, .fileas-ul {
 	list-style-type: none;
 }
 
-.nets-ul li {
+.nets-ul li, .fileas-ul li {
 	margin-top: 10px;
 }
 
@@ -1879,6 +1883,14 @@ a.mail-list-link {
 	margin-left: 42px;
 }
 
+.fileas-link {
+	margin-left: 24px;
+}
+
+.fileas-all {
+	margin-left: 0px;
+}
+
 #search-save {
 	margin-left: 5px;
 }
@@ -2902,6 +2914,11 @@ aside input[type='text'] {
 .tagged { background-position: -48px -48px; }
 
 
+.filer-icon {
+	display: block; width: 16px; height: 16px;
+	background-image: url('file.gif');
+}
+
 .icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
 
 .attachtype {
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 51e36b6f4..2c88fc598 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -56,6 +56,7 @@
 			{{ if $item.star }}
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
 			{{ endif }}
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
diff --git a/view/theme/greenzero/file.gif b/view/theme/greenzero/file.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e388a13c0b99d0afa18c2fb51a90610923cb6917
GIT binary patch
literal 614
zcmZ?wbhEHb6krfwI2OvlF38Fu!p0@V!LQ0AY9c7@BBmTJqY^2rnXY6|u5MVVVN|1O
zRHtcNuVvP*YtgM|J=xG^ilN;sV~6>sjtfnl7MnRQGk0EY?z-C2b&aLlI!pHr)*hRz
zJvLi=Zng2+Ve7ry&S$T^-+l-G{f<EgT!Ig}g&y<>Kja;G*eCjkf9#QfgkvFz$3jz%
zN2DH)Og|BwaUv%BR6^eA<bpG)#b-0h&*j!$C~mq`*?zgU^GZX{wU++t?UQeGPrcDI
z{Z{{++fx?Yow4xltR?s6F1<g0)q};WA1qn-aK-vZD>pq}v;FC&ozJ%HdbV}X^X+?|
z@7VWz=fM|y4!_)Y^wq%=uaBI5bNt-fQ~w7VDE?$&<YK62&|v@qP@FKZA8x2`YHn$5
zYw?v9Rj_Su;kRp&cIEfcnLgdI&6S5+$1x-%I7n+&3lA5UR`8-Ae^+&71z9QaX3fCG
z0UoY<_ibxZ^9u?vGBVKB)=*WFla>@$@$$FP^Yppl<L&A0W~i#@;j3@%zR$_g&O(RB
zU*6S5*UQD#`K6V)39n+kjFXOKp8)5lX7)ZQBNG{qPwdQnqMj`bA159@#v`U6VIq*?
p=-SJ#V41K$f$>l?vo%ZL41t4=Oe}0%0ul-g4h-%VtgK87)&N@+JAVKG

literal 0
HcmV?d00001


From de017d1ed76500c01fd11c8e1d36cf4ebd70172d Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 13 Mar 2012 19:27:52 -0700
Subject: [PATCH 17/19] sort inbox by recently replied conversations first

---
 mod/message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/message.php b/mod/message.php
index 37f92e8d9..65f692f3d 100755
--- a/mod/message.php
+++ b/mod/message.php
@@ -194,7 +194,7 @@ function message_content(&$a) {
 		$r = q("SELECT max(`mail`.`created`) AS `mailcreated`, min(`mail`.`seen`) AS `mailseen`, 
 			`mail`.* , `contact`.`name`, `contact`.`url`, `contact`.`thumb` , `contact`.`network`  
 			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
-			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC  LIMIT %d , %d ",
+			WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `mailcreated` DESC  LIMIT %d , %d ",
 			intval(local_user()),
 			dbesc($myprofile),
 			intval($a->pager['start']),

From 4972d7ef6ee740f6eb09d8c7efa9a76ee40973c1 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 13 Mar 2012 20:46:37 -0700
Subject: [PATCH 18/19] more work on filer, comment level and file tag removal

---
 include/conversation.php                  | 32 +++++++++++++----------
 include/oembed.php                        |  5 +++-
 include/text.php                          |  9 ++++---
 mod/filerm.php                            | 21 +++++++++++++++
 view/theme/duepuntozero/style.css         |  4 +--
 view/theme/duepuntozero/wall_item.tpl     |  6 +++--
 view/theme/duepuntozero/wallwall_item.tpl |  3 +++
 7 files changed, 57 insertions(+), 23 deletions(-)
 create mode 100644 mod/filerm.php

diff --git a/include/conversation.php b/include/conversation.php
index a420e9923..117127a28 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -560,25 +560,28 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 				);
 
 				$star = false;
+				$filer = false;
+
 				$isstarred = "unstarred";
-				if ($profile_owner == local_user() && $toplevelpost) {
-					$isstarred = (($item['starred']) ? "starred" : "unstarred");
+				if ($profile_owner == local_user()) {
+					if($toplevelpost) {
+						$isstarred = (($item['starred']) ? "starred" : "unstarred");
 
-					$star = array(
-						'do' => t("add star"),
-						'undo' => t("remove star"),
-						'toggle' => t("toggle star status"),
-						'classdo' => (($item['starred']) ? "hidden" : ""),
-						'classundo' => (($item['starred']) ? "" : "hidden"),
-						'starred' =>  t('starred'),
-						'tagger' => t("add tag"),
-						'filer' => t("file as"),
-						'classtagger' => "",
-					);
+						$star = array(
+							'do' => t("add star"),
+							'undo' => t("remove star"),
+							'toggle' => t("toggle star status"),
+							'classdo' => (($item['starred']) ? "hidden" : ""),
+							'classundo' => (($item['starred']) ? "" : "hidden"),
+							'starred' =>  t('starred'),
+							'tagger' => t("add tag"),
+							'classtagger' => "",
+						);
+					}
+					$filer = t("file as");
 				}
 
 
-
 				$photo = $item['photo'];
 				$thumb = $item['thumb'];
 
@@ -672,6 +675,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 					'edpost' => $edpost,
 					'isstarred' => $isstarred,
 					'star' => $star,
+					'filer' => $filer,
 					'drop' => $drop,
 					'vote' => $likebuttons,
 					'like' => $like,
diff --git a/include/oembed.php b/include/oembed.php
index 52068efc7..cc71f9757 100755
--- a/include/oembed.php
+++ b/include/oembed.php
@@ -1,6 +1,6 @@
 <?php
 function oembed_replacecb($matches){
-	logger('oembedcb');
+//	logger('oembedcb');
 	$embedurl=$matches[1];
 	$j = oembed_fetch_url($embedurl);
 	$s =  oembed_format_object($j);
@@ -14,6 +14,9 @@ function oembed_fetch_url($embedurl){
 
 	$txt = Cache::get($embedurl);
 
+	// These media files should now be caught in bbcode.php
+	// left here as a fallback in case this is called from another source
+
 	$noexts = array("mp3","mp4","ogg","ogv","oga","ogm","webm");
 	$ext = pathinfo(strtolower($embedurl),PATHINFO_EXTENSION);
 	
diff --git a/include/text.php b/include/text.php
index c44b4d178..199460d2c 100644
--- a/include/text.php
+++ b/include/text.php
@@ -874,6 +874,7 @@ function link_compare($a,$b) {
 if(! function_exists('prepare_body')) {
 function prepare_body($item,$attach = false) {
 
+	$a = get_app();
 	call_hooks('prepare_body_init', $item); 
 
 	$s = prepare_text($item['body']);
@@ -916,7 +917,7 @@ function prepare_body($item,$attach = false) {
 	$matches = false;
 	$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
 	if($cnt) {
-		logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG);
+//		logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG);
 		foreach($matches as $mtch) {
 			if(strlen($x))
 				$x .= ',';
@@ -931,11 +932,11 @@ function prepare_body($item,$attach = false) {
 	$x = '';
 	$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
 	if($cnt) {
-		logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG);
+//		logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG);
 		foreach($matches as $mtch) {
 			if(strlen($x))
-				$x .= ',';
-			$x .= file_tag_decode($mtch[1]);
+				$x .= '&nbsp;&nbsp;&nbsp;';
+			$x .= file_tag_decode($mtch[1]). ' <a href="' . $a->get_baseurl() . '/filerm/' . $item['id'] . '?f=&term=' . file_tag_decode($mtch[1]) . '" title="' . t('remove') . '" >' . t('[remove]') . '</a>';
 		}
 		if(strlen($x) && (local_user() == $item['uid']))
 			$s .= '<div class="filesavetags"><span>' . t('Filed under:') . ' </span>' . $x . '</div>'; 
diff --git a/mod/filerm.php b/mod/filerm.php
new file mode 100644
index 000000000..66b684dc9
--- /dev/null
+++ b/mod/filerm.php
@@ -0,0 +1,21 @@
+<?php
+
+function filerm_content(&$a) {
+
+	if(! local_user()) {
+		killme();
+	}
+
+	$term = notags(trim($_GET['term']));
+	$item_id = (($a->argc > 1) ? notags(trim($a->argv[1])) : 0);
+
+	logger('filerm: tag ' . $term . ' item ' . $item_id);
+
+	if($item_id && strlen($term))
+		file_tag_unsave_file(local_user(),$item_id,$term);
+
+	if(x($_SESSION,'return_url'))
+		goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
+	
+	killme();
+}
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 10ddb0090..b79b00ef4 100755
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2615,12 +2615,12 @@ aside input[type='text'] {
 	margin-top: 10px;
 }
 
-.body-tag {
+.body-tag, .filesavetags {
 	opacity: 0.5;
 	filter:alpha(opacity=50);
 }
 
-.body-tag:hover {
+.body-tag:hover, .filesavetags:hover {
 	opacity: 1.0 !important;
 	filter:alpha(opacity=100) !important;
 }
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 2c88fc598..6cb018b7b 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -56,9 +56,11 @@
 			{{ if $item.star }}
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
-			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
 			{{ endif }}
-			
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+			{{ endif }}
+
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
 			</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index 211906c93..c37bcb4a2 100755
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -61,6 +61,9 @@
 			<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
 			<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
 			{{ endif }}
+			{{ if $item.filer }}
+			<a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+			{{ endif }}
 			
 			<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
 				{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}

From 975781d3e23e6beb2ac86b191c7c12b7347c1705 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Wed, 14 Mar 2012 01:05:08 -0400
Subject: [PATCH 19/19] massive work done to both dispys, mostly -dark

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy-dark/icons.png         | Bin 19513 -> 29024 bytes
 view/theme/dispy-dark/icons.svg         |  50 +++---
 view/theme/dispy-dark/nav.tpl           |  16 +-
 view/theme/dispy-dark/photo_view.tpl    |   2 +-
 view/theme/dispy-dark/profile_vcard.tpl |  10 +-
 view/theme/dispy-dark/style.css         | 207 ++++++++++++++----------
 view/theme/dispy-dark/theme.php         |  46 +++++-
 view/theme/dispy/style.css              |   3 +-
 view/theme/dispy/theme.php              |  41 ++++-
 9 files changed, 247 insertions(+), 128 deletions(-)

diff --git a/view/theme/dispy-dark/icons.png b/view/theme/dispy-dark/icons.png
index eb84b8d8e7ad56e28ae5360cb13d4e98e352dbcc..648811373a41b2328cd76eb596adf0a02a15187a 100644
GIT binary patch
literal 29024
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
H=0X1l9mi^o

literal 19513
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
IN5iiC4{1nb9RL6T

diff --git a/view/theme/dispy-dark/icons.svg b/view/theme/dispy-dark/icons.svg
index 05a00d93c..10f8cc667 100644
--- a/view/theme/dispy-dark/icons.svg
+++ b/view/theme/dispy-dark/icons.svg
@@ -51,9 +51,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.9403009"
-     inkscape:cx="100.08061"
-     inkscape:cy="113.21269"
+     inkscape:zoom="1.3859292"
+     inkscape:cx="105.02551"
+     inkscape:cy="107.90767"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -107,7 +107,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -572,7 +572,7 @@
          inkscape:connector-curvature="0"
          id="rect4428-4"
          d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <path
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
@@ -580,7 +580,7 @@
          inkscape:connector-curvature="0"
          id="path4440-4"
          d="m 124.78127,905.73727 -1.9375,-0.063"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <path
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
@@ -589,7 +589,7 @@
          inkscape:connector-curvature="0"
          id="path4442-9"
          d="m 117.59377,901.20597 6.4375,0"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
@@ -599,12 +599,12 @@
          height="0.375"
          width="1.0625"
          id="rect4446-9"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4448-3"
          width="1.0625"
          height="0.375"
@@ -619,12 +619,12 @@
          height="0.375"
          width="1.0625"
          id="rect4450-6"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4452-0"
          width="1.0625"
          height="0.375"
@@ -639,12 +639,12 @@
          height="0.375"
          width="1.0625"
          id="rect4454-5"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4456-0"
          width="1.0625"
          height="0.375"
@@ -659,12 +659,12 @@
          height="0.375"
          width="1.0625"
          id="rect4458-2"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4460-9"
          width="1.0625"
          height="0.375"
@@ -679,12 +679,12 @@
          height="0.375"
          width="1.0625"
          id="rect4462-4"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4464-3"
          width="1.0625"
          height="0.375"
@@ -699,12 +699,12 @@
          height="0.375"
          width="1.0625"
          id="rect4466-5"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4468-1"
          width="1.0625"
          height="0.375"
@@ -719,12 +719,12 @@
          height="0.375"
          width="1.0625"
          id="rect4470-7"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4472-4"
          width="1.0625"
          height="0.375"
@@ -739,12 +739,12 @@
          height="0.375"
          width="1.0625"
          id="rect4474-3"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4476-1"
          width="1.0625"
          height="0.375"
@@ -759,12 +759,12 @@
          height="0.375"
          width="1.0625"
          id="rect4478-4"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" />
       <rect
          inkscape:export-ydpi="90"
          inkscape:export-xdpi="90"
          inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png"
-         style="fill:none;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
+         style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"
          id="rect4480-6"
          width="1.0625"
          height="0.375"
diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index f6e399ef5..11469dc66 100644
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -57,14 +57,6 @@ works -->
         </li>
         {{ endif }}
 
-{{ if $userinfo }}
-        <ul id="nav-user-menu" class="menu-popup">
-            {{ for $nav.usermenu as $usermenu }}
-                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-            {{ endfor }}
-        </ul>
-{{ endif }}
-
         {{ if $nav.contacts }}
         <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
         {{ endif }}
@@ -94,6 +86,14 @@ works -->
         </ul>
     </div>
 
+{{ if $userinfo }}
+        <ul id="nav-user-menu" class="menu-popup">
+            {{ for $nav.usermenu as $usermenu }}
+                <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+            {{ endfor }}
+        </ul>
+{{ endif }}
+
     <div id="notifications">
         {{ if $nav.home }}
         <a id="home-update" class="nav-ajax-left" href="$nav.home.0" title="$nav.home.1"></a>
diff --git a/view/theme/dispy-dark/photo_view.tpl b/view/theme/dispy-dark/photo_view.tpl
index 4582751c6..f1209ec58 100644
--- a/view/theme/dispy-dark/photo_view.tpl
+++ b/view/theme/dispy-dark/photo_view.tpl
@@ -17,7 +17,7 @@
 </div>
 
 <div id="photo-photo-end"></div>
-<div id="photo-caption" >$desc</div>
+<div id="photo-caption">$desc</div>
 {{ if $tags }}
 <div id="in-this-photo-text">$tags.0</div>
 <div id="in-this-photo">$tags.1</div>
diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 0c289d982..5cb567f5a 100644
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -6,13 +6,17 @@
     <div class="title">$profile.pdesc</div>
     {{ endif }}
 	<div id="profile-photo-wrapper">
-    <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
+		<img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
+		<div class="profile-edit-side-div">
+			<a class="profile-edit-side-link icon edit" title="$profile.$editprofile" href="profiles/$profile.id" ></a>
+		</div>
+		<div class="clear"></div>
     </div>
 
 	{{ if $location }}
 		<div class="location">
         <span class="location-label">$location</span>
-		<div class="adr">
+		<address class="adr">
 			{{ if $profile.address }}
             <div class="street-address">$profile.address</div>{{ endif }}
 			<span class="city-state-zip">$profile.zip</span>
@@ -20,7 +24,7 @@
             <span class="region">$profile.region</span>
             <span class="postal-code">$profile.postal-code</span>
 			{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-		</div>
+		</address>
 		</div>
 	{{ endif }}
 
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 7a57628b9..c590042f1 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -520,11 +520,13 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 	position: fixed;
 	left: 28px;
 	bottom: 6px;
+	z-index: 10;
 }
 #language-selector {
     position: fixed;
     bottom: 2px;
     left: 52px;
+	z-index: 10;
 }
 .menu-popup {
     position: absolute;
@@ -810,6 +812,9 @@ aside #viewcontacts {
 	border-bottom: 0;
 	padding: 5px;
 }
+#profile-jot-net {
+	margin: 5px 0;
+}
 #jot-preview-link {
     margin: 0 0 0 10px;
     border: 0;
@@ -831,12 +836,12 @@ aside #viewcontacts {
     background-color: #555753;
     height: 22px;
     width: 20px;
-    -webkit-border-radius: 5px 0px 0px 5px;
-    -moz-border-radius: 5px 0px 0px 5px;
-    border-radius: 5px 0px 0px 5px;     
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;     
     overflow: hidden;
     border: 0px;
-    margin: 0 -4px 0 10px;
+    margin: 0 10px 0 10px;
 }
 #profile-jot-plugin-wrapper {
 	width: 1px;
@@ -854,23 +859,21 @@ aside #viewcontacts {
 	height: 22px;
 	background-color: #555753;
 	color: #eeeeec;
-	-webkit-border-radius: 0 5px 5px 0;
-	-moz-border-radius: 0 5px 5px 0;
-	border-radius: 0 5px 5px 0;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
 	border: 0;
 	margin: 0;
 	float: right;
 }
-#jot-perms-icons {
-	background-color: #555753;
+#jot-perms-icon {
 	height: 22px;
 	width: 20px;
-	-webkit-border-radius: 0 5px 5px 0;
-	-moz-border-radius: 0 5px 5px 0;
-	border-radius: 0 5px 5px 0;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;
+	border-radius: 5px;
 	overflow: hidden;
 	border: 0;
-	margin: 0 0 0 94.4%;
 }
 #profile-jot-acl-wrapper {
 	margin: 0 10px;
@@ -916,7 +919,8 @@ aside #viewcontacts {
 	color: #cccccc;
 }
 #profile-jot-desc {
-	color: #a00;
+	color: #ff2000;
+	margin: 5px 0;
 }
 #jot-title-wrapper {
 	margin-bottom: 5px;
@@ -1503,20 +1507,26 @@ div[id$="wrapper"] br {
 }
 .mail-list-sender-name {
     display: inline;
+	font-size: 1.1em;
 }
 .mail-list-date {
     display: inline;
-    font-size: 0.8em;
+    font-size: 0.9em;
     padding-left: 10px;
 }
+.mail-list-sender-name, .mail-list-date {
+	font-style: italic;
+}
 .mail-list-subject {
-    font-size: 1.5em;
+    font-size: 1.2em;
+	font-weight: bold;
 }
 .mail-list-delete-wrapper {
     float: right;
 }
 .mail-list-outside-wrapper-end {
     clear: both;
+	border-bottom: 1px #eec dotted;
 }
 .mail-conv-sender {
     float: left;
@@ -1734,11 +1744,21 @@ div[id$="wrapper"] br {
     margin: 30px 0px;
 }
 .profile-edit-side-div {
-    margin: 5px 2px 0 0;
+	background: #2e2f2e;
+	border-radius: 5px 5px 0 0;
+	width: 175px;
+	height: 20px;
+	position: relative;
+    margin: -25px -30px 0px 0px;
+	display: none;
+}
+.profile-edit-side-div:hover {
+	/*margin: 0px 0px 0px 0px;*/
+	display: inline;
 }
 .profile-edit-side-link {
-	margin: 0 20px -18px 0;
-    float: right;
+	margin: 0 0px 0px 155px;
+	/*float: right;*/
 }
 .profile-listing {
     float: left;
@@ -1749,6 +1769,9 @@ div[id$="wrapper"] br {
     padding: 0;
     list-style: none;
 }
+.marital {
+	margin-top: 5px;
+}
 #register-sitename {
     display: inline;
     font-weight: bold;
@@ -1970,6 +1993,9 @@ div[id$="wrapper"] br {
     background: #88a9d2;
     font-weight: bold;
 }
+.group-selected:hover, .nets-selected:hover {
+	color: #2e2f2e;
+}
 .groupsideedit {
     margin-right: 10px;
 }
@@ -2115,11 +2141,16 @@ div[id$="wrapper"] br {
     width: 16px; height: 16px;
 }
 #adminpage table tr:hover {
-    background-color:#bbc7d7;
+	color: #2e2f2e;
+    background-color: #eec;
 }
 #adminpage .selectall {
     text-align: right;
 }
+#adminpage #users a {
+	color: #2e2f2e;
+	text-decoration: underline;
+}
 
 /**
  * Form fields
@@ -2397,7 +2428,7 @@ div[id$="wrapper"] br {
 	background-position: -70px -40px;
 }
 .unlock {
-	background-position: -90px -40px;
+	background-position: -88px -40px;
 }
 .video {
 	background-position: -110px -40px;
@@ -2481,8 +2512,8 @@ footer {
 }
 #profile-jot-text {
     height: 20px;
-    color: #666;
-    border: 1px solid #ccc;
+    color: #eec;
+    border: 1px solid #eec;
     border-radius: 5px;
     width: 99.5%;
 }
@@ -2493,113 +2524,117 @@ footer {
 #photos-upload-permissions-wrapper,
 #profile-jot-acl-wrapper {
     display: block !important;
+	background: #2e2f2e;
+	color: #eec;
 }
 #acl-wrapper {
-    width: 690px;
-    float: left;
+    width: 660px;
+	margin: 0 auto;
 }
 #acl-search {
     float: right;
     background: #fff url("../../../images/search_18.png") no-repeat right center;
     padding-right: 20px;
+	margin: 6px;
 }
 #acl-showall {
-    float:left;
-    display:block;
-    width:auto;
-    height:18px;
-    background-color:#CCC;
-    background-image:url("../../../images/show_all_off.png");
-    background-position:7px 7px;
-    background-repeat:no-repeat;
-    padding:7px 10px 7px 30px;
-    -webkit-border-radius:5px;
-    -moz-border-radius:5px;
-    border-radius:5px;
-    color:#999;
+    float: left;
+    display: block;
+    width: auto;
+    height: 18px;
+    background: #eec url("../../../images/show_all_off.png") 8px 8px no-repeat;
+    padding: 7px 10px 7px 30px;
+    -webkit-border-radius: 5px;
+    -moz-border-radius: 5px;
+    border-radius: 5px;
+    color: #999;
+	margin: 5px 0;
 }
 #acl-showall.selected {
-    color:#000;
-    background-color:#F90;
-    background-image:url(../../../images/show_all_on.png);
+    color: #000;
+    background: #f90 url(../../../images/show_all_on.png) 8px 8px no-repeat;
 }
 #acl-list {
-    height:210px;
-    border:1px solid #ccc;
-    clear:both;
-    margin-top:30px;
-    overflow:auto;
-}
-#acl-list-content {
+    height: 210px;
+    border: 1px solid #ccc;
+    clear: both;
+    margin-top: 30px;
+    overflow: auto;
 }
+/*#acl-list-content {*/
+/*}*/
 .acl-list-item {
-    display:block;
-    width:150px;
-    height:30px;
-    border:1px solid #ccc;
-    margin:5px;
-    float:left;
+	border: 1px solid #eec;
+    display: block;
+    float: left;
+    height: 110px;
+    margin: 3px 0 5px 5px;
+    width: 120px;
 }
 .acl-list-item img {
-    width:22px;
-    height:22px;
-    float:left;
-    margin:4px;
+    width: 22px;
+    height: 22px;
+    float: left;
+    margin: 5px 5px 20px;
 }
 .acl-list-item p {
     height: 12px;
     font-size: 10px;
-    margin: 0;
+    margin: 0 0 22px;
     padding: 2px 0 1px;
 }
 .acl-list-item a {
-    font-size:8px;
-    display:block;
-    width:40px;
-    height:10px;
-    float:left;
-    color:#999;
-    background-color:#CCC;
-    background-position:3px 3px;
-    background-repeat:no-repeat;
-    margin-right:5px;
-    -webkit-border-radius:2px;
-    -moz-border-radius:2px;
-    border-radius:2px;
-    padding-left:15px;
+    background: #eec 3px 3px no-repeat;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+	clear: both;
+    font-size: 10px;
+    display: block;
+    width: 55px;
+    height: 20px;
+    color: #2e2f2e;
+    margin: 5px auto 0;
+	padding: 0 3px;
+	text-align: center;
+	vertical-align: middle;
 }
 #acl-wrapper a:hover {
-    text-decoration:none;
-    color:#000;
+    text-decoration: none;
+    color: #2e2f2e;
+	border: 0;
 }
 .acl-button-show {
-    background-image:url('../../../images/show_off.png');
+    background-image: url('../../../images/show_off.png');
+	margin: 0 auto;
 }
 .acl-button-hide {
-    background-image:url('../../../images/hide_off.png');
+    background-image: url('../../../images/hide_off.png');
+	margin: 0 auto;
 }
 .acl-button-show.selected {
-    color:#000;
-    background-color:#9ade00;
-    background-image:url(../../../images/show_on.png);
+    color: #2e2f2e;
+    background-color: #9ade00;
+    background-image: url(../../../images/show_on.png);
 }
 .acl-button-hide.selected {
-    color:#000;
-    background-color:#ff4141;
-    background-image:url(../../../images/hide_on.png);
+    color: #2e2f2e;
+    background-color: #ff4141;
+    background-image: url(../../../images/hide_on.png);
 }
 .acl-list-item.groupshow {
-    border-color:#9ade00;
+    border-color: #9ade00;
 }
 .acl-list-item.grouphide {
-    border-color:#ff4141;
+    border-color: #ff4141;
 }
 /** /acl **/
 
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 150px;
+	max-height: 175px;
+    max-width: 42%;
 	background-color: #555753;
 	color: #fff;
 	overflow: auto;
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index a7aec1c1a..6f8243058 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -1,5 +1,17 @@
 <?php
-$a->theme_info = array();
+
+/*
+ * Name: Dispy Dark
+ * Description: Dispy Dark, Friendica theme
+ * Version: 0.9
+ * Author: Simon <http://simon.kisikew.org/>
+ * Maintainer: Simon <http://simon.kisikew.org/>
+ */
+
+
+$a->theme_info = array(
+	'extends' => 'dispy-dark'
+);
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
@@ -52,6 +64,26 @@ $(document).ready(function() {
             $('#drop-' + id).addClass('iconspacer'); }
         );
 
+	// notifications
+	$('html').click(function() {
+		$('#nav-notifications-linkmenu').removeClass('selected');
+		document.getElementById("nav-notifications-menu").style.display = "none";
+	});
+
+	$('#nav-notifications-linkmenu').click(function(event) {
+		event.stopPropagation();
+	});
+
+	// usermenu
+	//$('html').click(function() {
+//		$('#user-menu-popup').css('display: none');
+		//document.getElementById("usermenu-popup").style.display = "none";
+	//});
+
+	//$('#user-menu').click(function(event) {
+	//	event.stopPropagation();
+	//});
+
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -69,9 +101,17 @@ $(document).ready(function() {
         toggleToolbar();
         return false;
     });
+
+	$('#profile-jot-text').focusin(function() {
+		$(this).css({color: '#eec'});
+	});
+
+	$('#profile-photo-wrapper').mouseover(function() {
+		$('#profile-edit-side-div').css({display: 'block'});
+	}).mouseout(function() {
+		$('#profile-edit-side-div').css({display: 'none'});
+	});
 });
 </script>
 EOT;
 
-$a->page['footer'] .= <<<EOFooter
-EOFooter;
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 24fa39f77..93830de96 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -2593,7 +2593,8 @@ footer {
 
 /* autocomplete popup */
 .acpopup {
-	max-height: 150px;
+	max-height: 175px;
+    max-width: 42%;
 	background-color: #555753;
 	color: #fff;
 	overflow: auto;
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index a7aec1c1a..75297290c 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -1,5 +1,17 @@
 <?php
-$a->theme_info = array();
+
+/*
+ * Name: Dispy
+ * Description: Dispy, Friendica theme
+ * Version: 0.9
+ * Author: unknown
+ * Maintainer: Simon <http://simon.kisikew.org/>
+ */
+
+
+$a->theme_info = array(
+	'extends' => 'dispy'
+);
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
@@ -52,6 +64,26 @@ $(document).ready(function() {
             $('#drop-' + id).addClass('iconspacer'); }
         );
 
+	// notifications
+	$('html').click(function() {
+		$('#nav-notifications-linkmenu').removeClass('selected');
+		document.getElementById("nav-notifications-menu").style.display = "none";
+	});
+
+	$('#nav-notifications-linkmenu').click(function(event) {
+		event.stopPropagation();
+	});
+
+	// usermenu
+	$('html').click(function() {
+		$('#nav-user-linkmenu').removeClass('selected');
+		document.getElementById("nav-user-menu").style.display = "none";
+	});
+
+	$('#nav-user-linkmenu').click(function(event) {
+		event.stopPropagation();
+	});
+
     function toggleToolbar() {
         if ( $('#nav-floater').is(':visible') ) {
             $('#nav-floater').slideUp('fast');
@@ -71,6 +103,13 @@ $(document).ready(function() {
     });
 });
 </script>
+<script>
+$(document).ready(function() {
+	$('#profile-jot-text').focusin(function() {
+		$(this).css('color: #eec;');
+	});
+});
+</script>
 EOT;
 
 $a->page['footer'] .= <<<EOFooter