Merge branch 'master' of https://github.com/friendica/red

5 files changed, 15 insertions, 10 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('@','＠',$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/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
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>