From aac4affe656176f0538513435a4fdd8a69f244fc Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 7 Mar 2015 15:21:23 -0800
Subject: directory: fix public forum listing

---
 mod/dirsearch.php | 8 +++++---
 version.inc       | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index e734423a6..b4154c1eb 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -12,6 +12,8 @@ function dirsearch_content(&$a) {
 
 	$ret = array('success' => false);
 
+//	logger('request: ' . print_r($_REQUEST,true));
+
 
 	$dirmode = intval(get_config('system','directory_mode'));
 
@@ -119,7 +121,7 @@ function dirsearch_content(&$a) {
 		$sql_extra .= dir_query_build($joiner,'xprof_keywords',$keywords);
 
 	if($forums)
-		$sql_extra .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums);
+		$safesql .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums);
 
 
 	// we only support an age range currently. You must set both agege 
@@ -165,9 +167,9 @@ function dirsearch_content(&$a) {
 	}
 
 
-	$safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : '');
+	$safesql .= (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : '');
 	if($safe < 0)
-		$safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 ";
+		$safesql .= " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 ";
 
 	if($limit) 
 		$qlimit = " LIMIT $limit ";
diff --git a/version.inc b/version.inc
index 8780222d0..c4fb1b2d6 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-03-06.963
+2015-03-07.964
-- 
cgit v1.2.3


From 480dac1af2dd5ed5ba3105577559568237fe5d80 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 7 Mar 2015 23:35:56 -0800
Subject: add reddress to profile - but all is not as it seems. Copy to
 clipboard is blocked because it isn't really a reddress and won't work if you
 copy it and try and use it somewhere. We should really convert the symbol
 back to '@' on copy and allow it to be copied, but this isn't as easy as it
 sounds and is left as an exercise for the community. If we just allow it to
 be copied we'll get a lot of bugs that making friends doesn't work. It does,
 but that isn't a legitimate reddress and even if we made allowances for it,
 Diaspora and Friendica and other webfinger based services wouldn't and would
 just say it can't be found or it's an illegal address. So if we block copy
 we'll just get bugs that it can't be copied. Eventually somebody will see
 this checkin and take it on themselves to figure out how to fix the address
 when copied to clipboard and then allow it to be copied. And there will be
 joy.

---
 .gitignore                 |  2 +-
 include/identity.php       | 11 +++++++----
 view/tpl/profile_vcard.tpl |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8ded8b44a..b01074eaa 100755
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@
 *.lock
 *.kate-swp
 #Ignore emacs tempfiles
-.#*
+\#*
 # patch attempts
 *.orig
 *.rej
diff --git a/include/identity.php b/include/identity.php
index f63b576b2..079c1a245 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -724,12 +724,13 @@ function profile_load(&$a, $nickname, $profile = '') {
 
 	$p[0]['extra_fields'] = $extra_fields;
 
-	$z = q("select xchan_photo_date from xchan where xchan_hash = '%s' limit 1",
+	$z = q("select xchan_photo_date, xchan_addr from xchan where xchan_hash = '%s' limit 1",
 		dbesc($p[0]['channel_hash'])
 	);
-	if($z)
+	if($z) {
 		$p[0]['picdate'] = $z[0]['xchan_photo_date'];
-
+		$p[0]['reddress'] = str_replace('@','&#xff20;',$z[0]['xchan_addr']);
+	}
 	
 	// fetch user tags if this isn't the default profile
 
@@ -817,6 +818,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) {
 	$location = false;
 	$address = false;
 	$pdesc = true;
+	$reddress = true;
 
 	if((! is_array($profile)) && (! count($profile)))
 		return $o;
@@ -906,7 +908,7 @@ logger('online: ' . $profile['online']);
 	}
 
 	if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) {
-		$location = $pdesc = $gender = $marital = $homepage = $online = False;
+		$location = $reddress = $pdesc = $gender = $marital = $homepage = $online = False;
 	}
 
 	$firstname = ((strpos($profile['channel_name'],' '))
@@ -957,6 +959,7 @@ logger('online: ' . $profile['online']);
 		'$homepage'      => $homepage,
 		'$chanmenu'      => $channel_menu,
 		'$diaspora'      => $diaspora,
+		'$reddress'      => $reddress,
 		'$rating'        => $z,
 		'$contact_block' => $contact_block,
 	));
diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl
index cae920c5d..2964d9c4b 100755
--- a/view/tpl/profile_vcard.tpl
+++ b/view/tpl/profile_vcard.tpl
@@ -16,7 +16,7 @@
 	{{/if}}
 
 	<div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div>
-		
+	{{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}}		
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 	<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
-- 
cgit v1.2.3