From 74d61ed00b9ff6fe768d4a0f4a27da246020c270 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 24 Aug 2011 22:40:26 -0700
Subject: contact menu beginnings

---
 include/Contact.php | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

(limited to 'include/Contact.php')

diff --git a/include/Contact.php b/include/Contact.php
index 4ca77d065..6eda0b6c5 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -85,3 +85,55 @@ function unmark_for_death($contact) {
 	);
 }}
 
+if(! function_exists('contact_photo_menu')){
+function contact_photo_menu($contact) {
+
+	$a = get_app();
+	
+	$contact_url="";
+	$pm_url="";
+	$status_link="";
+	$photos_link="";
+	$posts_link="";
+
+	$sparkle = false;
+	if($contact['network'] === NETWORK_DFRN) {
+		$sparkle = true;
+		$profile_link = $a->get_baseurl() . '/redir/' . $contact['id'];
+	}
+	else
+		$profile_link = $contact['url'];
+
+	if($profile_link === 'mailbox')
+		$profile_link = '';
+
+	if($sparkle) {
+		$status_link = $profile_link . "?url=status";
+		$photos_link = $profile_link . "?url=photos";
+		$profile_link = $profile_link . "?url=profile";
+		$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
+	}
+
+	$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
+	$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+
+	$menu = Array(
+		t("View status") => $status_link,
+		t("View profile") => $profile_link,
+		t("View photos") => $photos_link,		
+		t("View recent") => $posts_link, 
+		t("Edit contact") => $contact_url,
+		t("Send PM") => $pm_url,
+	);
+	
+	
+	$args = array('contact' => $contact, 'menu' => $menu);
+	
+	call_hooks('contact_photo_menu', $args);
+	
+	$o = "";
+	foreach($menu as $k=>$v){
+		if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+	}
+	return $o;
+}}
-- 
cgit v1.2.3


From 71fc694c6715601f8d9cabcb1835c66a23aea4ca Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 24 Aug 2011 23:20:04 -0700
Subject: contact photo menu

---
 include/Contact.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/Contact.php')

diff --git a/include/Contact.php b/include/Contact.php
index 6eda0b6c5..7524c0cea 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -114,8 +114,8 @@ function contact_photo_menu($contact) {
 		$pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
 	}
 
-	$contact_url = $a->get_baseurl() . '/contacts/' . $cid;
-	$posts_link = $a->get_baseurl() . '/network/?cid=' . $cid;
+	$contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
+	$posts_link = $a->get_baseurl() . '/network/?cid=' . $contact['id'];
 
 	$menu = Array(
 		t("View status") => $status_link,
-- 
cgit v1.2.3


From d7a2ab9c1f34b8a20d63b275d308601b7309d9b8 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Fri, 9 Sep 2011 16:22:32 -0700
Subject: send profile visits to 'redir' window

---
 include/Contact.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include/Contact.php')

diff --git a/include/Contact.php b/include/Contact.php
index 7524c0cea..45920041e 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -133,7 +133,12 @@ function contact_photo_menu($contact) {
 	
 	$o = "";
 	foreach($menu as $k=>$v){
-		if ($v!="") $o .= "<li><a href='$v'>$k</a></li>\n";
+		if ($v!="") {
+			if(($k !== t("View recent")) && ($k !== t("Send PM")))
+				$o .= "<li><a target=\"redir\" href=\"$v\">$k</a></li>\n";
+			else
+				$o .= "<li><a href=\"$v\">$k</a></li>\n";
+		}
 	}
 	return $o;
 }}
-- 
cgit v1.2.3