Edited view/sv/directory_header.tpl via GitHub

[friendica.git] / view / en / profile_advanced.php

diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php
index 1f917f663df23e4483bb48e1950ae26941562398..6d2ecba4d6fda00b237c22192dfc190a291cefff 100644 (file)
--- a/view/en/profile_advanced.php
+++ b/view/en/profile_advanced.php
@@ -39,8 +39,8 @@ EOT;
 
 $o .= '<div id="advanced-profile-dob">' 
        . ((intval($a->profile['dob'])) 
-               ? datetime_convert('UTC',date_default_timezone_get(),$a->profile['dob'],'j F, Y')
-               : datetime_convert('UTC',date_default_timezone_get(),'2001-' . substr($a->profile['dob'],6),'j F')) 
+               ? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
+               : day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) 
        . "</div>\r\n</div>";
 
 $o .= '<div id="advanced-profile-dob-end"></div>';
@@ -62,6 +62,11 @@ $o .= <<< EOT
 <div id="advanced-profile-marital-wrapper" >
 <div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
 <div id="advanced-profile-marital">{$a->profile['marital']}</div>
+EOT;
+
+if($a->profile['with'])
+       $o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
+$o .= <<< EOT
 </div>
 <div id="advanced-profile-marital-end"></div>
 EOT;
@@ -78,10 +83,11 @@ EOT;
 }
 
 if($a->profile['homepage']) {
+       $homepage = linkify($a->profile['homepage']);
 $o .= <<< EOT
 <div id="advanced-profile-homepage-wrapper" >
 <div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">{$a->profile['homepage']}</div>
+<div id="advanced-profile-homepage">$homepage</div>
 </div>
 <div id="advanced-profile-homepage-end"></div>
 EOT;
@@ -106,8 +112,7 @@ $o .= <<< EOT
 <div id="advanced-profile-religion-end"></div>
 EOT;
 }
-
-if($txt = bbcode($a->profile['about'])) {
+if($txt = prepare_text($a->profile['about'])) {
 $o .= <<< EOT
 <div id="advanced-profile-about-wrapper" >
 <div id="advanced-profile-about-text">About:</div>
@@ -118,7 +123,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['interest'])) {
+if($txt = prepare_text($a->profile['interest'])) {
 $o .= <<< EOT
 <div id="advanced-profile-interest-wrapper" >
 <div id="advanced-profile-interest-text">Hobbies/Interests:</div>
@@ -129,7 +134,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['contact'])) {
+if($txt = prepare_text($a->profile['contact'])) {
 $o .= <<< EOT
 <div id="advanced-profile-contact-wrapper" >
 <div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
@@ -140,7 +145,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['music'])) {
+if($txt = prepare_text($a->profile['music'])) {
 $o .= <<< EOT
 <div id="advanced-profile-music-wrapper" >
 <div id="advanced-profile-music-text">Musical interests:</div>
@@ -151,7 +156,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['book'])) {
+if($txt = prepare_text($a->profile['book'])) {
 $o .= <<< EOT
 <div id="advanced-profile-book-wrapper" >
 <div id="advanced-profile-book-text">Books, literature:</div>
@@ -162,7 +167,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['tv'])) {
+if($txt = prepare_text($a->profile['tv'])) {
 $o .= <<< EOT
 <div id="advanced-profile-tv-wrapper" >
 <div id="advanced-profile-tv-text">Television:</div>
@@ -173,7 +178,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['film'])) {
+if($txt = prepare_text($a->profile['film'])) {
 $o .= <<< EOT
 <div id="advanced-profile-film-wrapper" >
 <div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
@@ -184,7 +189,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['romance'])) {
+if($txt = prepare_text($a->profile['romance'])) {
 $o .= <<< EOT
 <div id="advanced-profile-romance-wrapper" >
 <div id="advanced-profile-romance-text">Love/romance:</div>
@@ -195,7 +200,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['work'])) {
+if($txt = prepare_text($a->profile['work'])) {
 $o .= <<< EOT
 <div id="advanced-profile-work-wrapper" >
 <div id="advanced-profile-work-text">Work/employment:</div>
@@ -206,7 +211,7 @@ $o .= <<< EOT
 EOT;
 }
 
-if($txt = bbcode($a->profile['education'])) {
+if($txt = prepare_text($a->profile['education'])) {
 $o .= <<< EOT
 <div id="advanced-profile-education-wrapper" >
 <div id="advanced-profile-education-text">School/education:</div>
@@ -217,3 +222,4 @@ $o .= <<< EOT
 EOT;
 }
 
+