From d733b39b2db3c92db1d9c28b9b07c74a9d23fa65 Mon Sep 17 00:00:00 2001
From: Mike Macgirvin <mike@macgirvin.com>
Date: Fri, 9 Jul 2010 03:10:28 -0700
Subject: direcotry cleanups

---
 mod/directory.php | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to 'mod/directory.php')

diff --git a/mod/directory.php b/mod/directory.php
index b105bf787..6d0e1f426 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -4,25 +4,37 @@
 function directory_content(&$a) {
 
 
-	$tpl .= file_get_contents('view/directory_header');
+	$tpl .= file_get_contents('view/directory_header.tpl');
 
-	$o .= replace_macros($tpl);
+	$o .= replace_macros($tpl, array(
 
-	$r = q("SELECT * FROM `profile` WHERE `default` = 1 AND `publish` = 1");
+	));
+
+	$r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1");
 	if(count($r)) {
 
 		$tpl = file_get_contents('view/directory_item.tpl');
 
 		foreach($r as $rr) {
+			$profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']);
 
-			$o .= expand_macros($tpl,array(
 
+			$o .= replace_macros($tpl,array(
+				'$id' => $rr['id'],
+				'$profile-link' => $profile_link,
+				'$photo' => $rr['photo'],
+				'$alt-text' => $rr['name'],
+				'$name' => $rr['name'],
+				'$details' => $details   // FIXME
 
 
 			));
 
 		}
+		$o .= "<div class=\"directory-end\" ></div>\r\n";
 	}
 	else
 		notice("No entries (some entries may be hidden).");
+
+	return $o;
 }
\ No newline at end of file
-- 
cgit v1.2.3