From c16b65b5bd7f5a43647523ef9dd351a9edb17fde Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 3 Jul 2013 02:47:36 -0700
Subject: multi-profiles work

---
 mod/profile.php  | 28 +++++++++++++++++++---------
 mod/profiles.php |  3 ++-
 2 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'mod')

diff --git a/mod/profile.php b/mod/profile.php
index 2f869a533..c4c0fc35b 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -10,25 +10,35 @@ function profile_init(&$a) {
 		return;
 	}
 
-	$profile = 0;
+	$profile = '';
 	$channel = $a->get_channel();
-
+dbg(1);
 	if((local_user()) && (argc() > 2) && (argv(2) === 'view')) {
 		$which = $channel['channel_address'];
 		$profile = argv(1);		
+		$r = q("select profile_guid from profile where id = %d and uid = %d limit 1",
+			intval($profile),
+			intval(local_user())
+		);
+		if(! $r)
+			$profile = '';
+		$profile = $r[0]['profile_guid'];
 	}
 
 	$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which .'" />' . "\r\n" ;
 
-	$x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
-		dbesc(argv(1))
-	);
-	if($x) {
-		$a->profile = $x[0];
+	if(! $profile) {
+		$x = q("select channel_id as profile_uid from channel where channel_address = '%s' limit 1",
+			dbesc(argv(1))
+		);
+		if($x) {
+			$a->profile = $x[0];
+		}
+	}
 //		$channel_display = get_pconfig($a->profile['profile_uid'],'system','channel_format');
 //		if(! $channel_display)
-			profile_load($a,$which,$profile);
-	}
+	profile_load($a,$which,$profile);
+dbg(0);	
 
 }
 
diff --git a/mod/profiles.php b/mod/profiles.php
index ff6bc8ff6..28d8dd973 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -47,7 +47,7 @@ function profiles_init(&$a) {
 
 	if((argc() > 1) && (argv(1) === 'new')) {
 		
-		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
+//		check_form_security_token_redirectOnErr('/profiles', 'profile_new', 't');
 
 		$r0 = q("SELECT `id` FROM `profile` WHERE `uid` = %d",
 			intval(local_user()));
@@ -519,6 +519,7 @@ function profiles_content(&$a) {
 			'$profile_drop_link'   => 'profiles/drop/' . $r[0]['id'] . '?t=' 
 				. get_form_security_token("profile_drop"),
 
+			'$guid'         => $r[0]['profile_guid'],
 			'$banner'       => t('Edit Profile Details'),
 			'$submit'       => t('Submit'),
 			'$viewprof'     => t('View this profile'),
-- 
cgit v1.2.3