aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-12-23 19:44:23 -0800
committerfriendica <info@friendica.com>2013-12-23 19:44:23 -0800
commit8194ade8868bb57180d49a86216fc6fd680b4e79 (patch)
tree046854eccc3532fbef059fcfce59b4cced08e2f5
parent766454a607425d74d90fe0125fcadff5c80a2c58 (diff)
downloadvolse-hubzilla-8194ade8868bb57180d49a86216fc6fd680b4e79.tar.gz
volse-hubzilla-8194ade8868bb57180d49a86216fc6fd680b4e79.tar.bz2
volse-hubzilla-8194ade8868bb57180d49a86216fc6fd680b4e79.zip
improve the directory popup a bit
-rw-r--r--include/dir_fns.php4
-rw-r--r--mod/dirprofile.php42
-rw-r--r--mod/dirsearch.php5
-rwxr-xr-xview/tpl/direntry_large.tpl11
4 files changed, 48 insertions, 14 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 823763e63..7be0bd4c6 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -201,10 +201,10 @@ function syncdirs($uid) {
}
+ $address = $p[0]['channel_address'] . '@' . get_app()->get_hostname();
if(perm_is_allowed($uid,'','view_profile')) {
- import_directory_profile($hash,$profile);
-
+ import_directory_profile($hash,$profile,$address,0);
}
else {
// they may have made it private
diff --git a/mod/dirprofile.php b/mod/dirprofile.php
index 133089419..dd583a89e 100644
--- a/mod/dirprofile.php
+++ b/mod/dirprofile.php
@@ -104,16 +104,42 @@ function dirprofile_init(&$a) {
|| (x($profile,'country') == 1))
$location = t('Location:');
- $gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
- $marital = ((x($profile,'marital') == 1) ? t('Status:') : False);
+ $marital = ((x($profile,'marital') == 1) ? t('Status: ') . $profile['marital'] : False);
+ $sexual = ((x($profile,'sexual') == 1) ? t('Sexual Preference: ') . $profile['sexual'] : False);
- $homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
-
- $about = ((x($profile,'about') == 1) ? t('About:') : False);
-
+// $homepage = ((x($profile,'homepage') == 1) ? t('Homepage: ') . $profile['homepage'] : False);
+
+// $about = ((x($profile,'about') == 1) ? t('About: ') . $profile['about'] : False);
+
+ $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : '');
+ if($keywords) {
+ $keywords = str_replace(',',' ', $keywords);
+ $keywords = str_replace(' ',' ', $keywords);
+ $karr = explode(' ', $keywords);
+ $out = '';
+ if($karr) {
+ if(local_user()) {
+ $r = q("select keywords from profile where uid = %d and is_default = 1 limit 1",
+ intval(local_user())
+ );
+ if($r) {
+ $keywords = str_replace(',',' ', $r[0]['keywords']);
+ $keywords = str_replace(' ',' ', $keywords);
+ $marr = explode(' ', $keywords);
+ }
+ }
+ foreach($karr as $k) {
+ if(strlen($out))
+ $out .= ', ';
+ if($marr && in_array($k,$marr))
+ $out .= '<strong>' . $k . '</strong>';
+ else
+ $out .= $k;
+ }
+ }
-
+ }
$entry = replace_macros(get_markup_template('direntry_large.tpl'), array(
'$id' => ++$t,
'$profile_link' => $profile_link,
@@ -128,6 +154,8 @@ function dirprofile_init(&$a) {
'$marital' => $marital,
'$homepage' => $homepage,
'$about' => $about,
+ '$kw' => (($out) ? t('Keywords: ') : ''),
+ '$keywords' => $out,
'$conn_label' => t('Connect'),
'$connect' => $connect_link,
));
diff --git a/mod/dirsearch.php b/mod/dirsearch.php
index 6490d59df..43cb13470 100644
--- a/mod/dirsearch.php
+++ b/mod/dirsearch.php
@@ -172,13 +172,11 @@ function dirsearch_content(&$a) {
json_return_and_die($spkt);
}
else {
-dbg(1);
$r = q("SELECT xchan.*, xprof.* from xchan left join xprof on xchan_hash = xprof_hash where ( $logic $sql_extra ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) and not ( xchan_flags & %d ) $safesql $order $qlimit ",
intval(XCHAN_FLAGS_HIDDEN),
intval(XCHAN_FLAGS_ORPHAN),
intval(XCHAN_FLAGS_DELETED)
);
-dbg(0);
}
$ret['page'] = $page + 1;
@@ -195,8 +193,6 @@ dbg(0);
$entry['name'] = $rr['xchan_name'];
$entry['hash'] = $rr['xchan_hash'];
-// $entry['updated'] = (($rr['ud_date']) ? $rr['ud_date'] : '0000-00-00 00:00:00');
-// $entry['update_guid'] = (($rr['ud_guid']) ? $rr['ud_guid'] : '');
$entry['url'] = $rr['xchan_url'];
$entry['photo_l'] = $rr['xchan_photo_l'];
$entry['photo'] = $rr['xchan_photo_m'];
@@ -210,6 +206,7 @@ dbg(0);
$entry['age'] = $rr['xprof_age'];
$entry['gender'] = $rr['xprof_gender'];
$entry['marital'] = $rr['xprof_marital'];
+ $entry['sexual'] = $rr['xprof_sexual'];
$entry['keywords'] = $rr['xprof_keywords'];
$entries[] = $entry;
diff --git a/view/tpl/direntry_large.tpl b/view/tpl/direntry_large.tpl
index cf45d8f48..605abb9b3 100755
--- a/view/tpl/direntry_large.tpl
+++ b/view/tpl/direntry_large.tpl
@@ -8,9 +8,18 @@
</div>
<div class="contact-name" id="directory-name-{{$id}}" >{{$name}}</div>
-{{if $entry.connect}}
+{{if $connect}}
<div class="directory-connect"><a href="{{$connect}}">{{$conn_label}}</a></div>
{{/if}}
<div class="contact-details">{{$details}}</div>
</div>
+{{if $marital}}
+<div class="directory-marital">{{$marital}} </div>
+{{/if}}
+{{if $sexual}}
+<div class="directory-sexual">{{$sexual}} </div>
+{{/if}}
+{{if $kw}}
+<div class="directory-keywords">{{$kw}} {{$keywords}}</div>
+{{/if}}
</div>