some w3c validation issues

4 files changed, 76 insertions, 226 deletions

diff --git a/boot.php b/boot.php
index 92741eaee..5d8417bd2 100644
--- a/boot.php
+++ b/boot.php
@@ -2301,9 +2301,9 @@ function profile_sidebar($profile) {
 
 	$pubkey = ((x($profile,'pubkey') == 1) ? '<div class="key" style="display:none;">' . $profile['pubkey'] . '</div>' : '');
 
-	$marital = ((x($profile,'marital') == 1) ? '<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> ' . t('Status:') . ' </span><span class="marital-text">' . $profile['marital'] . '</span></div></div><div class="profile-clear"></div>' : '');
+	$marital = ((x($profile,'marital') == 1) ? '<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> ' . t('Status:') . ' </span><span class="marital-text">' . $profile['marital'] . '</span></div><div class="profile-clear"></div>' : '');
 
-	$homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div></div><div class="profile-clear"></div>' : '');
+	$homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div><div class="profile-clear"></div>' : '');
 
 	$tpl = load_view_file('view/profile_vcard.tpl');
 
diff --git a/include/conversation.php b/include/conversation.php
index 943ebfeba..52c11fff5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -5,6 +5,21 @@ function conversation(&$a,$r, $mode, $update) {
 
 	require_once('bbcode.php');
 
+	$profile_owner = 0;
+	$writable      = false;
+
+	if($mode === 'network') {
+		$profile_owner = local_user();
+		$writable = true;
+	}
+
+	if($mode === 'profile') {
+		$profile_owner = $a->profile['profile_uid'];
+		$writable = can_write_wall($a,$profile_owner);
+	}
+
+
+
 	// find all the authors involved in remote conversations
 	// We will use a local profile photo if they are one of our contacts
 	// otherwise we have to get the photo from the item owner's site
@@ -64,12 +79,22 @@ function conversation(&$a,$r, $mode, $update) {
 						$location = '<span class="smalltext">' . $coord . '</span>';
 				}
 
+				$drop = '';
+				$dropping = false;
+
+				if((intval($item['contact-id']) && $item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
+					$dropping = true;
+
+	            $drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
+
+
+
 				$drop = replace_macros($droptpl,array('$id' => $item['id']));
 				$lock = '<div class="wall-item-lock"></div>';
 				
 				$o .= replace_macros($tpl,array(
 					'$id' => $item['item_id'],
-					'$linktitle' => sprintf( t('View %s\s profile'), $profile_name),
+					'$linktitle' => sprintf( t('View %s\'s profile'), $profile_name),
 					'$profile_url' => $profile_link,
 					'$item_photo_menu' => item_photo_menu($item),
 					'$name' => $profile_name,
@@ -192,7 +217,7 @@ function conversation(&$a,$r, $mode, $update) {
 
 			$osparkle = '';
 
-			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
+			if(($item['parent'] == $item['item_id']) && (! $item['self']) && ($mode !== 'profile')) {
 
 				if($item['type'] === 'wall') {
 					// I do. Put me on the left of the wall-to-wall notice.
@@ -224,35 +249,38 @@ function conversation(&$a,$r, $mode, $update) {
 				$return_url = $_SESSION['return_url'] = $a->cmd;
 
 			$likebuttons = '';
-			if($item['id'] == $item['parent']) {
-				$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
-					'$id' => $item['id'],
-					'$likethis' => t("I like this \x28toggle\x29"),
-					'$nolike' => t("I don't like this \x28toggle\x29"),
-					'$share' => t('Share'),
-					'$wait' => t('Please wait') 
-				));
-			}
 
-			if($item['last-child']) {
-				$comment = replace_macros($cmnt_tpl,array(
-					'$return_path' => '', 
-					'$jsreload' => '', // $_SESSION['return_url'],
-					'$type' => 'net-comment',
-					'$id' => $item['item_id'],
-					'$parent' => $item['parent'],
-					'$profile_uid' =>  $_SESSION['uid'],
-					'$mylink' => $a->contact['url'],
-					'$mytitle' => t('This is you'),
-					'$myphoto' => $a->contact['thumb'],
-					'$comment' => t('Comment'),
-					'$submit' => t('Submit'),
-					'$ww' => $commentww
-				));
+			if($writable) {
+				if($item['id'] == $item['parent']) {
+					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
+						'$id' => $item['id'],
+						'$likethis' => t("I like this \x28toggle\x29"),
+						'$nolike' => t("I don't like this \x28toggle\x29"),
+						'$share' => t('Share'),
+						'$wait' => t('Please wait') 
+					));
+				}
+
+				if($item['last-child']) {
+					$comment = replace_macros($cmnt_tpl,array(
+						'$return_path' => '', 
+						'$jsreload' => '', // $_SESSION['return_url'],
+						'$type' => 'net-comment',
+						'$id' => $item['item_id'],
+						'$parent' => $item['parent'],
+						'$profile_uid' =>  $profile_owner,
+						'$mylink' => $a->contact['url'],
+						'$mytitle' => t('This is you'),
+						'$myphoto' => $a->contact['thumb'],
+						'$comment' => t('Comment'),
+						'$submit' => t('Submit'),
+						'$ww' => $commentww
+					));
+				}
 			}
 
 			$edpost = '';
-			if(($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
+			if(($profile_owner == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
 				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
 			$drop = replace_macros(load_view_file('view/wall_item_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
@@ -266,7 +294,17 @@ function conversation(&$a,$r, $mode, $update) {
 			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
 			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
 
-			if(strlen($item['author-link'])) {
+			if($mode === 'profile') {
+				if(local_user() && ($item['contact-uid'] == local_user()) && ($item['network'] === 'dfrn') && (! $item['self'] )) {
+	                $profile_link = $redirect_url;
+    	            $sparkle = ' sparkle';
+        	    }
+				else {
+					$profile_link = $item['url'];
+					$sparkle = '';
+				}
+			}
+			elseif(strlen($item['author-link'])) {
 				$profile_link = $item['author-link'];
 				if(link_compare($item['author-link'],$item['url']) && ($item['network'] === 'dfrn') && (! $item['self'])) {
 					$profile_link = $redirect_url;
diff --git a/mod/profile.php b/mod/profile.php
index 88e23a8a4..f98c28f8f 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -288,205 +288,17 @@ function profile_content(&$a, $update = 0) {
 	if($is_owner && ! $update)
 		$o .= get_birthdays();
 
-	$cmnt_tpl = load_view_file('view/comment_item.tpl');
 
-	$like_tpl = load_view_file('view/like.tpl');
-	$noshare_tpl = load_view_file('view/like_noshare.tpl');
+	require_once('include/conversation.php');
 
-	$tpl = load_view_file('view/wall_item.tpl');
+	$o .= conversation($a,$r,'profile',$display);
 
-	$droptpl = load_view_file('view/wall_item_drop.tpl');
-	$fakedrop = load_view_file('view/wall_fake_drop.tpl');
 
-	if($update)
-		$return_url = $_SESSION['return_url'];
-	else
-		$return_url = $_SESSION['return_url'] = $a->cmd;
-
-	$alike = array();
-	$dlike = array();
-
-	if($r !== false && count($r)) {
-
-		$comments = array();
-		foreach($r as $rr) {
-			if(intval($rr['gravity']) == 6) {
-				if(! x($comments,$rr['parent']))
-					$comments[$rr['parent']] = 1;
-				else
-					$comments[$rr['parent']] += 1;
-			}
-		}
-
-		foreach($r as $item) {
-			like_puller($a,$item,$alike,'like');
-			like_puller($a,$item,$dlike,'dislike');
-		}
-
-		$comments_collapsed = false;
-
-		foreach($r as $item) {
-
-			$sparkle = '';		
-			$comment = '';
-			$likebuttons = '';
-
-			$template = $tpl;
-			
-			$redirect_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
-
-			if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) 
-				&& ($item['id'] != $item['parent']))
-				continue;
-
-			if($item['id'] == $item['parent']) {
-				$comments_seen = 0;
-				$comments_collapsed = false;
-			}
-			else
-				$comments_seen ++;
-
-
-			if(($comments[$item['parent']] > 2) && ($comments_seen <= ($comments[$item['parent']] - 2)) && ($item['gravity'] == 6)) {
-				if(! $comments_collapsed) {
-					$o .= '<div class="ccollapse-wrapper fakelink" id="ccollapse-wrapper-' . $item['parent'] . '" onclick="openClose(' . '\'ccollapse-' . $item['parent'] . '\');" >' . sprintf( t('See all %d comments'), $comments[$item['parent']]) . '</div>';
-					$o .= '<div class="ccollapse" id="ccollapse-' . $item['parent'] . '" style="display: none;" >';
-					$comments_collapsed = true;
-				}
-			}
-			if(($comments[$item['parent']] > 2) && ($comments_seen == ($comments[$item['parent']] - 1))) {
-				$o .= '</div></div>';
-			}
-
-			$lock = ((($item['private']) || (($item['uid'] == local_user()) && (strlen($item['allow_cid']) || strlen($item['allow_gid']) 
-				|| strlen($item['deny_cid']) || strlen($item['deny_gid']))))
-				? '<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="' . t('Private Message') . '" onclick="lockview(event,' . $item['id'] . ');" /></div>'
-				: '<div class="wall-item-lock"></div>');
-
-			if(can_write_wall($a,$a->profile['profile_uid'])) {
-				if($item['id'] == $item['parent']) {
-					$likebuttons = replace_macros((($item['private']) ? $noshare_tpl : $like_tpl),array(
-						'$id' => $item['id'],
-						'$likethis' => t("I like this \x28toggle\x29"),
-						'$nolike' => t("I don't like this \x28toggle\x29"),
-						'$share' => t('Share'),
-						'$wait' => t('Please wait') 
-					));
-				}
-				if($item['last-child']) {
-					$comment = replace_macros($cmnt_tpl,array(
-						'$return_path' => '', 
-						'$jsreload' => '', // $_SESSION['return_url'],
-						'$type' => 'wall-comment',
-						'$id' => $item['item_id'],
-						'$parent' => $item['parent'],
-						'$profile_uid' =>  $a->profile['profile_uid'],
-						'$mylink' => $contact['url'],
-						'$mytitle' => t('This is you'),
-						'$myphoto' => $contact['thumb'],
-						'$comment' => t('Comment'),
-						'$submit' => t('Submit'),
-						'$ww' => ''
-					));
-				}
-			}
-
-
-			$profile_url = $item['url'];
-
-			// This is my profile page but I'm not the author of this post/comment. If it's somebody that's a fan or mutual friend,
-			// I can go directly to their profile as an authenticated guest.
-
-			if(local_user() && ($item['contact-uid'] == local_user()) 
-				&& ($item['network'] === 'dfrn') && (! $item['self'] )) {
-				$profile_url = $redirect_url;
-				$sparkle = ' sparkle';
-			}
-			else
-				$sparkle = '';
-
-
-			$edpost = '';
-			if((local_user()) && ($a->profile['profile_uid'] == local_user()) && ($item['id'] == $item['parent']) && (intval($item['wall']) == 1)) 
-				$edpost = '<a class="editpost" href="' . $a->get_baseurl() . '/editpost/' . $item['id'] . '" title="' . t('Edit') . '"><img src="images/pencil.gif" /></a>';
-
-
-			// We would prefer to use our own avatar link for this item because the one in the author-avatar might reference a 
-			// remote site (which could be down). We will use author-avatar if we haven't got something stored locally.
-			// We use this same logic block in mod/network.php to determine it this is a third party post and we don't have any 
-			// local contact info at all. In this module you should never encounter a third-party author, but we still will do
-			// the right thing if you ever do. 
-
-			$diff_author = ((link_compare($item['url'],$item['author-link'])) ? false : true);
-
-			$profile_name   = (((strlen($item['author-name']))   && $diff_author) ? $item['author-name']   : $item['name']);
-			$profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $item['thumb']);
-
-			$profile_link = $profile_url;
-
-			$drop = '';
-			$dropping = false;
-
-			if(($item['contact-id'] == remote_user()) || ($item['uid'] == local_user()))
-				$dropping = true;
-
-			$drop = replace_macros((($dropping)? $droptpl : $fakedrop), array('$id' => $item['id'], '$delete' => t('Delete')));
-
-
-			$like    = ((isset($alike[$item['id']])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
-			$dislike = ((isset($dlike[$item['id']])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
-			$location = (($item['location']) ? '<a target="map" title="' . $item['location'] . '" href="http://maps.google.com/?q=' . urlencode($item['location']) . '">' . $item['location'] . '</a>' : '');
-			$coord = (($item['coord']) ? '<a target="map" title="' . $item['coord'] . '" href="http://maps.google.com/?q=' . urlencode($item['coord']) . '">' . $item['coord'] . '</a>' : '');
-			if($coord) {
-				if($location)
-					$location .= '<br /><span class="smalltext">(' . $coord . ')</span>';
-				else
-					$location = '<span class="smalltext">' . $coord . '</span>';
-			}
-
-			$indent = (($item['parent'] != $item['item_id']) ? ' comment' : '');
-
-			if(strcmp(datetime_convert('UTC','UTC',$item['created']),datetime_convert('UTC','UTC','now - 12 hours')) > 0)
-				$indent .= ' shiny'; 
-
-
-			$tmp_item = replace_macros($template,array(
-				'$id' => $item['item_id'],
-				'$linktitle' => t('View $name\'s profile'),
-				'$profile_url' => $profile_link,
-				'$item_photo_menu' => item_photo_menu($item),				
-				'$name' => $profile_name,
-				'$thumb' => $profile_avatar,
-				'$sparkle' => $sparkle,
-				'$title' => $item['title'],
-				'$body' => smilies(bbcode($item['body'])),
-				'$ago' => relative_date($item['created']),
-				'$lock' => $lock,
-				'$location' => $location, 
-				'$indent' => $indent, 
-				'$plink' => get_plink($item),
-				'$edpost' => $edpost,
-				'$drop' => $drop,
-				'$like' => $like,
-				'$vote' => $likebuttons,
-				'$dislike' => $dislike,
-				'$comment' => $comment
-			));
-
-			$arr = array('item' => $item, 'output' => $tmp_item);
-			call_hooks('display_item', $arr);
-
-			$o .= $arr['output'];
-			
-		}
-	}
-
-	if($update) {
-		return $o;
-	}
+	if(! $update) {
 		
-	$o .= paginate($a);
-	$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
+		$o .= paginate($a);
+		$o .= '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
+	}
 
 	return $o;
 }
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index 893483259..e17b63e5a 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -1,6 +1,6 @@
 <div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
-		<span class="wall-item-info" id="wall-item-info-$id">
+		<div class="wall-item-info" id="wall-item-info-$id">
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
 				 onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('wall-item-photo-menu-button-$id')" 
 				 onmouseout="t$id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$id\'); closeMenu(\'wall-item-photo-menu-$id\');',200)">
@@ -19,7 +19,7 @@
 				$lock
 				<div class="wall-item-location" id="wall-item-location-$id">$location</div>				
 			</div>
-		</span>
+		</div>
 		<div class="wall-item-author">
 				<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
 				<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>