diff options
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/dirprofile.php | 7 | ||||
| -rw-r--r-- | mod/dirsearch.php | 3 | ||||
| -rw-r--r-- | mod/zfinger.php | 6 |
3 files changed, 13 insertions, 3 deletions
diff --git a/mod/dirprofile.php b/mod/dirprofile.php index 01a0debfc..ba056e864 100644 --- a/mod/dirprofile.php +++ b/mod/dirprofile.php @@ -1,6 +1,7 @@ <?php require_once('include/dir_fns.php'); +require_once('include/bbcode.php'); function dirprofile_init(&$a) { @@ -108,9 +109,10 @@ function dirprofile_init(&$a) { $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: ') . $profile['homepage'] : False); + $homepage = ((x($profile,'homepage') == 1) ? t('Homepage: ') . linkify($profile['homepage']) : False); + $hometown = ((x($profile,'hometown') == 1) ? t('Hometown: ') . $profile['hometown'] : False); -// $about = ((x($profile,'about') == 1) ? t('About: ') . $profile['about'] : False); + $about = ((x($profile,'about') == 1) ? t('About: ') . bbcode($profile['about']) : False); $keywords = ((x($profile,'keywords')) ? $profile['keywords'] : ''); if($keywords) { @@ -153,6 +155,7 @@ function dirprofile_init(&$a) { '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, + '$hometown' => $hometown, '$about' => $about, '$kw' => (($out) ? t('Keywords: ') : ''), '$keywords' => $out, diff --git a/mod/dirsearch.php b/mod/dirsearch.php index 43cb13470..d1f4761bc 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -207,6 +207,9 @@ function dirsearch_content(&$a) { $entry['gender'] = $rr['xprof_gender']; $entry['marital'] = $rr['xprof_marital']; $entry['sexual'] = $rr['xprof_sexual']; + $entry['sexual'] = $rr['xprof_about']; + $entry['sexual'] = $rr['xprof_homepage']; + $entry['sexual'] = $rr['xprof_hometown']; $entry['keywords'] = $rr['xprof_keywords']; $entries[] = $entry; diff --git a/mod/zfinger.php b/mod/zfinger.php index aad8e224d..94671271b 100644 --- a/mod/zfinger.php +++ b/mod/zfinger.php @@ -126,12 +126,16 @@ function zfinger_init(&$a) { $profile['region'] = $p[0]['region']; $profile['postcode'] = $p[0]['postal_code']; $profile['country'] = $p[0]['country_name']; + $profile['about'] = $p[0]['about']; + $profile['homepage'] = $p[0]['homepage']; + $profile['hometown'] = $p[0]['hometown']; + if($p[0]['keywords']) { $tags = array(); $k = explode(' ',$p[0]['keywords']); if($k) { foreach($k as $kk) { - if(trim($kk)) { + if(trim($kk," \t\n\r\0\x0B,")) { $tags[] = trim($kk," \t\n\r\0\x0B,"); } } |