From 73c61b6f96353ae7cbf73db7ed8b22f74f8ebdc3 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 26 May 2012 16:11:51 -0700
Subject: [PATCH 02/13] allow force ssl on notifications

---
 boot.php            |   2 +-
 include/enotify.php |   2 +-
 util/messages.po    | 146 +++++++++++++++++++++++---------------------
 3 files changed, 77 insertions(+), 73 deletions(-)

diff --git a/boot.php b/boot.php
index 64420f4341..3f4820d67d 100644
--- 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',      '3.0.1354' );
+define ( 'FRIENDICA_VERSION',      '3.0.1355' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1144      );
 
diff --git a/include/enotify.php b/include/enotify.php
index ca134ac86c..f7ef74fac5 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -13,7 +13,7 @@ function notification($params) {
 
 	$banner = t('Friendica Notification');
 	$product = FRIENDICA_PLATFORM;
-	$siteurl = z_path();
+	$siteurl = $a->get_baseurl(true);
 	$thanks = t('Thank You,');
 	$sitename = get_config('config','sitename');
 	$site_admin = sprintf( t('%s Administrator'), $sitename);
diff --git a/util/messages.po b/util/messages.po
index 1fd6628b82..2f6a1c4068 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1354\n"
+"Project-Id-Version: 3.0.1355\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-25 10:00-0700\n"
+"POT-Creation-Date: 2012-05-26 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -52,7 +52,7 @@ msgstr ""
 #: ../../mod/message.php:96 ../../mod/allfriends.php:9
 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
 #: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7
-#: ../../mod/profiles.php:365 ../../mod/delegate.php:6
+#: ../../mod/profiles.php:374 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503
 #: ../../include/items.php:3214 ../../index.php:306
@@ -131,7 +131,7 @@ msgstr ""
 #: ../../mod/settings.php:760 ../../mod/settings.php:964
 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417
 #: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988
-#: ../../mod/admin.php:1075 ../../mod/profiles.php:534
+#: ../../mod/admin.php:1075 ../../mod/profiles.php:543
 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
 #: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
 #: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
@@ -331,7 +331,7 @@ msgstr ""
 #: ../../mod/settings.php:910 ../../mod/settings.php:916
 #: ../../mod/settings.php:952 ../../mod/settings.php:953
 #: ../../mod/settings.php:954 ../../mod/settings.php:955
-#: ../../mod/register.php:511 ../../mod/profiles.php:511
+#: ../../mod/register.php:511 ../../mod/profiles.php:520
 msgid "Yes"
 msgstr ""
 
@@ -342,7 +342,7 @@ msgstr ""
 #: ../../mod/settings.php:910 ../../mod/settings.php:916
 #: ../../mod/settings.php:952 ../../mod/settings.php:953
 #: ../../mod/settings.php:954 ../../mod/settings.php:955
-#: ../../mod/register.php:512 ../../mod/profiles.php:512
+#: ../../mod/register.php:512 ../../mod/profiles.php:521
 msgid "No"
 msgstr ""
 
@@ -2879,34 +2879,34 @@ msgstr ""
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:377 ../../mod/wall_upload.php:99
+#: ../../mod/item.php:379 ../../mod/wall_upload.php:99
 #: ../../mod/wall_upload.php:108 ../../mod/wall_upload.php:115
 #: ../../include/message.php:144
 msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/item.php:786
+#: ../../mod/item.php:788
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:811
+#: ../../mod/item.php:813
 #, php-format
 msgid ""
 "This message was sent to you by %s, a member of the Friendica social network."
 msgstr ""
 
-#: ../../mod/item.php:813
+#: ../../mod/item.php:815
 #, php-format
 msgid "You may visit them online at %s"
 msgstr ""
 
-#: ../../mod/item.php:814
+#: ../../mod/item.php:816
 msgid ""
 "Please contact the sender by replying to this post if you do not wish to "
 "receive these messages."
 msgstr ""
 
-#: ../../mod/item.php:816
+#: ../../mod/item.php:818
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -3788,8 +3788,8 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:375
-#: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:384
+#: ../../mod/profiles.php:498 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -3833,237 +3833,241 @@ msgstr ""
 msgid "Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:181
+#: ../../mod/profiles.php:180
+msgid "Address"
+msgstr ""
+
+#: ../../mod/profiles.php:187
 msgid "Location"
 msgstr ""
 
-#: ../../mod/profiles.php:253
+#: ../../mod/profiles.php:262
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:320
+#: ../../mod/profiles.php:329
 msgid " and "
 msgstr ""
 
-#: ../../mod/profiles.php:328
+#: ../../mod/profiles.php:337
 msgid "public profile"
 msgstr ""
 
-#: ../../mod/profiles.php:331
+#: ../../mod/profiles.php:340
 #, php-format
 msgid "%1$s changed %2$s to &ldquo;%3$s&rdquo;"
 msgstr ""
 
-#: ../../mod/profiles.php:332
+#: ../../mod/profiles.php:341
 #, php-format
 msgid " - Visit %1$s's %2$s"
 msgstr ""
 
-#: ../../mod/profiles.php:335
+#: ../../mod/profiles.php:344
 #, php-format
 msgid "%1$s has an updated %2$s, changing %3$s."
 msgstr ""
 
-#: ../../mod/profiles.php:394
+#: ../../mod/profiles.php:403
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:412 ../../mod/profiles.php:446
+#: ../../mod/profiles.php:421 ../../mod/profiles.php:455
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:431 ../../mod/profiles.php:473
+#: ../../mod/profiles.php:440 ../../mod/profiles.php:482
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:452
+#: ../../mod/profiles.php:461
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:510
+#: ../../mod/profiles.php:519
 msgid "Hide your contact/friend list from viewers of this profile?"
 msgstr ""
 
-#: ../../mod/profiles.php:533
+#: ../../mod/profiles.php:542
 msgid "Edit Profile Details"
 msgstr ""
 
-#: ../../mod/profiles.php:535
+#: ../../mod/profiles.php:544
 msgid "View this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:536
+#: ../../mod/profiles.php:545
 msgid "Create a new profile using these settings"
 msgstr ""
 
-#: ../../mod/profiles.php:537
+#: ../../mod/profiles.php:546
 msgid "Clone this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:538
+#: ../../mod/profiles.php:547
 msgid "Delete this profile"
 msgstr ""
 
-#: ../../mod/profiles.php:539
+#: ../../mod/profiles.php:548
 msgid "Profile Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:540
+#: ../../mod/profiles.php:549
 msgid "Your Full Name:"
 msgstr ""
 
-#: ../../mod/profiles.php:541
+#: ../../mod/profiles.php:550
 msgid "Title/Description:"
 msgstr ""
 
-#: ../../mod/profiles.php:542
+#: ../../mod/profiles.php:551
 msgid "Your Gender:"
 msgstr ""
 
-#: ../../mod/profiles.php:543
+#: ../../mod/profiles.php:552
 #, php-format
 msgid "Birthday (%s):"
 msgstr ""
 
-#: ../../mod/profiles.php:544
+#: ../../mod/profiles.php:553
 msgid "Street Address:"
 msgstr ""
 
-#: ../../mod/profiles.php:545
+#: ../../mod/profiles.php:554
 msgid "Locality/City:"
 msgstr ""
 
-#: ../../mod/profiles.php:546
+#: ../../mod/profiles.php:555
 msgid "Postal/Zip Code:"
 msgstr ""
 
-#: ../../mod/profiles.php:547
+#: ../../mod/profiles.php:556
 msgid "Country:"
 msgstr ""
 
-#: ../../mod/profiles.php:548
+#: ../../mod/profiles.php:557
 msgid "Region/State:"
 msgstr ""
 
-#: ../../mod/profiles.php:549
+#: ../../mod/profiles.php:558
 msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
 msgstr ""
 
-#: ../../mod/profiles.php:550
+#: ../../mod/profiles.php:559
 msgid "Who: (if applicable)"
 msgstr ""
 
-#: ../../mod/profiles.php:551
+#: ../../mod/profiles.php:560
 msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
 msgstr ""
 
-#: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43
+#: ../../mod/profiles.php:561 ../../include/profile_advanced.php:43
 msgid "Sexual Preference:"
 msgstr ""
 
-#: ../../mod/profiles.php:553
+#: ../../mod/profiles.php:562
 msgid "Homepage URL:"
 msgstr ""
 
-#: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49
+#: ../../mod/profiles.php:563 ../../include/profile_advanced.php:49
 msgid "Political Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:555
+#: ../../mod/profiles.php:564
 msgid "Religious Views:"
 msgstr ""
 
-#: ../../mod/profiles.php:556
+#: ../../mod/profiles.php:565
 msgid "Public Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:557
+#: ../../mod/profiles.php:566
 msgid "Private Keywords:"
 msgstr ""
 
-#: ../../mod/profiles.php:558
+#: ../../mod/profiles.php:567
 msgid "Example: fishing photography software"
 msgstr ""
 
-#: ../../mod/profiles.php:559
+#: ../../mod/profiles.php:568
 msgid "(Used for suggesting potential friends, can be seen by others)"
 msgstr ""
 
-#: ../../mod/profiles.php:560
+#: ../../mod/profiles.php:569
 msgid "(Used for searching profiles, never shown to others)"
 msgstr ""
 
-#: ../../mod/profiles.php:561
+#: ../../mod/profiles.php:570
 msgid "Tell us about yourself..."
 msgstr ""
 
-#: ../../mod/profiles.php:562
+#: ../../mod/profiles.php:571
 msgid "Hobbies/Interests"
 msgstr ""
 
-#: ../../mod/profiles.php:563
+#: ../../mod/profiles.php:572
 msgid "Contact information and Social Networks"
 msgstr ""
 
-#: ../../mod/profiles.php:564
+#: ../../mod/profiles.php:573
 msgid "Musical interests"
 msgstr ""
 
-#: ../../mod/profiles.php:565
+#: ../../mod/profiles.php:574
 msgid "Books, literature"
 msgstr ""
 
-#: ../../mod/profiles.php:566
+#: ../../mod/profiles.php:575
 msgid "Television"
 msgstr ""
 
-#: ../../mod/profiles.php:567
+#: ../../mod/profiles.php:576
 msgid "Film/dance/culture/entertainment"
 msgstr ""
 
-#: ../../mod/profiles.php:568
+#: ../../mod/profiles.php:577
 msgid "Love/romance"
 msgstr ""
 
-#: ../../mod/profiles.php:569
+#: ../../mod/profiles.php:578
 msgid "Work/employment"
 msgstr ""
 
-#: ../../mod/profiles.php:570
+#: ../../mod/profiles.php:579
 msgid "School/education"
 msgstr ""
 
-#: ../../mod/profiles.php:575
+#: ../../mod/profiles.php:584
 msgid ""
 "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
 "be visible to anybody using the internet."
 msgstr ""
 
-#: ../../mod/profiles.php:585 ../../mod/directory.php:111
+#: ../../mod/profiles.php:594 ../../mod/directory.php:111
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:620
+#: ../../mod/profiles.php:629
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:621 ../../boot.php:1069
+#: ../../mod/profiles.php:630 ../../boot.php:1069
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:622 ../../boot.php:1070
+#: ../../mod/profiles.php:631 ../../boot.php:1070
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:633 ../../boot.php:1080
+#: ../../mod/profiles.php:642 ../../boot.php:1080
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:635 ../../boot.php:1083
+#: ../../mod/profiles.php:644 ../../boot.php:1083
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:636 ../../boot.php:1084
+#: ../../mod/profiles.php:645 ../../boot.php:1084
 msgid "Edit visibility"
 msgstr ""
 

From 5a7363b248e51b93c401a84d1b99f33632c44711 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 26 May 2012 16:21:48 -0700
Subject: [PATCH 03/13] more ssl policy stuff

---
 boot.php | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/boot.php b/boot.php
index 3f4820d67d..b41b8d9a0e 100644
--- a/boot.php
+++ b/boot.php
@@ -441,22 +441,19 @@ if(! class_exists('App')) {
 				if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL))
 					$scheme = 'https';
 
