From 620299dc2571da46c9578f99f743477c7a4b4a4a Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Thu, 26 Nov 2015 17:46:38 +0100
Subject: [PATCH] include friendica address in hcard

---
 include/identity.php                          |  4 +-
 view/templates/profile_vcard.tpl              |  2 +-
 view/theme/duepuntozero/style.css             |  3 +-
 .../duepuntozero/templates/profile_vcard.tpl  | 14 +++---
 view/theme/frost-mobile/style.css             |  3 +-
 .../frost-mobile/templates/profile_vcard.tpl  |  2 +-
 view/theme/frost/style.css                    |  3 +-
 view/theme/frost/templates/profile_vcard.tpl  |  2 +-
 view/theme/quattro/dark/style.css             |  5 ++-
 view/theme/quattro/green/style.css            |  5 ++-
 view/theme/quattro/lilac/style.css            | 11 +++--
 view/theme/quattro/quattro.less               |  1 +
 .../theme/quattro/templates/profile_vcard.tpl | 43 ++++++++++---------
 view/theme/vier/templates/profile_vcard.tpl   |  3 ++
 14 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/include/identity.php b/include/identity.php
index 3ab65d9e64..a785ce981d 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -62,7 +62,7 @@ if(! function_exists('profile_load')) {
 
 		if($profile) {
 			$profile_int = intval($profile);
-			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile`
 					INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 					WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1",
 					dbesc($nickname),
@@ -70,7 +70,7 @@ if(! function_exists('profile_load')) {
 			);
 		}
 		if((!$r) && (!count($r))) {
-			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
+			$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr` AS faddr, `user`.* FROM `profile`
 					INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
 					WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1",
 					dbesc($nickname)
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index fe5762973f..05e44432fd 100644
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
 	<div class="fn label p-name">{{$profile.name}}</div>
 	
-				
+	{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
 	
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 0198431919..4642fb2b75 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -2507,7 +2507,8 @@ aside input[type='text'] {
 	font-weight: bold;
 }
 
-.vcard .title {
+.vcard .title,
+.vcard .p-faddr {
 	margin-bottom: 5px;
 	margin-left: 12px;
 }
diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index 9a34605732..bf2eb27349 100644
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
 	<div class="fn label">{{$profile.name}}</div>
 	
-				
+	{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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>
@@ -38,12 +38,12 @@
 	<div id="profile-extra-links">
 		<ul>
 			{{if $connect}}
-                                {{if $remoteconnect}}
-                                        <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                                {{else}}
-                                        <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                                {{/if}}
-                        {{/if}}
+				{{if $remoteconnect}}
+					<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
+				{{else}}
+					<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+				{{/if}}
+			{{/if}}
 			{{if $wallmessage}}
 				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
 			{{/if}}
diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index f8b49df7c5..4485c056ff 100644
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -3105,7 +3105,8 @@ aside input[type='text'] {
 	font-weight: bold;
 }
 
-.vcard .title {
+.vcard .title,
+.vcard .p-faddr {
 	margin-bottom: 5px;
 	margin-left: 12px;
 }
diff --git a/view/theme/frost-mobile/templates/profile_vcard.tpl b/view/theme/frost-mobile/templates/profile_vcard.tpl
index 6e097c62bf..5157408713 100644
--- a/view/theme/frost-mobile/templates/profile_vcard.tpl
+++ b/view/theme/frost-mobile/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
 	<div class="fn label">{{$profile.name}}</div>
 	
-				
+	{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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>
diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 35abed3c5d..14899a866b 100644
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -2880,7 +2880,8 @@ aside input[type='text'] {
 	font-weight: bold;
 }
 
-.vcard .title {
+.vcard .title,
+.vcard .p-faddr {
 	margin-bottom: 5px;
 	margin-left: 12px;
 }
diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
index 6e097c62bf..5157408713 100644
--- a/view/theme/frost/templates/profile_vcard.tpl
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
 	<div class="fn label">{{$profile.name}}</div>
 	
-				
+	{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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>
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 93ee1ccd58..25102ba31d 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -810,6 +810,9 @@ aside .vcard .fn {
 aside .vcard .title {
   margin-bottom: 5px;
 }
+aside .vcard .p-faddr {
+  margin-bottom: 5px;
+}
 aside .vcard dl {
   height: auto;
   overflow: auto;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index ab50d93ae1..78de886542 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -810,6 +810,9 @@ aside .vcard .fn {
 aside .vcard .title {
   margin-bottom: 5px;
 }
+aside .vcard .p-faddr {
+  margin-bottom: 5px;
+}
 aside .vcard dl {
   height: auto;
   overflow: auto;
diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 510b2f7c8c..1ca27b895c 100644
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -420,7 +420,7 @@
 body {
   font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
   font-size: 11px;
-  background-color: #F6ECF9;
+  background-color: #f6ecf9;
   color: #2d2d2d;
   margin: 50px 0px 0px 0px;
   display: table;
@@ -463,7 +463,7 @@ a:hover {
   text-decoration: underline;
 }
 blockquote {
-  background: #FFFFFF;
+  background: #ffffff;
   padding: 1em;
   margin-left: 1em;
   border-left: 1em solid #e6e6e6;
@@ -810,6 +810,9 @@ aside .vcard .fn {
 aside .vcard .title {
   margin-bottom: 5px;
 }
+aside .vcard .p-faddr {
+  margin-bottom: 5px;
+}
 aside .vcard dl {
   height: auto;
   overflow: auto;
@@ -1704,7 +1707,7 @@ span[id^="showmore-wrap"] {
   height: 20px;
   width: 500px;
   font-weight: bold;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-title:-webkit-input-placeholder {
   font-weight: normal;
@@ -1731,7 +1734,7 @@ span[id^="showmore-wrap"] {
   margin: 0px;
   height: 20px;
   width: 200px;
-  border: 1px solid #F6ECF9;
+  border: 1px solid #f6ecf9;
 }
 #jot #jot-category:hover {
   border: 1px solid #999999;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 2faa7966f0..db1f42d769 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -317,6 +317,7 @@ aside {
 	.vcard {
 		.fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; }
 		.title { margin-bottom: 5px; }
+		.p-faddr{ margin-bottom: 5px; }
 		dl { height: auto; overflow: auto; }
 		dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; }
 		dd {float: left; margin-left: 4px; width: 60%;}
diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index d57169dcc1..dfa6d0445d 100644
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -6,17 +6,17 @@
 			<div class="action">
 			<a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
 			<ul id="profiles-menu" class="menu-popup">
-			    {{if $profile.menu.entries}}
-    				{{foreach $profile.menu.entries as $e}}
-    				<li>
-    					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
-    				</li>
-    				{{/foreach}}
-    			{{else}}
-    				<li>
-    					<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
-    				</li>
-    			{{/if}}
+			{{if $profile.menu.entries}}
+				{{foreach $profile.menu.entries as $e}}
+				<li>
+					<a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
+				</li>
+				{{/foreach}}
+			{{else}}
+				<li>
+					<a href="{{$profile.edit.0}}">{{$profile.edit.1}}</a>
+				</li>
+			{{/if}}
 				<li><a href="profile_photo" >{{$profile.menu.chg_photo}}</a></li>
 				{{if $profile.menu.cr_new }}
 				<li><a href="profiles/new" id="profile-listing-new-link">{{$profile.menu.cr_new}}</a></li>
@@ -26,6 +26,7 @@
 		{{/if}}
 	</div>
 
+	{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</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>
@@ -52,21 +53,23 @@
 
 	{{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
 
-	{{if $homepage}}<dl class="homepage"><dt
-        class="homepage-label">{{$homepage}}</dt><dd class="homepage-url"><a
-        href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd></dl>{{/if}}
+	{{if $homepage}}
+	<dl class="homepage"><dt class="homepage-label">{{$homepage}}</dt>
+		<dd class="homepage-url"><a href="{{$profile.homepage}}" target="external-link">{{$profile.homepage}}</a></dd>
+	</dl>
+	{{/if}}
 
 	{{include file="diaspora_vcard.tpl"}}
 	
 	<div id="profile-extra-links">
 		<ul>
 			{{if $connect}}
-                                {{if $remoteconnect}}
-                                        <li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
-                                {{else}}
-                                        <li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
-                                {{/if}}
-                        {{/if}}
+				{{if $remoteconnect}}
+					<li><a id="dfrn-request-link" href="{{$remoteconnect}}">{{$connect}}</a></li>
+				{{else}}
+					<li><a id="dfrn-request-link" href="dfrn_request/{{$profile.nickname}}">{{$connect}}</a></li>
+				{{/if}}
+			{{/if}}
 			{{if $wallmessage}}
 				<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
 			{{/if}}
diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index 3317d668ce..c5a51ccbaf 100644
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -13,6 +13,8 @@
 		{{/if}}
 	</div>
 
+	{{if $profile.faddr}}<div class="p-faddr">{{$profile.faddr}}</div>{{/if}}
+
 	{{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
 	{{if $profile.picdate}}
@@ -20,6 +22,7 @@
 	{{else}}
 		<div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
 	{{/if}}
+	
 	{{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
 	{{if $location}}
 		<dl class="location"><dt class="location-label">{{$location}}</dt>