added network page

boot.php

@@ -22,6 +22,7 @@ class App {
 	public  $profile;
 	public  $user;
 	public  $cid;
+	public  $contact;
 	public  $content;
 	public  $error = false;
 	public  $cmd;

include/auth.php

@@ -26,6 +26,7 @@ if((x($_SESSION,'authenticated')) && (! ($_POST['auth-params'] == 'login'))) {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %s AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid']));
 		if(count($r)) {
+			$a->contact = $r[0];
 			$a->cid = $r[0]['id'];
 			$_SESSION['cid'] = $a->cid;
 		}

include/nav.php

@@ -23,6 +23,8 @@
 		$a->page['nav'] .= "<a id=\"nav-contacts-link\" class=\"nav-link\" href=\"contacts\">Contacts</a>\r\n";
 
 		$a->page['nav'] .= "<a id=\"nav-home-link\" class=\"nav-link\" href=\"profile/{$_SESSION['uid']}\">Home</a>\r\n";
+
+		$a->page['nav'] .= "<a id=\"nav-network-link\" class=\"nav-link\" href=\"network\">Network</a>\r\n";
 		
 	}
 

include/notifier.php

@@ -151,9 +151,9 @@ if($argc < 3)
 								'$name' => xmlify($contact['name']),
 								'$profile_page' => xmlify($contact['url']),
 								'$thumb' => xmlify($contact['thumb']),
-								'$owner_name' => xmlify($owner['name']),
+								'$owner_name' => xmlify($item['owner-name']),
-								'$owner_profile_page' => xmlify($owner['url']),
+								'$owner_profile_page' => xmlify($item['owner-link']),
-								'$owner_thumb' => xmlify($owner['thumb']),
+								'$owner_thumb' => xmlify($item['owner-avatar']),
 								'$item_id' => xmlify("urn:X-dfrn:$baseurl:{$owner['uid']}:{$item['hash']}"),
 								'$title' => xmlify($contact['name']),
 								'$published' => xmlify(datetime_convert('UTC', 'UTC', $item['created'] . '+00:00' , 'Y-m-d\TH:i:s\Z')),

mod/item.php

@@ -73,10 +73,12 @@ function item_post(&$a) {
 	if((x($_SESSION,'visitor_id')) && (intval($_SESSION['visitor_id'])))
 		$contact_id = $_SESSION['visitor_id'];
 	else {
-		$r = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
+		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
 			intval($_SESSION['uid']));
-		if(count($r))
+		if(count($r)) {
+			$contact_record = $r[0];
 			$contact_id = $r[0]['id'];
+		}
 	}	
 
 	$notify_type = (($parent) ? 'comment-new' : 'wall-new' );
@@ -93,12 +95,15 @@ function item_post(&$a) {
 		} while($dups == true);
 
 
-		$r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`created`,`edited`,`hash`,`body`,
+		$r = q("INSERT INTO `item` (`uid`,`type`,`contact-id`,`owner-name`,`owner-link`,`owner-avatar`, `created`,`edited`,`hash`,`body`,
 			`allow_cid`, `allow_gid`, `deny_cid`, `deny_gid`)
-			VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
+			VALUES( %d, '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s' )",
 			intval($profile_uid),
 			"jot",
 			intval($contact_id),
+			dbesc($contact_record['name']),
+			dbesc($contact_record['url']),
+			dbesc($contact_record['thumb']),
 			datetime_convert(),
 			datetime_convert(),
 			dbesc($hash),

mod/network.php

@@ -0,0 +1,138 @@
+<?php
+
+
+function network_init(&$a) {
+
+}
+
+
+function network_content(&$a) {
+
+	if(! local_user())
+		return;
+
+	require_once("include/bbcode.php");
+
+
+	$contact_id = $a->cid;
+
+
+	$tpl = file_get_contents('view/jot-header.tpl');
+	
+	$a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl()));
+	require_once('view/acl_selectors.php');
+
+	$tpl = file_get_contents("view/jot.tpl");
+
+	$o .= replace_macros($tpl,array(
+		'$baseurl' => $a->get_baseurl(),
+		'$visitor' => 'block',
+		'$lockstate' => 'unlock',
+		'$acl' => populate_acl(),
+		'$profile_uid' => $_SESSION['uid']
+	));
+
+
+	// TODO 
+	// Alter registration and settings 
+	// and profile to update contact table when names and  photos change.  
+	// work on item_display and can_write_wall
+
+	// Add comments. 
+
+
+	$sql_extra = ''; 
+
+
+	$r = q("SELECT COUNT(*) AS `total`
+		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+		AND `contact`.`blocked` = 0 
+		$sql_extra ",
+		intval($_SESSION['uid'])
+
+	);
+
+	if(count($r))
+		$a->set_pager_total($r[0]['total']);
+dbg(2);
+
+	$r = q("SELECT `item`.*, `item`.`id` AS `item_id`, 
+		`contact`.`name`, `contact`.`photo`, `contact`.`url`, 
+		`contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`, 
+		`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
+		FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+		WHERE `item`.`uid` = %d AND `item`.`visible` = 1 AND `item`.`deleted` = 0
+		AND `contact`.`blocked` = 0 
+		$sql_extra
+		ORDER BY `parent` DESC, `id` ASC LIMIT %d ,%d ",
+		intval($_SESSION['uid']),
+		intval($a->pager['start']),
+		intval($a->pager['itemspage'])
+
+	);
+
+
+	$cmnt_tpl = file_get_contents('view/comment_item.tpl');
+
+
+	$tpl = file_get_contents('view/wall_item.tpl');
+	$wallwall = file_get_contents('view/wallwall_item.tpl');
+
+	if(count($r)) {
+		foreach($r as $rr) {
+			$comment = '';
+
+			if($rr['last-child']) {
+				$comment = replace_macros($cmnt_tpl,array(
+					'$id' => $rr['item_id'],
+					'$parent' => $rr['parent'],
+					'$profile_uid' =>  $_SESSION['uid']
+				));
+			}
+
+			$item = $rr;
+			$template = $tpl;
+	
+			$profile_url = $item['url'];
+
+			if(($item['contact-uid'] == $_SESSION['uid']) && (strlen($item['dfrn-id'])) && (! $item['self'] ))
+				$profile_url = $a->get_baseurl() . '/redir/' . $item['cid'] ;
+
+			$photo = $item['photo'];
+			$thumb = $item['thumb'];
+	
+			$profile_name = ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']);
+			$profile_link = ((strlen($item['remote-link'])) ? $item['remote-link'] : $profile_url);
+			$profile_avatar = ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $thumb);
+
+			if(($item['parent'] == $item['item_id']) && (! $item['self'])) {
+				$template = $wallwall;			// FIXME also if remote owner
+				$owner_url = $a->contact['url'];
+				$owner_photo = $a->contact['thumb'];
+				$owner_name = $a->contact['name'];
+			}
+
+			$o .= replace_macros($template,array(
+				'$id' => $item['item_id'],
+				'$profile_url' => $profile_link,
+				'$name' => $profile_name,
+				'$thumb' => $profile_avatar,
+				'$body' => bbcode($item['body']),
+				'$ago' => relative_date($item['created']),
+				'$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),
+				'$owner_url' => $owner_url,
+				'$owner_photo' => $owner_photo,
+				'$owner_name' => $owner_name,
+				'$comment' => $comment
+			));
+
+		}
+	}
+
+	$o .= paginate($a);
+
+	return $o;
+
+
+}

mod/profile.php

@@ -79,12 +79,21 @@ function item_display(&$a, $item,$template,$comment) {
 
 	$photo = (($item['self']) ? $a->profile['photo'] : $item['photo']);
 	$thumb = (($item['self']) ? $a->profile['thumb'] : $item['thumb']);
+	
+	$profile_name = ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']);
+	$profile_link = ((strlen($item['remote-link'])) ? $item['remote-link'] : $profile_url);
+	$profile_avatar = ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $thumb);
+
+//	if(! $item['owner-link']) {
+//		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1".
+
+
 
 	$o .= replace_macros($template,array(
 		'$id' => $item['item_id'],
-		'$profile_url' => ((strlen($item['remote-link'])) ? $item['remote-link'] : $profile_url),
+		'$profile_url' => $profile_link,
-		'$name' => ((strlen($item['remote-name'])) ? $item['remote-name'] : $item['name']),
+		'$name' => $profile_name,
-		'$thumb' => ((strlen($item['remote-avatar'])) ? $item['remote-avatar'] : $thumb),
+		'$thumb' => $profile_avatar,
 		'$body' => bbcode($item['body']),
 		'$ago' => relative_date($item['created']),
 		'$indent' => (($item['parent'] != $item['item_id']) ? 'comment-' : ''),

view/style.css

@@ -425,6 +425,11 @@ input#dfrn-url {
 	width: 100px;
 	float: left;
 }
+.wall-item-arrowphoto-wrapper {
+	margin-top: 40px;
+	margin-right: 20px;
+	float: left;
+}
 .wall-item-wrapper {
 	margin-top: 30px;
 	float: left;

view/wallwall_item.tpl

@@ -0,0 +1,23 @@
+<div class="wall-item-$indentoutside-wrapper" id="wall-item-outside-wrapper-$id" >
+<div class="wall-item-photo-wrapper" id="wall-item-ownerphoto-wrapper-$id" >
+<a href="$owner_url" title="View $owner_name's profile" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$id">
+<img src="$owner_photo" class="wall-item-photo" id="wall-item-ownerphoto-$id" height="80" width="80" alt="$owner_name" /></a>
+</div>
+<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="Wall-To-Wall" /></div>
+<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" >
+<a href="$profile_url" title="View $name's profile" class="wall-item-photo-link" id="wall-item-photo-link-$id">
+<img src="$thumb" class="wall-item-photo" id="wall-item-photo-$id" height="80" width="80" alt="$name" /></a>
+</div>
+<div class="wall-item-wrapper" id="wall-item-wrapper-$id" >
+<a href="$profile_url" title="View $name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-$id" >$name</span></a> to <a href="$owner_url" title="View $owner_name's profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-ownername-$id">$owner_name</span</a> via Wall-To-Wall:<br />
+<span class="wall-item-body" id="wall-item-body-$id" >$body</span>
+<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>
+
+</div>
+<div class="wall-item-wrapper-end"></div>
+<div class="wall-item-comment-separator"></div>
+$comment
+</div>
+
+<div class="wall-item-$indentoutside-wrapper-end" ></div>
+