-				//			We need to populate the $ssl flag across the entire program before turning this on.
-				//			Basically, we'll have $ssl = true on any links which can only be seen by a logged in user
-				//			(and also the login link). Anything seen by an outsider will have it turned off.
-				//			At present, setting SSL_POLICY_SELFSIGN will only force remote contacts to update their
-				//			contact links to this site with "http:" if they are currently using "https:"
+				//	Basically, we have $ssl = true on any links which can only be seen by a logged in user
+				//	(and also the login link). Anything seen by an outsider will have it turned off.
 
-				//			if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
-				//				if($ssl)
-				//					$scheme = 'https';
-				//				else
-				//					$scheme = 'http';
-					//			}
-		}
+				if($this->config['system']['ssl_policy'] == SSL_POLICY_SELFSIGN) {
+					if($ssl)
+						$scheme = 'https';
+					else
+						$scheme = 'http';
+				}
+			}
 
-				$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
-				return $this->baseurl;
+			$this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+			return $this->baseurl;
 		}
 
 		function set_baseurl($url) {

From 08941d42856984a3076e972804ac016400341f91 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 26 May 2012 23:46:42 -0700
Subject: [PATCH 04/13] handle multiple underscores in D* links

---
 include/auth.php        | 2 ++
 include/bb2diaspora.php | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/include/auth.php b/include/auth.php
index b87662fea2..cba6a67a7f 100644
--- a/include/auth.php
+++ b/include/auth.php
@@ -53,6 +53,8 @@ if((isset($_SESSION)) && (x($_SESSION,'authenticated')) && ((! (x($_POST,'auth-p
 		$check = get_config('system','paranoia');
 		// extra paranoia - if the IP changed, log them out
 		if($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
+			logger('Session address changed. Paranoid setting in effect, blocking session. ' 
+				. $_SESSION['addr'] . ' != ' . $_SERVER['REMOTE_ADDR']);
 			nuke_session();
 			goaway(z_root());
 		}
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 8487f845a6..d86ba45437 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -221,13 +221,18 @@ function bb2diaspora($Text,$preserve_nl = false) {
 
 	$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
 
-	$Text = preg_replace('/\[(.*?)\]\((.*?)\\\\_(.*?)\)/ism','[$1]($2_$3)',$Text);
+	$Text = preg_replace_callback('/\[(.*?)\]\((.*?)\)/ism','unescape_underscores_in_links',$Text);
 	
 	call_hooks('bb2diaspora',$Text);
 
 	return $Text;
 }
 
+function unescape_underscores_in_links($m) {
+	$y = str_replace('\\_','_', $m[2]);
+	return('[' . $m[1] . '](' . $y . ')');
+}
+
 function format_event_diaspora($ev) {
 
 	$a = get_app();

From 2bd1004587fc8d928b9458b2383b656df115578c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 27 May 2012 21:01:58 -0700
Subject: [PATCH 05/13] rework the way private photos are embedded to avoid url
 differences and also check the permissions if possible to make sure that
 nothing sneaks by.

---
 boot.php             |   2 +-
 include/delivery.php |   2 +-
 include/items.php    |  88 +++++++++++++++++++++++++++++---
 include/notifier.php |   2 +-
 mod/settings.php     |   1 +
 util/messages.po     | 116 +++++++++++++++++++++----------------------
 6 files changed, 142 insertions(+), 69 deletions(-)

diff --git a/boot.php b/boot.php
index b41b8d9a0e..aff026a71d 100644
--- 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',      '3.0.1355' );
+define ( 'FRIENDICA_VERSION',      '3.0.1356' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1144      );
 
diff --git a/include/delivery.php b/include/delivery.php
index 61b0bd33a5..32943d5dab 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -288,7 +288,7 @@ function delivery_run($argv, $argc){
 
 					if($normal_mode) {
 						if($item_id == $item['id'] || $item['id'] == $item['parent'])
-							$atom .= atom_entry($item,'text',null,$owner,true);
+							$atom .= atom_entry($item,'text',null,$owner,true,(($top_level) ? $contact['id'] : 0));
 					}
 					else
 						$atom .= atom_entry($item,'text',null,$owner,true);
diff --git a/include/items.php b/include/items.php
index e5b640fd23..f45b40cc0b 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2832,7 +2832,7 @@ function atom_author($tag,$name,$uri,$h,$w,$photo) {
 	return $o;
 }
 
-function atom_entry($item,$type,$author,$owner,$comment = false) {
+function atom_entry($item,$type,$author,$owner,$comment = false,$cid = 0) {
 
 	$a = get_app();
 
@@ -2844,7 +2844,7 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 
 
 	if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
-		$body = fix_private_photos($item['body'],$owner['uid']);
+		$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
 	else
 		$body = $item['body'];
 
@@ -2927,14 +2927,17 @@ function atom_entry($item,$type,$author,$owner,$comment = false) {
 	return $o;
 }
 
-function fix_private_photos($s,$uid) {
+function fix_private_photos($s,$uid, $item = null, $cid = 0) {
 	$a = get_app();
-	logger('fix_private_photos');
+
+	logger('fix_private_photos', LOGGER_DEBUG);
+	$site = substr($a->get_baseurl(),strpos($a->get_baseurl,'://'));
 
 	if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) {
 		$image = $matches[1];
-		logger('fix_private_photos: found photo ' . $image);
-		if(stristr($image ,$a->get_baseurl() . '/photo/')) {
+		logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
+		if(stristr($image , $site . '/photo/')) {
+			$replace = false;
 			$i = basename($image);
 			$i = str_replace('.jpg','',$i);
 			$x = strpos($i,'-');
@@ -2947,8 +2950,39 @@ function fix_private_photos($s,$uid) {
 					intval($uid)
 				);
 				if(count($r)) {
-					logger('replacing photo');
-					$s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
+
+					// Check to see if we should replace this photo link with an embedded image
+					// 1. No need to do so if the photo is public
+					// 2. If there's a contact-id provided, see if they're in the access list
+					//    for the photo. If so, embed it. 
+					// 3. Otherwise, if we have an item, see if the item permissions match the photo
+					//    permissions, regardless of order but first check to see if they're an exact
+					//    match to save some processing overhead.
+				
+					// Currently we only embed one private photo per message so as not to hit import 
+					// size limits at the receiving end.
+
+					// To embed multiples, we would need to parse out the embedded photos on message
+					// receipt and limit size based only on the text component. Would also need to
+					// ignore all photos during bbcode translation and item localisation, as these
+					// will hit internal regex backtrace limits.  
+
+					if(has_permissions($r[0])) {
+						if($cid) {
+							$recips = enumerate_permissions($r[0]);
+							if(in_array($cid, $recips)) {
+								$replace = true;	
+							}
+						}
+						elseif($item) {
+							if(compare_permissions($item,$r[0]))
+								$replace = true;
+						}
+					}
+					if($replace) {
+						logger('replacing photo');
+						$s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
+					}
 				}
 			}
 			logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
@@ -2958,6 +2992,44 @@ function fix_private_photos($s,$uid) {
 }
 
 
+function has_permissions($obj) {
+	if(($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != ''))
+		return true;
+	return false;
+}
+
+function compare_permissions($obj1,$obj2) {
+	// first part is easy. Check that these are exactly the same. 
+	if(($obj1['allow_cid'] == $obj2['allow_cid'])
+		&& ($obj1['allow_gid'] == $obj2['allow_gid'])
+		&& ($obj1['deny_cid'] == $obj2['deny_cid'])
+		&& ($obj1['deny_gid'] == $obj2['deny_gid']))
+		return true;
+
+	// This is harder. Parse all the permissions and compare the resulting set.
+
+	$recipients1 = enumerate_permissions($obj1);
+	$recipients2 = enumerate_permissions($obj2);
+	sort($recipients1);
+	sort($recipients2);
+	if($recipients1 == $recipients2)
+		return true;
+	return false;
+}
+
+// returns an array of contact-ids that are allowed to see this object
+
+function enumerate_permissions($obj) {
+	require_once('include/group.php');
+	$allow_people = expand_acl($obj['allow_cid']);
+	$allow_groups = expand_groups(expand_acl($obj['allow_gid']));
+	$deny_people  = expand_acl($obj['deny_cid']);
+	$deny_groups  = expand_groups(expand_acl($obj['deny_gid']));
+	$recipients   = array_unique(array_merge($allow_people,$allow_groups));
+	$deny         = array_unique(array_merge($deny_people,$deny_groups));
+	$recipients   = array_diff($recipients,$deny);
+	return $recipients;
+}
 
 function item_getfeedtags($item) {
 	$ret = array();
diff --git a/include/notifier.php b/include/notifier.php
index cb4fb2a31c..070e7a4361 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -345,7 +345,7 @@ function notifier_run($argv, $argc){
 	if($mail) {
 		$public_message = false;  // mail is  not public
 
-		$body = fix_private_photos($item['body'],$owner['uid']);
+		$body = fix_private_photos($item['body'],$owner['uid'],null,$message[0]['contact-id']);
 
 		$atom .= replace_macros($mail_template, array(
 			'$name'         => xmlify($owner['name']),
diff --git a/mod/settings.php b/mod/settings.php
index 40fa55eeaa..e6eb4011fa 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -15,6 +15,7 @@ function get_theme_config_file($theme){
 }
 
 function settings_init(&$a) {
+
 	// These lines provide the javascript needed by the acl selector
 
 	$a->page['htmlhead'] .= "<script> var ispublic = '" . t('everybody') . "';" ;
diff --git a/util/messages.po b/util/messages.po
index 2f6a1c4068..f07c1d11fd 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1355\n"
+"Project-Id-Version: 3.0.1356\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-26 10:00-0700\n"
+"POT-Creation-Date: 2012-05-27 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -221,7 +221,7 @@ msgid "link to source"
 msgstr ""
 
 #: ../../mod/events.php:324 ../../view/theme/diabook/theme.php:126
-#: ../../include/nav.php:52 ../../boot.php:1523
+#: ../../include/nav.php:52 ../../boot.php:1520
 msgid "Events"
 msgstr ""
 
@@ -271,7 +271,7 @@ msgid "Description:"
 msgstr ""
 
 #: ../../mod/events.php:423 ../../include/event.php:37
-#: ../../include/bb2diaspora.php:260 ../../boot.php:1103
+#: ../../include/bb2diaspora.php:265 ../../boot.php:1100
 msgid "Location:"
 msgstr ""
 
@@ -346,7 +346,7 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: ../../mod/photos.php:43 ../../boot.php:1517
+#: ../../mod/photos.php:43 ../../boot.php:1514
 msgid "Photo Albums"
 msgstr ""
 
@@ -551,7 +551,7 @@ msgstr ""
 
 #: ../../mod/photos.php:1295 ../../mod/photos.php:1335
 #: ../../mod/photos.php:1366 ../../include/conversation.php:558
-#: ../../boot.php:517
+#: ../../boot.php:514
 msgid "Comment"
 msgstr ""
 
@@ -1135,7 +1135,7 @@ msgid ""
 msgstr ""
 
 #: ../../mod/localtime.php:12 ../../include/event.php:11
-#: ../../include/bb2diaspora.php:238
+#: ../../include/bb2diaspora.php:243
 msgid "l F d, Y \\@ g:i A"
 msgstr ""
 
@@ -1181,7 +1181,7 @@ msgid "is interested in:"
 msgstr ""
 
 #: ../../mod/match.php:58 ../../mod/suggest.php:59
-#: ../../include/contact_widgets.php:9 ../../boot.php:1047
+#: ../../include/contact_widgets.php:9 ../../boot.php:1044
 msgid "Connect"
 msgstr ""
 
@@ -1708,7 +1708,7 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1178
 #: ../../addon/public_server/public_server.php:62
 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2738
-#: ../../boot.php:697
+#: ../../boot.php:694
 msgid "Administrator"
 msgstr ""
 
@@ -1718,7 +1718,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:83 ../../boot.php:829
+#: ../../mod/lostpass.php:83 ../../boot.php:826
 msgid "Password Reset"
 msgstr ""
 
@@ -2384,7 +2384,7 @@ msgstr ""
 msgid "Invalid contact."
 msgstr ""
 
-#: ../../mod/notes.php:44 ../../boot.php:1529
+#: ../../mod/notes.php:44 ../../boot.php:1526
 msgid "Personal Notes"
 msgstr ""
 
@@ -2635,7 +2635,7 @@ msgstr ""
 
 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:123
 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
-#: ../../include/nav.php:50 ../../boot.php:1508
+#: ../../include/nav.php:50 ../../boot.php:1505
 msgid "Profile"
 msgstr ""
 
@@ -2807,7 +2807,7 @@ msgstr ""
 msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:795
+#: ../../mod/register.php:546 ../../include/nav.php:81 ../../boot.php:792
 msgid "Register"
 msgstr ""
 
@@ -2850,7 +2850,7 @@ msgid "Access denied."
 msgstr ""
 
 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:125
-#: ../../include/nav.php:51 ../../boot.php:1514
+#: ../../include/nav.php:51 ../../boot.php:1511
 msgid "Photos"
 msgstr ""
 
@@ -3633,7 +3633,7 @@ msgstr ""
 msgid "FTP Password"
 msgstr ""
 
-#: ../../mod/profile.php:21 ../../boot.php:960
+#: ../../mod/profile.php:21 ../../boot.php:957
 msgid "Requested profile is not available."
 msgstr ""
 
@@ -3703,8 +3703,8 @@ msgid ""
 "Account not found and OpenID registration is not permitted on this site."
 msgstr ""
 
-#: ../../mod/openid.php:93 ../../include/auth.php:97
-#: ../../include/auth.php:160
+#: ../../mod/openid.php:93 ../../include/auth.php:99
+#: ../../include/auth.php:162
 msgid "Login failed."
 msgstr ""
 
@@ -4051,23 +4051,23 @@ msgstr ""
 msgid "Edit/Manage Profiles"
 msgstr ""
 
-#: ../../mod/profiles.php:630 ../../boot.php:1069
+#: ../../mod/profiles.php:630 ../../boot.php:1066
 msgid "Change profile photo"
 msgstr ""
 
-#: ../../mod/profiles.php:631 ../../boot.php:1070
+#: ../../mod/profiles.php:631 ../../boot.php:1067
 msgid "Create New Profile"
 msgstr ""
 
-#: ../../mod/profiles.php:642 ../../boot.php:1080
+#: ../../mod/profiles.php:642 ../../boot.php:1077
 msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/profiles.php:644 ../../boot.php:1083
+#: ../../mod/profiles.php:644 ../../boot.php:1080
 msgid "visible to everybody"
 msgstr ""
 
-#: ../../mod/profiles.php:645 ../../boot.php:1084
+#: ../../mod/profiles.php:645 ../../boot.php:1081
 msgid "Edit visibility"
 msgstr ""
 
@@ -4675,7 +4675,7 @@ msgstr ""
 
 #: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:470
-#: ../../boot.php:518
+#: ../../boot.php:515
 msgid "show more"
 msgstr ""
 
@@ -4691,7 +4691,7 @@ msgstr ""
 #: ../../addon/communityhome/communityhome.php:34
 #: ../../addon/communityhome/twillingham/communityhome.php:28
 #: ../../addon/communityhome/twillingham/communityhome.php:34
-#: ../../include/nav.php:64 ../../boot.php:816
+#: ../../include/nav.php:64 ../../boot.php:813
 msgid "Login"
 msgstr ""
 
@@ -5868,7 +5868,7 @@ msgstr ""
 msgid "Set colour scheme"
 msgstr ""
 
-#: ../../include/profile_advanced.php:17 ../../boot.php:1105
+#: ../../include/profile_advanced.php:17 ../../boot.php:1102
 msgid "Gender:"
 msgstr ""
 
@@ -5889,11 +5889,11 @@ msgstr ""
 msgid "Age:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:37 ../../boot.php:1108
+#: ../../include/profile_advanced.php:37 ../../boot.php:1105
 msgid "Status:"
 msgstr ""
 
-#: ../../include/profile_advanced.php:45 ../../boot.php:1110
+#: ../../include/profile_advanced.php:45 ../../boot.php:1107
 msgid "Homepage:"
 msgstr ""
 
@@ -6249,11 +6249,11 @@ msgstr ""
 msgid "Ask me"
 msgstr ""
 
-#: ../../include/event.php:17 ../../include/bb2diaspora.php:244
+#: ../../include/event.php:17 ../../include/bb2diaspora.php:249
 msgid "Starts:"
 msgstr ""
 
-#: ../../include/event.php:27 ../../include/bb2diaspora.php:252
+#: ../../include/event.php:27 ../../include/bb2diaspora.php:257
 msgid "Finishes:"
 msgstr ""
 
@@ -6477,7 +6477,7 @@ msgstr ""
 msgid "Contacts not in any group"
 msgstr ""
 
-#: ../../include/nav.php:46 ../../boot.php:815
+#: ../../include/nav.php:46 ../../boot.php:812
 msgid "Logout"
 msgstr ""
 
@@ -6485,7 +6485,7 @@ msgstr ""
 msgid "End this session"
 msgstr ""
 
-#: ../../include/nav.php:49 ../../boot.php:1502
+#: ../../include/nav.php:49 ../../boot.php:1499
 msgid "Status"
 msgstr ""
 
@@ -6565,11 +6565,11 @@ msgstr ""
 msgid "Manage other pages"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1063
+#: ../../include/nav.php:138 ../../boot.php:1060
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/nav.php:138 ../../boot.php:1063
+#: ../../include/nav.php:138 ../../boot.php:1060
 msgid "Manage/edit profiles"
 msgstr ""
 
@@ -6652,13 +6652,13 @@ msgstr ""
 msgid "Logged out."
 msgstr ""
 
-#: ../../include/auth.php:113
+#: ../../include/auth.php:115
 msgid ""
 "We encountered a problem while logging in with the OpenID you provided. "
 "Please check the correct spelling of the ID."
 msgstr ""
 
-#: ../../include/auth.php:113
+#: ../../include/auth.php:115
 msgid "The error message was:"
 msgstr ""
 
@@ -7236,96 +7236,96 @@ msgstr ""
 msgid "permissions"
 msgstr ""
 
-#: ../../boot.php:516
+#: ../../boot.php:513
 msgid "Delete this item?"
 msgstr ""
 
-#: ../../boot.php:519
+#: ../../boot.php:516
 msgid "show fewer"
 msgstr ""
 
-#: ../../boot.php:692
+#: ../../boot.php:689
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:694
+#: ../../boot.php:691
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:794
+#: ../../boot.php:791
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:818
+#: ../../boot.php:815
 msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../boot.php:819
+#: ../../boot.php:816
 msgid "Password: "
 msgstr ""
 
-#: ../../boot.php:822
+#: ../../boot.php:819
 msgid "Or login using OpenID: "
 msgstr ""
 
-#: ../../boot.php:828
+#: ../../boot.php:825
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:995
+#: ../../boot.php:992
 msgid "Edit profile"
 msgstr ""
 
-#: ../../boot.php:1055
+#: ../../boot.php:1052
 msgid "Message"
 msgstr ""
 
-#: ../../boot.php:1171 ../../boot.php:1247
+#: ../../boot.php:1168 ../../boot.php:1244
 msgid "g A l F d"
 msgstr ""
 
-#: ../../boot.php:1172 ../../boot.php:1248
+#: ../../boot.php:1169 ../../boot.php:1245
 msgid "F d"
 msgstr ""
 
-#: ../../boot.php:1217 ../../boot.php:1288
+#: ../../boot.php:1214 ../../boot.php:1285
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:1229
+#: ../../boot.php:1226
 msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../boot.php:1230
+#: ../../boot.php:1227
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:1281
+#: ../../boot.php:1278
 msgid "[No description]"
 msgstr ""
 
-#: ../../boot.php:1299
+#: ../../boot.php:1296
 msgid "Event Reminders"
 msgstr ""
 
-#: ../../boot.php:1300
+#: ../../boot.php:1297
 msgid "Events this week:"
 msgstr ""
 
-#: ../../boot.php:1505
+#: ../../boot.php:1502
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: ../../boot.php:1511
+#: ../../boot.php:1508
 msgid "Profile Details"
 msgstr ""
 
-#: ../../boot.php:1526
+#: ../../boot.php:1523
 msgid "Events and Calendar"
 msgstr ""
 
-#: ../../boot.php:1532
+#: ../../boot.php:1529
 msgid "Only You Can See This"
 msgstr ""

From b752acd089424403a8cfbd5fc3e633baa4e2e363 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 27 May 2012 21:36:20 -0700
Subject: [PATCH 06/13] birthday in november,december bug

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

diff --git a/include/profile_advanced.php b/include/profile_advanced.php
index bb9850cd02..8c2acd8e76 100644
--- a/include/profile_advanced.php
+++ b/include/profile_advanced.php
@@ -25,8 +25,8 @@ function advanced_profile(&$a) {
 		
 			$val = ((intval($a->profile['dob'])) 
 				? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
-				: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00',$short_bd_format)));
-			
+				: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
+
 			$profile['birthday'] = array( t('Birthday:'), $val);
 
 		}

From ff0291c8765832698ffbd31d3f551f61e9223819 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 27 May 2012 22:35:01 -0700
Subject: [PATCH 07/13] add plugin hooks to gender, sexpref, and marital
 selectors

---
 include/profile_selectors.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/include/profile_selectors.php b/include/profile_selectors.php
index 4700bb96f2..8d29fd0998 100644
--- a/include/profile_selectors.php
+++ b/include/profile_selectors.php
@@ -5,6 +5,8 @@ function gender_selector($current="",$suffix="") {
 	$o = '';
 	$select = array('', t('Male'), t('Female'), t('Currently Male'), t('Currently Female'), t('Mostly Male'), t('Mostly Female'), t('Transgender'), t('Intersex'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Non-specific'), t('Other'), t('Undecided'));
 
+	call_hooks('gender_selector', $select);
+
 	$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
 	foreach($select as $selection) {
 		if($selection !== 'NOTRANSLATION') {
@@ -20,6 +22,9 @@ function sexpref_selector($current="",$suffix="") {
 	$o = '';
 	$select = array('', t('Males'), t('Females'), t('Gay'), t('Lesbian'), t('No Preference'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Deviant'), t('Fetish'), t('Oodles'), t('Nonsexual'));
 
+
+	call_hooks('sexpref_selector', $select);
+
 	$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
 	foreach($select as $selection) {
 		if($selection !== 'NOTRANSLATION') {
@@ -36,6 +41,8 @@ function marital_selector($current="",$suffix="") {
 	$o = '';
 	$select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Has crush'), t('Infatuated'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Imaginarily married'), t('Partners'), t('Cohabiting'), t('Common law'), t('Happy'), t('Not looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Imaginarily divorced'), t('Widowed'), t('Uncertain'), t('It\'s complicated'), t('Don\'t care'), t('Ask me') );
 
+	call_hooks('marital_selector', $select);
+
 	$o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
 	foreach($select as $selection) {
 		if($selection !== 'NOTRANSLATION') {

From 6962989e52f0ce442fbb3e59992eeb528faa12da Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 27 May 2012 23:02:25 -0700
Subject: [PATCH 08/13] slackr - tone down the shadows a smidgin

---
 view/theme/slackr/style.css | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index 82ba795cde..40391e17c5 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -43,7 +43,7 @@ nav #site-location {
 #profile-jot-text_parent, .mceLayout {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px 0 #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
 }
 
 #profile-jot-text:hover {
@@ -66,24 +66,29 @@ nav #site-location {
 .wall-item-photo, .photo, .contact-block-img, .my-comment-photo {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px 0 #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
 }
 
 #sidebar-page-list img {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px -2px #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
 }
 
 .contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .fc, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
-	box-shadow: 3px 3px 10px 0 #000000;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
+
+.photo {
+	border: 1px solid #AAAAAA;
 }
 
 .photo-top-photo, .photo-album-photo {
 	padding: 10px;
 	max-width: 300px;
+	border: 1px solid #888888;
 }
 
 .rotleft1 {

From cb259098dd112d6a5ad3900bbccec614b0482ca1 Mon Sep 17 00:00:00 2001
From: Simon L'nu <simon.lnu@gmail.com>
Date: Mon, 28 May 2012 19:25:10 -0400
Subject: [PATCH 09/13] fixed font-size/line-height stuffs

Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
---
 view/theme/dispy/communityhome.tpl |  40 ++--
 view/theme/dispy/config.php        |  16 +-
 view/theme/dispy/dark/_base.less   |  21 +-
 view/theme/dispy/dark/style.css    |  13 +-
 view/theme/dispy/dark/style.less   |  24 ++-
 view/theme/dispy/dark/theme.php    |   2 -
 view/theme/dispy/light/_base.less  |  20 +-
 view/theme/dispy/light/style.less  |  24 ++-
 view/theme/dispy/light/theme.php   |   2 -
 view/theme/dispy/style.php         | 302 ++++++++---------------------
 view/theme/dispy/theme.php         |   2 +-
 11 files changed, 172 insertions(+), 294 deletions(-)

diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 4d09b92558..aaa27465b0 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -2,7 +2,6 @@
 <div>$page</div>
 {{ endif }}
 
-{{ if $lastusers_title }}
 <h3 id="extra-help-header">Help or '@NewHere'?</h3>
 <div id="extra-help">
 <a href="https://helpers.pyxis.uberspace.de/profile/helpers"
@@ -13,27 +12,24 @@
 	title="Local Friendica" target="_blank">Local Friendica</a><br />
 <a href="http://kakste.com/profile/newhere" title="@NewHere" target="_blank">NewHere</a>
 </div>
-{{ endif }}
 
-{{ if $lastusers_title }}
 <h3 id="connect-services-header">Connectable Services</h3>
-<div id="connect-services">
-<a href="$url/facebook"><img alt="Facebook"
-	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a>
-<a href="$url/settings/connectors"><img
-	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png?" title="StatusNet" /></a>
-<a href="$url/settings/connectors"><img
-	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png?" title="LiveJournal" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Posterous" src="view/theme/dispy/icons/posterous.png?" title="Posterous" /></a><br />
-<a href="$url/settings/connectors"><img
-	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png?" title="Tumblr" /></a>
-<a href="$url/settings/connectors"><img
-	alt="Twitter" src="view/theme/dispy/icons/twitter.png?" title="Twitter" /></a>
-<a href="$url/settings/connectors"><img
-	alt="WordPress" src="view/theme/dispy/icons/wordpress.png?" title="WordPress" /></a>
-<a href="$url/settings/connectors"><img
-	alt="E-Mail" src="view/theme/dispy/icons/email.png?" title="E-Mail" /></a>
-</div>
-{{ endif }}
+<ul id="connect-services">
+<li><a href="$url/facebook"><img alt="Facebook"
+	src="view/theme/dispy/icons/facebook.png" title="Facebook" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="StatusNet" src="view/theme/dispy/icons/StatusNet.png" title="StatusNet" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="LiveJournal" src="view/theme/dispy/icons/livejournal.png" title="LiveJournal" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Posterous" src="view/theme/dispy/icons/posterous.png" title="Posterous" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Tumblr" src="view/theme/dispy/icons/tumblr.png" title="Tumblr" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="Twitter" src="view/theme/dispy/icons/twitter.png" title="Twitter" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="WordPress" src="view/theme/dispy/icons/wordpress.png" title="WordPress" /></a></li>
+<li><a href="$url/settings/connectors"><img
+	alt="E-Mail" src="view/theme/dispy/icons/email.png" title="E-Mail" /></a></li>
+</ul>
 
diff --git a/view/theme/dispy/config.php b/view/theme/dispy/config.php
index a24288bf86..25663c10ba 100644
--- a/view/theme/dispy/config.php
+++ b/view/theme/dispy/config.php
@@ -41,17 +41,17 @@ function theme_admin_post(&$a) {
 
 function dispy_form(&$a, $font_size, $line_height, $colour) {
 	$line_heights = array(
-		"1.3"=>"1.3",
-		"---"=>"---",
-		"1.6"=>"1.6",				
-		"1.5"=>"1.5",		
-		"1.4"=>"1.4",
-		"1.2"=>"1.2",
-		"1.1"=>"1.1",
+		"1.3" => "1.3",
+		"---" => "---",
+		"1.6" => "1.6",				
+		"1.5" => "1.5",		
+		"1.4" => "1.4",
+		"1.2" => "1.2",
+		"1.1" => "1.1",
 	);	
 	$font_sizes = array(
 		'12' => '12',
-		'14' =>'14',
+		'14' => '14',
 		"---" => "---",
 		"16" => "16",		
 		"15" => "15",
diff --git a/view/theme/dispy/dark/_base.less b/view/theme/dispy/dark/_base.less
index 000cdbd5ab..d1051a989f 100644
--- a/view/theme/dispy/dark/_base.less
+++ b/view/theme/dispy/dark/_base.less
@@ -17,6 +17,7 @@
 @import "../css/reset";
 
 //* backgrounds */
+@lt_bg_colour: lighten(@bg_colour, 10%);
 @dk_bg_colour: #1d1f1d;
 @bg_colour: #2e2f2e;
 @bg_alt_colour: #2e302e;
@@ -24,8 +25,9 @@
 @menu_bg_colour: #555753;
 
 //* font colour, aka color: */
-@lt_main_colour: #ffff99;
+@lt_main_colour: lighten(@main_colour, 10%);
 @main_colour: #eeeecc;
+@dk_main_colour: darken(@main_colour, 20%);
 @main_alt_colour: #eeeeee;
 // darken(@main_alt_colour, 13%) > #cdcdcd
 // darken(@main_alt_colour, 13.5%) > #cccccc
@@ -56,9 +58,6 @@
 @info: #1353b1;
 @alert: #ff0000;
 
-@lt_main_colour: lighten(@bg_colour, 10%);
-@dk_main_colour: darken(@bg_colour, 10%);
-
 //* links */
 @link_colour: #88a9d2;
 @dk_link_colour: darken(@link_colour, 10%);
@@ -137,7 +136,19 @@
 	-webkit-text-overflow: @t;
 	text-overflow: @t;
 }
-
+.lin_gradient(@x1: left, @x2: right, @y1: top, @y2: bottom, @c1: @bg_colour, @c2: @dk_bg_colour) {
+	// w3c
+	background: linear-gradient(@x1 @y2, @c1, @c2);
+	// webkit
+	// -webkit-gradient(<type>, <point> [, <radius>]?, <point> [, <radius>]? [, <stop>]*)
+	background: -webkit-gradient(linear, @x1 @y1, @x2 @y2, from(@c1), to(@c2));
+	// mozilla
+	// -moz-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>])
+	background: -moz-linear-gradient(@x1 @y2, @c1, @c2);
+	// opera
+	//background: -o-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>]);
+	background: -o-linear-gradient(@x1, @c1, @c2);
+}
 //* pre wrap */
 .wrap () {
 	white-space: pre-wrap;
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 029722c3ac..965350749b 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -20,7 +20,7 @@ tr:nth-child(even){background-color:#474947;}
 :focus{outline:none;}
 a:focus{outline:invert, dashed, thin;}
 [disabled="disabled"]{background:#4e4f4e;color:#ddddbb;}
-ins,mark{background-color:#2e302e;color:#474947;}
+ins,mark{background-color:#2e302e;color:#fbfbf2;}
 ins{text-decoration:none;}
 mark{font-style:italic;font-weight:bold;}
 pre,code,kbd,samp,.wall-item-body code{font-family:monospace, monospace;_font-family:monospace;font-size:1em;}
@@ -58,7 +58,7 @@ h6{font-size:xx-small;}
 #articlemain{width:100%;height:100%;margin:0 auto;}
 .button{color:#eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;padding:5px;cursor:pointer;}.button a{color:#eeeecc;font-weight:bold;}
 #profile-listing-desc a{color:#eeeecc;font-weight:bold;}
-[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:3px ridge #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
+[class$="-desc"],[id$="-desc"]{color:#eeeecc;background:#2e2f2e;border:2px outset #d4d580;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:3px 10px 7px 0;padding:5px;font-weight:bold;font-size:smaller;}
 #item-delete-selected-desc{float:left;margin-right:5px;}#item-delete-selected-desc:hover{text-decoration:underline;}
 .intro-approve-as-friend-desc{margin-top:10px;}
 .intro-desc{margin-bottom:20px;font-weight:bold;}
@@ -133,7 +133,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #sysmsg_info{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
 #sysmsg{position:fixed;bottom:0;-moz-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-o-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-webkit-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;-ms-box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;box-shadow:3px 3px 3px 10px 0 #111111 5px 5px 0px #111111;padding:10px;background-color:#fcaf3e;border:2px solid #f8911b;border-bottom:0;padding-bottom:50px;z-index:1000;}
 #sysmsg_info br,#sysmsg br{display:block;margin:2px 0px;border-top:1px solid #eeeecc;}
-#asidemain{float:left;font-size:small;margin:20px 0 20px 35px;width:25%;display:inline;}
+#asidemain{float:left;font-size:small;margin:1em;width:25%;display:inline;}
 #asideright,#asideleft{display:none;}
 .vcard .fn{font-size:1.5em;font-weight:bold;border-bottom:1px solid #638ec4;padding-bottom:3px;}
 .vcard #profile-photo-wrapper{margin:20px 0;background-color:#555753;padding:5px;width:175px;height:175px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:3px 3px 10px 0 #111111;-o-box-shadow:3px 3px 10px 0 #111111;-webkit-box-shadow:3px 3px 10px 0 #111111;-ms-box-shadow:3px 3px 10px 0 #111111;box-shadow:3px 3px 10px 0 #111111;}
@@ -187,7 +187,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 #jot-title-display{font-weight:bold;}
 .jothidden{display:none;}
 #jot-preview-content{background-color:#2e3436;color:#eeeecc;border:1px solid #2e2f2e;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;-moz-box-shadow:5px 0 10px 0px #111111;-o-box-shadow:5px 0 10px 0px #111111;-webkit-box-shadow:5px 0 10px 0px #111111;-ms-box-shadow:5px 0 10px 0px #111111;box-shadow:5px 0 10px 0px #111111;padding:3px 3px 6px 10px;}#jot-preview-content .wall-item-outside-wrapper{border:0;-o-border-radius:0px 0px 0px 0px;-webkit-border-radius:0px 0px 0px 0px;-moz-border-radius:0px 0px 0px 0px;-ms-border-radius:0px 0px 0px 0px;border-radius:0px 0px 0px 0px;-moz-box-shadow:0 0 0 0 #111111;-o-box-shadow:0 0 0 0 #111111;-webkit-box-shadow:0 0 0 0 #111111;-ms-box-shadow:0 0 0 0 #111111;box-shadow:0 0 0 0 #111111;}
-#sectionmain{margin:20px;font-size:0.8em;min-width:475px;width:67%;float:left;display:inline;}
+#sectionmain{margin:1em;font-size:0.8em;min-width:475px;width:69%;float:left;display:inline;}
 .tabs{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:10px 0;}.tabs li{display:inline;font-size:smaller;}
 .tab{border:1px solid #638ec4;padding:4px;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}.tab:active,.tab:hover{background:#2e3436;color:#eeeecc;border:1px solid #638ec4;}
 .tab a{border:0;text-decoration:none;}
@@ -203,7 +203,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 [id^="tread-wrapper"],[class^="tread-wrapper"]{margin:1.2em 0 0 0;padding:0px;}
 .wall-item-photo-menu{display:none;}
 .wall-item-photo-menu-button{display:none;text-indent:-99999px;background:#555753 url(dark/menu-user-pin.jpg) no-repeat 75px center;position:absolute;overflow:hidden;width:90px;height:20px;top:85px;left:0;-o-border-radius:0 0 5px 5px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;-ms-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;}
-.wall-item-info{float:left;width:8em;position:relative;}
+.wall-item-info{float:left;width:7em;position:relative;}
 .wall-item-photo-wrapper{width:80px;height:80px;position:relative;padding:5px;background-color:#555753;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;}
 [class^="wall-item-tools"] *{}[class^="wall-item-tools"] *>*{}
 .wall-item-tools{float:right;opacity:0.4;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}.wall-item-tools:hover{opacity:1;-webkit-transition:all 0.75s ease-in-out;-moz-transition:all 0.75s ease-in-out;-o-transition:all 0.75s ease-in-out;-ms-transition:all 0.75s ease-in-out;transition:all 0.75s ease-in-out;}
@@ -223,7 +223,8 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
 .wall-item-arrowphoto-wrapper{position:absolute;left:35px;top:80px;z-index:10002;}
 .wall-item-photo-menu{min-width:92px;font-size:0.75em;border:2px solid #555753;border-top:0px;background:#555753;position:absolute;left:-2px;top:101px;display:none;z-index:10003;-o-border-radius:0 5px 5px 5px;-webkit-border-radius:0 5px 5px 5px;-moz-border-radius:0 5px 5px 5px;-ms-border-radius:0 5px 5px 5px;border-radius:0 5px 5px 5px;}.wall-item-photo-menu li a{white-space:nowrap;display:block;padding:5px 6px;color:#eeeeee;}.wall-item-photo-menu li a:hover{color:#555753;background:#eeeeee;}
 #item-delete-selected{overflow:auto;width:100%;}
-#connect-services-header,#connect-services,#extra-help-header,#extra-help,#postit-header,#postit{margin:5px 0 0 0;}
+#connect-services-header,#extra-help-header{margin:1.5em 0 0 0;}
+#connect-services,#extra-help{margin:0px;padding:0px;list-style:none;list-style-position:inside;margin:1em 0 0 0;}#connect-services li,#extra-help li{display:inline;}
 .ccollapse-wrapper{font-size:0.9em;margin-left:5em;}
 .hide-comments-outer{font-size:small;}
 .wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index fb0fbc6df3..d394b13bf3 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -315,7 +315,7 @@ h6 {
 [id$="-desc"] {
 	color: @main_colour;
 	background: @bg_colour;
-	.borders(3px, ridge, @main_colour);
+	.borders(2px, outset, @dk_main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -872,7 +872,7 @@ nav #nav-notifications-linkmenu {
 #asidemain {
 	float: left;
 	font-size: small;
-	margin: 20px 0 20px 35px;
+	margin: 1em;
 	width: 25%;
 	display: inline;
 }
@@ -1229,10 +1229,10 @@ nav #nav-notifications-linkmenu {
  * section
  */
 #sectionmain {
-	margin: 20px;
+	margin: 1em;
 	font-size: 0.8em;
 	min-width: 475px;
-	width: 67%;
+	width: 69%;
 	float: left;
 	display: inline;
 }
@@ -1348,7 +1348,7 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
 	float: left;
-	width: 8em;
+	width: 7em;
 	position: relative;
 }
 .wall-item-photo-wrapper {
@@ -1501,12 +1501,16 @@ nav #nav-notifications-linkmenu {
 	width: 100%;
 }
 #connect-services-header,
+#extra-help-header {
+	margin: 1.5em 0 0 0;
+}
 #connect-services,
-#extra-help-header,
-#extra-help,
-#postit-header,
-#postit {
-	margin: 5px 0 0 0;
+#extra-help {
+	.list_reset;
+	margin: 1em 0 0 0;
+	li {
+		display: inline;
+	}
 }
 
 
diff --git a/view/theme/dispy/dark/theme.php b/view/theme/dispy/dark/theme.php
index e156b6a7db..f73a127659 100644
--- a/view/theme/dispy/dark/theme.php
+++ b/view/theme/dispy/dark/theme.php
@@ -3,7 +3,6 @@
 /*
  * Name: Dispy Dark
  * Description: Dispy Dark: Dark, Spartan, Sleek, and Functional
- * Version: 1.2.1
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
@@ -13,7 +12,6 @@ $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
     'name' => 'dark',
-    'version' => '1.2.1'
 );
 
 function dispy_dark_init(&$a) {
diff --git a/view/theme/dispy/light/_base.less b/view/theme/dispy/light/_base.less
index 3046c1bacf..c605dc7028 100644
--- a/view/theme/dispy/light/_base.less
+++ b/view/theme/dispy/light/_base.less
@@ -24,8 +24,9 @@
 @menu_bg_colour: #555753;
 
 //* font colour, aka color: */
-@lt_main_colour: #ffff99;
+@lt_main_colour: lighten(@bg_colour, 10%);
 @main_colour: #111;
+@dk_main_colour: darken(@bg_colour, 10%);
 @main_alt_colour: #999999;
 // darken(@main_alt_colour, 6.5%) > #888888
 // //#9eabb0
@@ -55,9 +56,6 @@
 @info: #364e59;
 @alert: #ff0000;
 
-@lt_main_colour: lighten(@bg_colour, 10%);
-@dk_main_colour: darken(@bg_colour, 10%);
-
 //* links */
 // yes our link colour is "friendica blue" ;)
 @link_colour: @friendica_blue;
@@ -137,7 +135,19 @@
 	-webkit-text-overflow: @t;
 	text-overflow: @t;
 }
-
+.lin_gradient(@x1: left, @x2: right, @y1: top, @y2: bottom, @c1: @bg_colour, @c2: @dk_bg_colour) {
+	// w3c
+	background: linear-gradient(@x1 @y2, @c1, @c2);
+	// webkit
+	// -webkit-gradient(<type>, <point> [, <radius>]?, <point> [, <radius>]? [, <stop>]*)
+	background: -webkit-gradient(linear, @x1 @y1, @x2 @y2, from(@c1), to(@c2));
+	// mozilla
+	// -moz-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>])
+	background: -moz-linear-gradient(@x1 @y2, @c1, @c2);
+	// opera
+	//background: -o-linear-gradient([<point> || <angle>,]? <stop>, <stop> [, <stop>]);
+	background: -o-linear-gradient(@x1, @c1, @c2);
+}
 //* pre wrap */
 .wrap () {
 	white-space: pre-wrap;
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 045dadba52..90cb8780b4 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -316,7 +316,7 @@ h6 {
 [id$="-desc"] {
 	color: @bg_colour;
 	background: @dk_bg_colour;
-	.borders(3px, ridge, @main_colour);
+	.borders(2px, outset, @main_colour);
 	.rounded_corners;
 	// .box_shadow(3px, 3px, 5px);
     margin: 3px 10px 7px 0;
@@ -873,7 +873,7 @@ nav #nav-notifications-linkmenu {
 #asidemain {
 	float: left;
 	font-size: small;
-	margin: 20px 0 20px 35px;
+	margin: 1em;
 	width: 25%;
 	display: inline;
 }
@@ -1230,10 +1230,10 @@ nav #nav-notifications-linkmenu {
  * section
  */
 #sectionmain {
-	margin: 20px;
+	margin: 1em;
 	font-size: 0.8em;
 	min-width: 475px;
-	width: 67%;
+	width: 69%;
 	float: left;
 	display: inline;
 }
@@ -1349,7 +1349,7 @@ nav #nav-notifications-linkmenu {
 }
 .wall-item-info {
 	float: left;
-	width: 8em;
+	width: 7em;
 	position: relative;
 }
 .wall-item-photo-wrapper {
@@ -1502,12 +1502,16 @@ nav #nav-notifications-linkmenu {
 	width: 100%;
 }
 #connect-services-header,
+#extra-help-header {
+	margin: 1.5em 0 0 0;
+}
 #connect-services,
-#extra-help-header,
-#extra-help,
-#postit-header,
-#postit {
-	margin: 5px 0 0 0;
+#extra-help {
+	.list_reset;
+	margin: 1em 0 0 0;
+	li {
+		display: inline;
+	}
 }
 
 
diff --git a/view/theme/dispy/light/theme.php b/view/theme/dispy/light/theme.php
index df3cca042d..94a699b703 100644
--- a/view/theme/dispy/light/theme.php
+++ b/view/theme/dispy/light/theme.php
@@ -3,7 +3,6 @@
 /*
  * Name: Dispy Light
  * Description: Dispy Light: Light, Spartan, Sleek, and Functional
- * Version: 1.2.1
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
@@ -13,7 +12,6 @@ $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
 	'name' => 'light',
-	'version' => '1.2.1'
 );
 
 function dispy_light_init(&$a) {
diff --git a/view/theme/dispy/style.php b/view/theme/dispy/style.php
index f666e27683..3756514250 100644
--- a/view/theme/dispy/style.php
+++ b/view/theme/dispy/style.php
@@ -13,238 +13,94 @@
         $colour = get_pconfig(local_user(), "dispy", "colour");
     }
 
-    if ($line_height === false) { $line_height = $site_line_height; }
-    if ($line_height === false) { $line_height = "1.2"; }
-    if ($dispy_font_size === false) { $dispy_font_size = $site_dispy_font_size; }
-    if ($dispy_font_size === false) { $dispy_font_size = "12"; }
-    if ($colour === false) { $colour = $site_colour; }
-    if ($colour === false) { $colour = "light"; }
+    if ($line_height === false) {
+		$line_height = $site_line_height;
+	}
+    if ($line_height === false) {
+		$line_height = "1.2";
+	}
+    if ($dispy_font_size === false) {
+		$dispy_font_size = $site_dispy_font_size;
+	}
+    if ($dispy_font_size === false) {
+		$dispy_font_size = "12";
+	}
+    if ($colour === false) {
+		$colour = $site_colour;
+	}
+    if ($colour === false) {
+		$colour = "light";
+	}
     
     if($colour == "light") {
         if (file_exists("$THEMEPATH/light/style.css")) {
             echo file_get_contents("$THEMEPATH/light/style.css");
         }
-        if($dispy_font_size == "16") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 16px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 16px;
-                }";  
-        }
-        if($dispy_font_size == "15") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 15px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 15px;
-                }";
-        }	
-        if($dispy_font_size == "14") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 14px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 14px;
-                }";
-        }
-        if($dispy_font_size == "13.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13.5px;
-                }";
-        }
-        if($dispy_font_size == "13") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13px;
-                }";
-        }
-        if($dispy_font_size == "12.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12.5px;
-                }";
-        }
-        if($dispy_font_size == "12") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12px;
-                }";
-        }
-        if($line_height == "1.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.5;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.5;
-                }";
-        }	
-        if($line_height == "1.4") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.4;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.4;
-                }";
-        }
-        if($line_height == "1.3") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.3;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.3;
-                }";
-        }
-        if($line_height == "1.2") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.2;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.2;
-                }";
-        }
-        if($line_height == "1.1") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.1;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.1;
-                }";
-        }
     }
 
     if($colour == "dark") {
         if (file_exists("$THEMEPATH/dark/style.css")) { 
             echo file_get_contents("$THEMEPATH/dark/style.css");
         }
-        if($dispy_font_size == "16") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 16px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 16px;
-                }";  
-        }
-        if($dispy_font_size == "15") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 15px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 15px;
-                }";
-        }	
-        if($dispy_font_size == "14") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 14px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 14px;
-                }";
-        }
-        if($dispy_font_size == "13.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13.5px;
-                }";
-        }
-        if($dispy_font_size == "13") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 13px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 13px;
-                }";
-        }
-        if($dispy_font_size == "12.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12.5px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12.5px;
-                }";
-        }
-        if($dispy_font_size == "12") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    font-size: 12px;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    font-size: 12px;
-                }";
-        }
-        if($line_height == "1.5") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.5;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.5;
-                }";
-        }	
-        if($line_height == "1.4"){
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.4;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.4;
-                }";
-        }
-        if($line_height == "1.3") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.3;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.3;
-                }";
-        }
-        if($line_height == "1.2") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.2;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.2;
-                }";
-        }
-        if($line_height == "1.1") {
-            echo "
-                .wall-item-container .wall-item-content {
-                    line-height: 1.1;
-                }
-                .wall-item-photo-container .wall-item-content {
-                    line-height: 1.1;
-                }";
-        }
-    }
+	}
 
+	if($dispy_font_size == "16") {
+		echo ".wall-item-content {
+				font-size: 16px;
+			}";
+	}
+	if($dispy_font_size == "15") {
+		echo ".wall-item-content {
+				font-size: 15px;
+			}";
+	}	
+	if($dispy_font_size == "14") {
+		echo ".wall-item-content {
+				font-size: 14px;
+			}";
+	}
+	if($dispy_font_size == "13.5") {
+		echo ".wall-item-content {
+				font-size: 13.5px;
+			}";
+	}
+	if($dispy_font_size == "13") {
+		echo ".wall-item-content {
+				font-size: 13px;
+			}";
+	}
+	if($dispy_font_size == "12.5") {
+		echo ".wall-item-content {
+				font-size: 12.5px;
+			}";
+	}
+	if($dispy_font_size == "12") {
+		echo ".wall-item-content {
+				font-size: 12px;
+			}";
+	}
+	if($line_height == "1.5") {
+		echo ".wall-item-content {
+				line-height: 1.5;
+			}";
+	}	
+	if($line_height == "1.4") {
+		echo ".wall-item-content {
+				line-height: 1.4;
+			}";
+	}
+	if($line_height == "1.3") {
+		echo ".wall-item-content {
+				line-height: 1.3;
+			}";
+	}
+	if($line_height == "1.2") {
+		echo ".wall-item-content {
+				line-height: 1.2;
+			}";
+	}
+	if($line_height == "1.1") {
+		echo ".wall-item-content {
+				line-height: 1.1;
+			}";
+	}
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index deedc86f7a..2d423a9280 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -20,7 +20,7 @@
 $a = get_app();
 $a->theme_info = array(
     'family' => 'dispy',
-	'version' => '1.2'
+	'version' => '1.2.2'
 );
 
 function dispy_init(&$a) {

From f033c9a4ae822bf2ad46f1885a80daf85eca2f62 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 28 May 2012 16:51:52 -0700
Subject: [PATCH 10/13] rev update

---
 boot.php          |   2 +-
 include/items.php |   4 +-
 util/messages.po  | 398 +++++++++++++++++++++++-----------------------
 3 files changed, 202 insertions(+), 202 deletions(-)

diff --git a/boot.php b/boot.php
index aff026a71d..affa351dc6 100644
--- 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',      '3.0.1356' );
+define ( 'FRIENDICA_VERSION',      '3.0.1357' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1144      );
 
diff --git a/include/items.php b/include/items.php
index f45b40cc0b..66e111b55a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -2980,12 +2980,12 @@ function fix_private_photos($s,$uid, $item = null, $cid = 0) {
 						}
 					}
 					if($replace) {
-						logger('replacing photo');
+						logger('fix_private_photos: replacing photo', LOGGER_DEBUG);
 						$s = str_replace($image, 'data:image/jpg;base64,' . base64_encode($r[0]['data']), $s);
+						logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
 					}
 				}
 			}
-			logger('fix_private_photos: replaced: ' . $s, LOGGER_DATA);
 		}	
 	}
 	return($s);
diff --git a/util/messages.po b/util/messages.po
index f07c1d11fd..c39ac3bc10 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1356\n"
+"Project-Id-Version: 3.0.1357\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-27 10:00-0700\n"
+"POT-Creation-Date: 2012-05-28 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,8 +39,8 @@ msgstr ""
 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920
 #: ../../mod/editpost.php:10 ../../mod/install.php:151
 #: ../../mod/notifications.php:66 ../../mod/contacts.php:125
-#: ../../mod/settings.php:104 ../../mod/settings.php:535
-#: ../../mod/settings.php:540 ../../mod/manage.php:86 ../../mod/network.php:6
+#: ../../mod/settings.php:105 ../../mod/settings.php:536
+#: ../../mod/settings.php:541 ../../mod/manage.php:86 ../../mod/network.php:6
 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
 #: ../../mod/wallmessage.php:33 ../../mod/wallmessage.php:79
 #: ../../mod/wallmessage.php:103 ../../mod/attach.php:33
@@ -55,7 +55,7 @@ msgstr ""
 #: ../../mod/profiles.php:374 ../../mod/delegate.php:6
 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503
-#: ../../include/items.php:3214 ../../index.php:306
+#: ../../include/items.php:3286 ../../index.php:306
 msgid "Permission denied."
 msgstr ""
 
@@ -84,8 +84,8 @@ msgstr ""
 msgid "Return to contact editor"
 msgstr ""
 
-#: ../../mod/crepair.php:148 ../../mod/settings.php:555
-#: ../../mod/settings.php:581 ../../mod/admin.php:656 ../../mod/admin.php:665
+#: ../../mod/crepair.php:148 ../../mod/settings.php:556
+#: ../../mod/settings.php:582 ../../mod/admin.php:656 ../../mod/admin.php:665
 msgid "Name"
 msgstr ""
 
@@ -127,8 +127,8 @@ msgstr ""
 #: ../../mod/photos.php:1336 ../../mod/photos.php:1367
 #: ../../mod/install.php:245 ../../mod/install.php:283
 #: ../../mod/localtime.php:45 ../../mod/contacts.php:322
-#: ../../mod/settings.php:553 ../../mod/settings.php:699
-#: ../../mod/settings.php:760 ../../mod/settings.php:964
+#: ../../mod/settings.php:554 ../../mod/settings.php:700
+#: ../../mod/settings.php:761 ../../mod/settings.php:965
 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:417
 #: ../../mod/admin.php:653 ../../mod/admin.php:789 ../../mod/admin.php:988
 #: ../../mod/admin.php:1075 ../../mod/profiles.php:543
@@ -280,8 +280,8 @@ msgid "Share this event"
 msgstr ""
 
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
-#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:554
-#: ../../mod/settings.php:580 ../../addon/js_upload/js_upload.php:45
+#: ../../mod/dfrn_request.php:826 ../../mod/settings.php:555
+#: ../../mod/settings.php:581 ../../addon/js_upload/js_upload.php:45
 msgid "Cancel"
 msgstr ""
 
@@ -325,23 +325,23 @@ msgid ""
 msgstr ""
 
 #: ../../mod/api.php:105 ../../mod/dfrn_request.php:814
-#: ../../mod/settings.php:875 ../../mod/settings.php:881
-#: ../../mod/settings.php:889 ../../mod/settings.php:893
-#: ../../mod/settings.php:898 ../../mod/settings.php:904
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
-#: ../../mod/settings.php:952 ../../mod/settings.php:953
-#: ../../mod/settings.php:954 ../../mod/settings.php:955
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:890 ../../mod/settings.php:894
+#: ../../mod/settings.php:899 ../../mod/settings.php:905
+#: ../../mod/settings.php:911 ../../mod/settings.php:917
+#: ../../mod/settings.php:953 ../../mod/settings.php:954
+#: ../../mod/settings.php:955 ../../mod/settings.php:956
 #: ../../mod/register.php:511 ../../mod/profiles.php:520
 msgid "Yes"
 msgstr ""
 
 #: ../../mod/api.php:106 ../../mod/dfrn_request.php:815
-#: ../../mod/settings.php:875 ../../mod/settings.php:881
-#: ../../mod/settings.php:889 ../../mod/settings.php:893
-#: ../../mod/settings.php:898 ../../mod/settings.php:904
-#: ../../mod/settings.php:910 ../../mod/settings.php:916
-#: ../../mod/settings.php:952 ../../mod/settings.php:953
-#: ../../mod/settings.php:954 ../../mod/settings.php:955
+#: ../../mod/settings.php:876 ../../mod/settings.php:882
+#: ../../mod/settings.php:890 ../../mod/settings.php:894
+#: ../../mod/settings.php:899 ../../mod/settings.php:905
+#: ../../mod/settings.php:911 ../../mod/settings.php:917
+#: ../../mod/settings.php:953 ../../mod/settings.php:954
+#: ../../mod/settings.php:955 ../../mod/settings.php:956
 #: ../../mod/register.php:512 ../../mod/profiles.php:521
 msgid "No"
 msgstr ""
@@ -362,7 +362,7 @@ msgstr ""
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:69 ../../mod/settings.php:20
+#: ../../mod/photos.php:69 ../../mod/settings.php:21
 msgid "everybody"
 msgstr ""
 
@@ -560,8 +560,8 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
-#: ../../mod/photos.php:1394 ../../mod/settings.php:616
-#: ../../mod/settings.php:697 ../../mod/group.php:168 ../../mod/admin.php:660
+#: ../../mod/photos.php:1394 ../../mod/settings.php:617
+#: ../../mod/settings.php:698 ../../mod/group.php:168 ../../mod/admin.php:660
 #: ../../include/conversation.php:322 ../../include/conversation.php:588
 msgid "Delete"
 msgstr ""
@@ -631,7 +631,7 @@ msgstr ""
 msgid "Post to Email"
 msgstr ""
 
-#: ../../mod/editpost.php:95 ../../mod/settings.php:615
+#: ../../mod/editpost.php:95 ../../mod/settings.php:616
 #: ../../include/conversation.php:575
 msgid "Edit"
 msgstr ""
@@ -861,7 +861,7 @@ msgstr ""
 msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:650
+#: ../../mod/dfrn_request.php:820 ../../mod/settings.php:651
 #: ../../include/contact_selectors.php:80
 msgid "Diaspora"
 msgstr ""
@@ -1762,97 +1762,97 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: ../../mod/settings.php:49 ../../include/nav.php:137
+#: ../../mod/settings.php:50 ../../include/nav.php:137
 msgid "Account settings"
 msgstr ""
 
-#: ../../mod/settings.php:54
+#: ../../mod/settings.php:55
 msgid "Display settings"
 msgstr ""
 
-#: ../../mod/settings.php:60
+#: ../../mod/settings.php:61
 msgid "Connector settings"
 msgstr ""
 
-#: ../../mod/settings.php:65
+#: ../../mod/settings.php:66
 msgid "Plugin settings"
 msgstr ""
 
-#: ../../mod/settings.php:70
+#: ../../mod/settings.php:71
 msgid "Connected apps"
 msgstr ""
 
-#: ../../mod/settings.php:75
+#: ../../mod/settings.php:76
 msgid "Export personal data"
 msgstr ""
 
-#: ../../mod/settings.php:80
+#: ../../mod/settings.php:81
 msgid "Remove account"
 msgstr ""
 
-#: ../../mod/settings.php:88 ../../mod/admin.php:748 ../../mod/admin.php:953
+#: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953
 #: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638
 #: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
-#: ../../mod/settings.php:131
+#: ../../mod/settings.php:132
 msgid "Missing some important data!"
 msgstr ""
 
-#: ../../mod/settings.php:134 ../../mod/settings.php:579
+#: ../../mod/settings.php:135 ../../mod/settings.php:580
 msgid "Update"
 msgstr ""
 
-#: ../../mod/settings.php:239
+#: ../../mod/settings.php:240
 msgid "Failed to connect with email account using the settings provided."
 msgstr ""
 
-#: ../../mod/settings.php:244
+#: ../../mod/settings.php:245
 msgid "Email settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:303
+#: ../../mod/settings.php:304
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:308
+#: ../../mod/settings.php:309
 msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/settings.php:319
+#: ../../mod/settings.php:320
 msgid "Password changed."
 msgstr ""
 
-#: ../../mod/settings.php:321
+#: ../../mod/settings.php:322
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:385
+#: ../../mod/settings.php:386
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:387
+#: ../../mod/settings.php:388
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:393
+#: ../../mod/settings.php:394
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:395
+#: ../../mod/settings.php:396
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:448
+#: ../../mod/settings.php:449
 msgid "Private forum has no privacy permissions. Using default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:452
+#: ../../mod/settings.php:453
 msgid "Private forum has no privacy permissions and no default privacy group."
 msgstr ""
 
-#: ../../mod/settings.php:482 ../../addon/facebook/facebook.php:488
+#: ../../mod/settings.php:483 ../../addon/facebook/facebook.php:488
 #: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
@@ -1860,417 +1860,417 @@ msgstr ""
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:552 ../../mod/settings.php:578
-#: ../../mod/settings.php:614
+#: ../../mod/settings.php:553 ../../mod/settings.php:579
+#: ../../mod/settings.php:615
 msgid "Add application"
 msgstr ""
 
-#: ../../mod/settings.php:556 ../../mod/settings.php:582
+#: ../../mod/settings.php:557 ../../mod/settings.php:583
 #: ../../addon/statusnet/statusnet.php:555
 msgid "Consumer Key"
 msgstr ""
 
-#: ../../mod/settings.php:557 ../../mod/settings.php:583
+#: ../../mod/settings.php:558 ../../mod/settings.php:584
 #: ../../addon/statusnet/statusnet.php:554
 msgid "Consumer Secret"
 msgstr ""
 
-#: ../../mod/settings.php:558 ../../mod/settings.php:584
+#: ../../mod/settings.php:559 ../../mod/settings.php:585
 msgid "Redirect"
 msgstr ""
 
-#: ../../mod/settings.php:559 ../../mod/settings.php:585
+#: ../../mod/settings.php:560 ../../mod/settings.php:586
 msgid "Icon url"
 msgstr ""
 
-#: ../../mod/settings.php:570
+#: ../../mod/settings.php:571
 msgid "You can't edit this application."
 msgstr ""
 
-#: ../../mod/settings.php:613
+#: ../../mod/settings.php:614
 msgid "Connected Apps"
 msgstr ""
 
-#: ../../mod/settings.php:617
+#: ../../mod/settings.php:618
 msgid "Client key starts with"
 msgstr ""
 
-#: ../../mod/settings.php:618
+#: ../../mod/settings.php:619
 msgid "No name"
 msgstr ""
 
-#: ../../mod/settings.php:619
+#: ../../mod/settings.php:620
 msgid "Remove authorization"
 msgstr ""
 
-#: ../../mod/settings.php:630
+#: ../../mod/settings.php:631
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:638 ../../addon/widgets/widgets.php:123
+#: ../../mod/settings.php:639 ../../addon/widgets/widgets.php:123
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:651
+#: ../../mod/settings.php:651 ../../mod/settings.php:652
 #, php-format
 msgid "Built-in support for %s connectivity is %s"
 msgstr ""
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:651
+#: ../../mod/settings.php:651 ../../mod/settings.php:652
 msgid "enabled"
 msgstr ""
 
-#: ../../mod/settings.php:650 ../../mod/settings.php:651
+#: ../../mod/settings.php:651 ../../mod/settings.php:652
 msgid "disabled"
 msgstr ""
 
-#: ../../mod/settings.php:651
+#: ../../mod/settings.php:652
 msgid "StatusNet"
 msgstr ""
 
-#: ../../mod/settings.php:681
+#: ../../mod/settings.php:682
 msgid "Connector Settings"
 msgstr ""
 
-#: ../../mod/settings.php:686
+#: ../../mod/settings.php:687
 msgid "Email/Mailbox Setup"
 msgstr ""
 
-#: ../../mod/settings.php:687
+#: ../../mod/settings.php:688
 msgid ""
 "If you wish to communicate with email contacts using this service "
 "(optional), please specify how to connect to your mailbox."
 msgstr ""
 
-#: ../../mod/settings.php:688
+#: ../../mod/settings.php:689
 msgid "Last successful email check:"
 msgstr ""
 
-#: ../../mod/settings.php:689
+#: ../../mod/settings.php:690
 msgid "Email access is disabled on this site."
 msgstr ""
 
-#: ../../mod/settings.php:690
+#: ../../mod/settings.php:691
 msgid "IMAP server name:"
 msgstr ""
 
-#: ../../mod/settings.php:691
+#: ../../mod/settings.php:692
 msgid "IMAP port:"
 msgstr ""
 
-#: ../../mod/settings.php:692
+#: ../../mod/settings.php:693
 msgid "Security:"
 msgstr ""
 
-#: ../../mod/settings.php:692 ../../mod/settings.php:697
+#: ../../mod/settings.php:693 ../../mod/settings.php:698
 msgid "None"
 msgstr ""
 
-#: ../../mod/settings.php:693
+#: ../../mod/settings.php:694
 msgid "Email login name:"
 msgstr ""
 
-#: ../../mod/settings.php:694
+#: ../../mod/settings.php:695
 msgid "Email password:"
 msgstr ""
 
-#: ../../mod/settings.php:695
+#: ../../mod/settings.php:696
 msgid "Reply-to address:"
 msgstr ""
 
-#: ../../mod/settings.php:696
+#: ../../mod/settings.php:697
 msgid "Send public posts to all email contacts:"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:698
 msgid "Action after import:"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:698
 msgid "Mark as seen"
 msgstr ""
 
-#: ../../mod/settings.php:697
+#: ../../mod/settings.php:698
 msgid "Move to folder"
 msgstr ""
 
-#: ../../mod/settings.php:698
+#: ../../mod/settings.php:699
 msgid "Move to folder:"
 msgstr ""
 
-#: ../../mod/settings.php:758
+#: ../../mod/settings.php:759
 msgid "Display Settings"
 msgstr ""
 
-#: ../../mod/settings.php:764
+#: ../../mod/settings.php:765
 msgid "Display Theme:"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:766
 msgid "Update browser every xx seconds"
 msgstr ""
 
-#: ../../mod/settings.php:765
+#: ../../mod/settings.php:766
 msgid "Minimum of 10 seconds, no maximum"
 msgstr ""
 
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:767
 msgid "Number of items to display on the network page:"
 msgstr ""
 
-#: ../../mod/settings.php:766
+#: ../../mod/settings.php:767
 msgid "Maximum of 100 items"
 msgstr ""
 
-#: ../../mod/settings.php:767
+#: ../../mod/settings.php:768
 msgid "Don't show emoticons"
 msgstr ""
 
-#: ../../mod/settings.php:835 ../../mod/admin.php:180 ../../mod/admin.php:634
+#: ../../mod/settings.php:836 ../../mod/admin.php:180 ../../mod/admin.php:634
 msgid "Normal Account"
 msgstr ""
 
-#: ../../mod/settings.php:836
+#: ../../mod/settings.php:837
 msgid "This account is a normal personal profile"
 msgstr ""
 
-#: ../../mod/settings.php:839 ../../mod/admin.php:181 ../../mod/admin.php:635
+#: ../../mod/settings.php:840 ../../mod/admin.php:181 ../../mod/admin.php:635
 msgid "Soapbox Account"
 msgstr ""
 
-#: ../../mod/settings.php:840
+#: ../../mod/settings.php:841
 msgid "Automatically approve all connection/friend requests as read-only fans"
 msgstr ""
 
-#: ../../mod/settings.php:843 ../../mod/admin.php:182 ../../mod/admin.php:636
+#: ../../mod/settings.php:844 ../../mod/admin.php:182 ../../mod/admin.php:636
 msgid "Community/Celebrity Account"
 msgstr ""
 
-#: ../../mod/settings.php:844
+#: ../../mod/settings.php:845
 msgid "Automatically approve all connection/friend requests as read-write fans"
 msgstr ""
 
-#: ../../mod/settings.php:847 ../../mod/admin.php:183 ../../mod/admin.php:637
+#: ../../mod/settings.php:848 ../../mod/admin.php:183 ../../mod/admin.php:637
 msgid "Automatic Friend Account"
 msgstr ""
 
-#: ../../mod/settings.php:848
+#: ../../mod/settings.php:849
 msgid "Automatically approve all connection/friend requests as friends"
 msgstr ""
 
-#: ../../mod/settings.php:851
+#: ../../mod/settings.php:852
 msgid "Private Forum"
 msgstr ""
 
-#: ../../mod/settings.php:852
+#: ../../mod/settings.php:853
 msgid "Private forum - approved members only [Experimental]"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:866
 msgid "OpenID:"
 msgstr ""
 
-#: ../../mod/settings.php:865
+#: ../../mod/settings.php:866
 msgid "(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:875
+#: ../../mod/settings.php:876
 msgid "Publish your default profile in your local site directory?"
 msgstr ""
 
-#: ../../mod/settings.php:881
+#: ../../mod/settings.php:882
 msgid "Publish your default profile in the global social directory?"
 msgstr ""
 
-#: ../../mod/settings.php:889
+#: ../../mod/settings.php:890
 msgid "Hide your contact/friend list from viewers of your default profile?"
 msgstr ""
 
-#: ../../mod/settings.php:893
+#: ../../mod/settings.php:894
 msgid "Hide your profile details from unknown viewers?"
 msgstr ""
 
-#: ../../mod/settings.php:898
+#: ../../mod/settings.php:899
 msgid "Allow friends to post to your profile page?"
 msgstr ""
 
-#: ../../mod/settings.php:904
+#: ../../mod/settings.php:905
 msgid "Allow friends to tag your posts?"
 msgstr ""
 
-#: ../../mod/settings.php:910
+#: ../../mod/settings.php:911
 msgid "Allow us to suggest you as a potential friend to new members?"
 msgstr ""
 
-#: ../../mod/settings.php:916
+#: ../../mod/settings.php:917
 msgid "Permit unknown people to send you private mail?"
 msgstr ""
 
-#: ../../mod/settings.php:927
+#: ../../mod/settings.php:928
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:933 ../../mod/profile_photo.php:211
+#: ../../mod/settings.php:934 ../../mod/profile_photo.php:211
 msgid "or"
 msgstr ""
 
-#: ../../mod/settings.php:938
+#: ../../mod/settings.php:939
 msgid "Your Identity Address is"
 msgstr ""
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:950
 msgid "Automatically expire posts after this many days:"
 msgstr ""
 
-#: ../../mod/settings.php:949
+#: ../../mod/settings.php:950
 msgid "If empty, posts will not expire. Expired posts will be deleted"
 msgstr ""
 
-#: ../../mod/settings.php:950
+#: ../../mod/settings.php:951
 msgid "Advanced expiration settings"
 msgstr ""
 
-#: ../../mod/settings.php:951
+#: ../../mod/settings.php:952
 msgid "Advanced Expiration"
 msgstr ""
 
-#: ../../mod/settings.php:952
+#: ../../mod/settings.php:953
 msgid "Expire posts:"
 msgstr ""
 
-#: ../../mod/settings.php:953
+#: ../../mod/settings.php:954
 msgid "Expire personal notes:"
 msgstr ""
 
-#: ../../mod/settings.php:954
+#: ../../mod/settings.php:955
 msgid "Expire starred posts:"
 msgstr ""
 
-#: ../../mod/settings.php:955
+#: ../../mod/settings.php:956
 msgid "Expire photos:"
 msgstr ""
 
-#: ../../mod/settings.php:962
+#: ../../mod/settings.php:963
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:970
+#: ../../mod/settings.php:971
 msgid "Password Settings"
 msgstr ""
 
-#: ../../mod/settings.php:971
+#: ../../mod/settings.php:972
 msgid "New Password:"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:973
 msgid "Confirm:"
 msgstr ""
 
-#: ../../mod/settings.php:972
+#: ../../mod/settings.php:973
 msgid "Leave password fields blank unless changing"
 msgstr ""
 
-#: ../../mod/settings.php:976
+#: ../../mod/settings.php:977
 msgid "Basic Settings"
 msgstr ""
 
-#: ../../mod/settings.php:977 ../../include/profile_advanced.php:15
+#: ../../mod/settings.php:978 ../../include/profile_advanced.php:15
 msgid "Full Name:"
 msgstr ""
 
-#: ../../mod/settings.php:978
+#: ../../mod/settings.php:979
 msgid "Email Address:"
 msgstr ""
 
-#: ../../mod/settings.php:979
+#: ../../mod/settings.php:980
 msgid "Your Timezone:"
 msgstr ""
 
-#: ../../mod/settings.php:980
+#: ../../mod/settings.php:981
 msgid "Default Post Location:"
 msgstr ""
 
-#: ../../mod/settings.php:981
+#: ../../mod/settings.php:982
 msgid "Use Browser Location:"
 msgstr ""
 
-#: ../../mod/settings.php:984
+#: ../../mod/settings.php:985
 msgid "Security and Privacy Settings"
 msgstr ""
 
-#: ../../mod/settings.php:986
+#: ../../mod/settings.php:987
 msgid "Maximum Friend Requests/Day:"
 msgstr ""
 
-#: ../../mod/settings.php:986 ../../mod/settings.php:1005
+#: ../../mod/settings.php:987 ../../mod/settings.php:1006
 msgid "(to prevent spam abuse)"
 msgstr ""
 
-#: ../../mod/settings.php:987
+#: ../../mod/settings.php:988
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/settings.php:988
+#: ../../mod/settings.php:989
 msgid "(click to open/close)"
 msgstr ""
 
-#: ../../mod/settings.php:1005
+#: ../../mod/settings.php:1006
 msgid "Maximum private messages per day from unknown people:"
 msgstr ""
 
-#: ../../mod/settings.php:1008
+#: ../../mod/settings.php:1009
 msgid "Notification Settings"
 msgstr ""
 
-#: ../../mod/settings.php:1009
+#: ../../mod/settings.php:1010
 msgid "By default post a status message when:"
 msgstr ""
 
-#: ../../mod/settings.php:1010
+#: ../../mod/settings.php:1011
 msgid "accepting a friend request"
 msgstr ""
 
-#: ../../mod/settings.php:1011
+#: ../../mod/settings.php:1012
 msgid "joining a forum/community"
 msgstr ""
 
-#: ../../mod/settings.php:1012
+#: ../../mod/settings.php:1013
 msgid "making an <em>interesting</em> profile change"
 msgstr ""
 
-#: ../../mod/settings.php:1013
+#: ../../mod/settings.php:1014
 msgid "Send a notification email when:"
 msgstr ""
 
-#: ../../mod/settings.php:1014
+#: ../../mod/settings.php:1015
 msgid "You receive an introduction"
 msgstr ""
 
-#: ../../mod/settings.php:1015
+#: ../../mod/settings.php:1016
 msgid "Your introductions are confirmed"
 msgstr ""
 
-#: ../../mod/settings.php:1016
+#: ../../mod/settings.php:1017
 msgid "Someone writes on your profile wall"
 msgstr ""
 
-#: ../../mod/settings.php:1017
+#: ../../mod/settings.php:1018
 msgid "Someone writes a followup comment"
 msgstr ""
 
-#: ../../mod/settings.php:1018
+#: ../../mod/settings.php:1019
 msgid "You receive a private message"
 msgstr ""
 
-#: ../../mod/settings.php:1019
+#: ../../mod/settings.php:1020
 msgid "You receive a friend suggestion"
 msgstr ""
 
-#: ../../mod/settings.php:1020
+#: ../../mod/settings.php:1021
 msgid "You are tagged in a post"
 msgstr ""
 
-#: ../../mod/settings.php:1023
+#: ../../mod/settings.php:1024
 msgid "Advanced Page Settings"
 msgstr ""
 
@@ -2841,7 +2841,7 @@ msgstr ""
 
 #: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
 #: ../../mod/admin.php:697 ../../mod/admin.php:896 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3096
+#: ../../mod/display.php:142 ../../include/items.php:3168
 msgid "Item not found."
 msgstr ""
 
@@ -6073,179 +6073,179 @@ msgstr ""
 msgid "Undecided"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Males"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Females"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Gay"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Lesbian"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "No Preference"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Bisexual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Autosexual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Abstinent"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Virgin"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Deviant"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Fetish"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Oodles"
 msgstr ""
 
-#: ../../include/profile_selectors.php:21
+#: ../../include/profile_selectors.php:23
 msgid "Nonsexual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Single"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Lonely"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Available"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Unavailable"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Has crush"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Infatuated"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Dating"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Unfaithful"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Sex Addict"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Friends"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Friends/Benefits"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Casual"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Engaged"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Married"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Imaginarily married"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Partners"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Cohabiting"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Common law"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Happy"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Not looking"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Swinger"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Betrayed"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Separated"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Unstable"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Divorced"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Imaginarily divorced"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Widowed"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Uncertain"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "It's complicated"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Don't care"
 msgstr ""
 
-#: ../../include/profile_selectors.php:37
+#: ../../include/profile_selectors.php:42
 msgid "Ask me"
 msgstr ""
 

From 2dc7e53435ffcc6dc7e450c15c7b2518b27ec2e5 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 28 May 2012 19:17:06 -0700
Subject: [PATCH 11/13] more theme cleanup

---
 mod/settings.php                  |  1 +
 view/generic_links_widget.tpl     |  2 +-
 view/theme/duepuntozero/style.css | 18 +++++++++++++++++-
 view/theme/slackr/style.css       |  5 +++++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/mod/settings.php b/mod/settings.php
index e6eb4011fa..5d85b0c2c6 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -87,6 +87,7 @@ EOT;
 	$tabtpl = get_markup_template("generic_links_widget.tpl");
 	$a->page['aside'] = replace_macros($tabtpl, array(
 		'$title' => t('Settings'),
+		'$class' => 'settings-widget',
 		'$items' => $tabs,
 	));
 
diff --git a/view/generic_links_widget.tpl b/view/generic_links_widget.tpl
index 45813b876a..f3404f783f 100644
--- a/view/generic_links_widget.tpl
+++ b/view/generic_links_widget.tpl
@@ -1,4 +1,4 @@
-<div class="widget">
+<div class="widget{{ if $class }} $class{{ endif }}">
 	{{if $title}}<h3>$title</h3>{{endif}}
 	{{if $desc}}<div class="desc">$desc</div>{{endif}}
 	
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0abf128a3f..07eba1edb0 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -338,6 +338,15 @@ div.wall-item-content-wrapper.shiny {
 	font-weight: bold;
 }
 
+.settings-widget .selected {
+	padding: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;	
+	border: 1px solid #CCCCCC;
+	background: #F8F8F8;
+	font-weight: bold;
+}
+
 .fakelink:hover {
 	color: #3465a4;
 	text-decoration: underline;
@@ -809,8 +818,15 @@ input#dfrn-url {
 	clear: both;
 }
 
+.settings-widget ul {
+	list-style-type: none;
+	padding: 0px;
+}
 
-
+.settings-widget li {
+	margin-left: 24px;
+	margin-bottom: 8px;
+}
 
 
 #gender-select, #marital-select, #sexual-select {
diff --git a/view/theme/slackr/style.css b/view/theme/slackr/style.css
index 40391e17c5..39da7bb6c3 100644
--- a/view/theme/slackr/style.css
+++ b/view/theme/slackr/style.css
@@ -80,6 +80,11 @@ nav #site-location {
 	-moz-border-radius: 3px;
 	box-shadow: 4px 4px 3px 0 #444444;
 }
+.settings-widget .selected {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 4px 4px 3px 0 #444444;
+}
 
 .photo {
 	border: 1px solid #AAAAAA;

From 0241bd1fbf28e15daeb939bc14976cd2fd6d3251 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 28 May 2012 23:24:10 -0700
Subject: [PATCH 12/13] Provide backend option to only expire other peoples'
 conversations.

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

diff --git a/include/items.php b/include/items.php
index 66e111b55a..4b79003f6a 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3076,13 +3076,20 @@ function item_getfeedattach($item) {
 	
 function item_expire($uid,$days) {
 
-	if((! $uid) || (! $days))
+	if((! $uid) || ($days < 1))
 		return;
 
+	// $expire_network_only = save your own wall posts
+	// and just expire conversations started by others
+
+	$expire_network_only = get_pconfig($uid,'expire','expire_network_only');
+	$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");
+
 	$r = q("SELECT * FROM `item` 
 		WHERE `uid` = %d 
 		AND `created` < UTC_TIMESTAMP() - INTERVAL %d DAY 
 		AND `id` = `parent` 
+		$sql_extra
 		AND `deleted` = 0",
 		intval($uid),
 		intval($days)

From 2eafa9a47519f9f35c5eb568cf4235c092c1dcce Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 29 May 2012 01:14:53 -0700
Subject: [PATCH 13/13] ability to only expire contacts, not self

---
 include/items.php | 2 +-
 mod/notes.php     | 4 ++--
 mod/settings.php  | 8 ++++++--
 view/settings.tpl | 1 +
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/include/items.php b/include/items.php
index 4b79003f6a..3fe977b6f7 100644
--- a/include/items.php
+++ b/include/items.php
@@ -3082,7 +3082,7 @@ function item_expire($uid,$days) {
 	// $expire_network_only = save your own wall posts
 	// and just expire conversations started by others
 
-	$expire_network_only = get_pconfig($uid,'expire','expire_network_only');
+	$expire_network_only = get_pconfig($uid,'expire','network_only');
 	$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");
 
 	$r = q("SELECT * FROM `item` 
diff --git a/mod/notes.php b/mod/notes.php
index 64cc17a653..703c898e6e 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -81,7 +81,7 @@ function notes_content(&$a,$update = false) {
 	$r = q("SELECT COUNT(*) AS `total`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 and `item`.`moderated` = 0 
-		AND `item`.`deleted` = 0 AND `item`.`origin` = 1
+		AND `item`.`deleted` = 0 AND `item`.`type` = 'note'
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
 		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
 		$sql_extra ",
@@ -97,7 +97,7 @@ function notes_content(&$a,$update = false) {
 	$r = q("SELECT `item`.`id` AS `item_id`, `contact`.`uid` AS `contact-uid`
 		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
 		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0 
-		and `item`.`moderated` = 0 AND `item`.`origin` = 1
+		and `item`.`moderated` = 0 AND `item`.`type` = 'note'
 		AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 AND `contact`.`self` = 1
 		AND `item`.`id` = `item`.`parent` AND `item`.`wall` = 0
 		$sql_extra
diff --git a/mod/settings.php b/mod/settings.php
index 5d85b0c2c6..b5214e917b 100644
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -339,8 +339,7 @@ function settings_post(&$a) {
 	$expire_notes     = ((x($_POST,'expire_notes')) ? intval($_POST['expire_notes'])	 : 0);
 	$expire_starred   = ((x($_POST,'expire_starred')) ? intval($_POST['expire_starred']) : 0);
 	$expire_photos    = ((x($_POST,'expire_photos'))? intval($_POST['expire_photos'])	 : 0);
-
-
+	$expire_network_only    = ((x($_POST,'expire_network_only'))? intval($_POST['expire_network_only'])	 : 0);
 
 	$allow_location   = (((x($_POST,'allow_location')) && (intval($_POST['allow_location']) == 1)) ? 1: 0);
 	$publish          = (((x($_POST,'profile_in_directory')) && (intval($_POST['profile_in_directory']) == 1)) ? 1: 0);
@@ -436,6 +435,7 @@ function settings_post(&$a) {
 	set_pconfig(local_user(),'expire','notes', $expire_notes);
 	set_pconfig(local_user(),'expire','starred', $expire_starred);
 	set_pconfig(local_user(),'expire','photos', $expire_photos);
+	set_pconfig(local_user(),'expire','network_only', $expire_network_only);
 
 	set_pconfig(local_user(),'system','suggestme', $suggestme);
 	set_pconfig(local_user(),'system','post_newfriend', $post_newfriend);
@@ -813,6 +813,9 @@ function settings_content(&$a) {
 	$expire_photos = get_pconfig(local_user(), 'expire','photos');
 	$expire_photos = (($expire_photos===false)? '0' : $expire_photos); // default if not set: 0
 
+	$expire_network_only = get_pconfig(local_user(), 'expire','network_only');
+	$expire_network_only = (($expire_network_only===false)? '0' : $expire_network_only); // default if not set: 0
+
 
 	$suggestme = get_pconfig(local_user(), 'system','suggestme');
 	$suggestme = (($suggestme===false)? '0': $suggestme); // default if not set: 0
@@ -955,6 +958,7 @@ function settings_content(&$a) {
 		'notes' => array('expire_notes',  t("Expire personal notes:"), $expire_notes, '', array(t('No'),t('Yes'))),
 		'starred' => array('expire_starred',  t("Expire starred posts:"), $expire_starred, '', array(t('No'),t('Yes'))),
 		'photos' => array('expire_photos',  t("Expire photos:"), $expire_photos, '', array(t('No'),t('Yes'))),		
+		'network_only' => array('expire_network_only',  t("Only expire posts by others:"), $expire_network_only, '', array(t('No'),t('Yes'))),		
 	);
 
 	require_once('include/group.php');
diff --git a/view/settings.tpl b/view/settings.tpl
index 556cd3ba37..d61af072f7 100644
--- a/view/settings.tpl
+++ b/view/settings.tpl
@@ -70,6 +70,7 @@ $unkmail
 			{{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
 			{{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
 			{{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+			{{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
 		</div>
 	</div>