X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofile.php;h=0e9bb6ff61ef33d56d9de0eb01aadfc05cfe1173;hb=2d83a1a9af0d6b132384aa770875f0be46b7914a;hp=957d67be31ae950a46326ff35da22f234e4aa739;hpb=6817c5d59ad578370a2b60dbdcdba16e43dbac65;p=friendica.git

diff --git a/mod/profile.php b/mod/profile.php
index 957d67be31..0e9bb6ff61 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -58,10 +58,12 @@ function profile_init(&$a) {
 	}
 
 	profile_load($a,$which);
+	$a->page['htmlhead'] .= "<meta name=\"dfrn-template\" content=\"" . $a->get_baseurl() . "/profile/%s" . "\" />\r\n";
 	
 	$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
 	foreach($dfrn_pages as $dfrn)
 		$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".$a->get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
+
 }
 
 function item_display(&$a, $item,$template,$comment) {
@@ -72,11 +74,14 @@ function item_display(&$a, $item,$template,$comment) {
 	if(local_user() && ($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
 		$profile_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
 
+	$photo = (($item['self']) ? $a->profile['photo'] : $item['photo']);
+	$thumb = (($item['self']) ? $a->profile['thumb'] : $item['thumb']);
+
 	$o .= replace_macros($template,array(
 		'$id' => $item['item_id'],
 		'$profile_url' => $profile_url,
 		'$name' => $item['name'],
-		'$thumb' => $item['thumb'],
+		'$thumb' => $thumb,
 		'$body' => bbcode($item['body']),
 		'$ago' => relative_date($item['created']),
 		'$comment' => $comment
@@ -93,7 +98,16 @@ function profile_content(&$a) {
 	require_once("include/bbcode.php");
 	require_once('include/security.php');
 
-//	$tpl = file_get_contents('view/profile_tabs.tpl');
+	$tab = 'posts';
+
+	if(x($_GET,'tab'))
+		$tab = notags(trim($_GET['tab']));
+
+	$tpl = file_get_contents('view/profile_tabs.tpl');
+
+	$o .= replace_macros($tpl,array(
+		'$url' => $a->get_baseurl() . '/' . $a->cmd
+	));
 
 
 	if(remote_user())
@@ -106,7 +120,12 @@ function profile_content(&$a) {
 			$contact_id = $r[0]['id'];
 	}
 
+	if($tab == 'profile') {
+
+		require_once('view/profile_advanced.php');
 
+		return $o;
+	}
 	if(can_write_wall($a,$a->profile['profile_uid'])) {
 		$tpl = file_get_contents('view/jot-header.tpl');
 	
@@ -149,12 +168,15 @@ function profile_content(&$a) {
 
 		if(count($r)) {
 			foreach($r as $rr) {
-				$comment = replace_macros($template,array(
-					'$id' => $rr['item_id'],
-					'$profile_uid' =>  $a->profile['profile_uid']
-				));
-
-
+				if(can_write_wall($a,$a->profile['profile_uid'])) {
+					$comment = replace_macros($template,array(
+						'$id' => $rr['item_id'],
+						'$profile_uid' =>  $a->profile['profile_uid']
+					));
+				}
+				else {
+					$comment = '';
+				}
 
 				$o .= item_display($a,$rr,$tpl,$comment);
 			}