From 6c321be03c8edd062866b1775bca560beec9d602 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 3 Dec 2013 15:35:13 -0800
Subject: [PATCH] reorganise a few included functions - notably identity
 related functions

---
 boot.php                     | 644 +-----------------------------
 include/datetime.php         |  21 +
 include/identity.php         | 747 +++++++++++++++++++++++++++++++++++
 include/profile_advanced.php | 125 ------
 mod/profile.php              |   1 -
 5 files changed, 770 insertions(+), 768 deletions(-)
 delete mode 100644 include/profile_advanced.php

diff --git a/boot.php b/boot.php
index e542913f2..a90d042a5 100755
--- a/boot.php
+++ b/boot.php
@@ -39,6 +39,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/BaseObject.php');
 require_once('include/features.php');
 require_once('include/taxonomy.php');
+require_once('include/identity.php');
 
 
 define ( 'RED_PLATFORM',            'Red Matrix' );
@@ -1531,449 +1532,12 @@ function info($s) {
 
 
 function get_max_import_size() {
-	global $a;
-	return ((x($a->config,'max_import_size')) ? $a->config['max_import_size'] : 0 );
+	return(intval(get_config('system','max_import_size')));
 }
 
 
 
 
-/**
- *
- * Function : profile_load
- * @parameter App    $a
- * @parameter string $nickname
- * @parameter string $profile
- *
- * Summary: Loads a profile into the page sidebar.
- * The function requires a writeable copy of the main App structure, and the nickname
- * of a registered local account.
- *
- * If the viewer is an authenticated remote viewer, the profile displayed is the
- * one that has been configured for his/her viewing in the Contact manager.
- * Passing a non-zero profile ID can also allow a preview of a selected profile
- * by the owner.
- *
- * Profile information is placed in the App structure for later retrieval.
- * Honours the owner's chosen theme for display.
- *
- */
-
-
-function profile_load(&$a, $nickname, $profile = '') {
-
-	logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
-
-	$user = q("select channel_id from channel where channel_address = '%s' limit 1",
-		dbesc($nickname)
-	);
-		
-	if(! $user) {
-		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-		notice( t('Requested channel is not available.') . EOL );
-		$a->error = 404;
-		return;
-	}
-
-	// get the current observer
-	$observer = $a->get_observer();
-
-	// Can the observer see our profile?
-	require_once('include/permissions.php');
-	if(! perm_is_allowed($user[0]['channel_id'],$observer['xchan_hash'],'view_profile')) {
-		// permission denied
-		notice( t(' Sorry, you don\'t have the permission to view this profile. ') . EOL);
-		return;
-	}
-
-	if(! $profile) {
-		$r = q("SELECT abook_profile FROM abook WHERE abook_xchan = '%s' and abook_channel = '%d' limit 1",
-			dbesc($observer['xchan_hash']),
-			intval($user[0]['channel_id'])
-		);
-		if($r)
-			$profile = $r[0]['abook_profile'];
-	}
-	$r = null;
-
-	if($profile) {
-		$r = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
-				LEFT JOIN channel ON profile.uid = channel.channel_id
-				WHERE channel.channel_address = '%s' AND profile.profile_guid = '%s' LIMIT 1",
-				dbesc($nickname),
-				dbesc($profile)
-		);
-	}
-
-	if(! $r) {
-		$r = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
-			LEFT JOIN channel ON profile.uid = channel.channel_id
-			WHERE channel.channel_address = '%s' and not ( channel_pageflags & %d ) 
-			AND profile.is_default = 1 LIMIT 1",
-			dbesc($nickname),
-			intval(PAGE_REMOVED)
-		);
-	}
-
-	if(! $r) {
-		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-		notice( t('Requested profile is not available.') . EOL );
-		$a->error = 404;
-		return;
-	}
-	
-	// fetch user tags if this isn't the default profile
-
-	if(! $r[0]['is_default']) {
-		$x = q("select `keywords` from `profile` where uid = %d and `is_default` = 1 limit 1",
-				intval($profile_uid)
-		);
-		if($x)
-			$r[0]['keywords'] = $x[0]['keywords'];
-	}
-
-	if($r[0]['keywords']) {
-		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$r[0]['keywords']);
-		if(strlen($keywords))
-			$a->page['htmlhead'] .= '<meta name="keywords" content="' . htmlentities($keywords,ENT_COMPAT,'UTF-8') . '" />' . "\r\n" ;
-
-	}
-
-	$a->profile = $r[0];
-	$a->profile_uid = $r[0]['profile_uid'];
-
-	$a->page['title'] = $a->profile['channel_name'] . " - " . $a->profile['channel_address'] . "@" . $a->get_hostname();
-
-	$a->profile['channel_mobile_theme'] = get_pconfig(local_user(),'system', 'mobile_theme');
-	$_SESSION['theme'] = $a->profile['channel_theme'];
-	$_SESSION['mobile_theme'] = $a->profile['channel_mobile_theme'];
-
-	/**
-	 * load/reload current theme info
-	 */
-
-	$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
-
-	$theme_info_file = "view/theme/".current_theme()."/php/theme.php";
-	if (file_exists($theme_info_file)){
-		require_once($theme_info_file);
-	}
-
-	return;
-}
-
-function profile_create_sidebar(&$a,$connect = true) {
-
-	$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
-
-	$a->set_widget('profile',profile_sidebar($a->profile, $block, $connect));
-	return;
-}
-
-
-/**
- *
- * Function: profile_sidebar
- *
- * Formats a profile for display in the sidebar.
- * It is very difficult to templatise the HTML completely
- * because of all the conditional logic.
- *
- * @parameter: array $profile
- *
- * Returns HTML string stuitable for sidebar inclusion
- * Exceptions: Returns empty string if passed $profile is wrong type or not populated
- *
- */
-
-
-
-function profile_sidebar($profile, $block = 0, $show_connect = true) {
-
-	$a = get_app();
-
-	$observer = $a->get_observer();
-
-	$o = '';
-	$location = false;
-	$address = false;
-	$pdesc = true;
-
-	if((! is_array($profile)) && (! count($profile)))
-		return $o;
-
-
-	head_set_icon($profile['thumb']);
-
-	$is_owner = (($profile['uid'] == local_user()) ? true : false);
-
-	$profile['picdate'] = urlencode($profile['picdate']);
-
-	call_hooks('profile_sidebar_enter', $profile);
-
-	require_once('include/Contact.php');
-
-	if($show_connect) {
-
-		// This will return an empty string if we're already connected.
-
-		$connect_url = rconnect_url($profile['uid'],get_observer_hash());
-		$connect = (($connect_url) ? t('Connect') : '');
-		if($connect_url) 
-			$connect_url = sprintf($connect_url,urlencode($profile['channel_address'] . '@' . $a->get_hostname()));
-
-		// premium channel - over-ride
-
-		if($profile['channel_pageflags'] & PAGE_PREMIUM)
-			$connect_url = z_root() . '/connect/' . $profile['channel_address'];
-	}
-
-	// show edit profile to yourself
-	if($is_owner) {
-
-		$profile['menu'] = array(
-			'chg_photo' => t('Change profile photo'),
-			'entries' => array(),
-		);
-
-
-		if(feature_enabled(local_user(),'multi_profiles')) {
-			$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
-			$profile['menu']['cr_new'] = t('Create New Profile');
-		}
-		else
-			$profile['edit'] = array($a->get_baseurl() . '/profiles/' . $profile['id'], t('Edit Profile'),'',t('Edit Profile'));
-						
-		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
-				local_user());
-		
-
-		if($r) {
-			foreach($r as $rr) {
-				$profile['menu']['entries'][] = array(
-					'photo'                => $rr['thumb'],
-					'id'                   => $rr['id'],
-					'alt'                  => t('Profile Image'),
-					'profile_name'         => $rr['profile_name'],
-					'isdefault'            => $rr['is_default'],
-					'visible_to_everybody' => t('visible to everybody'),
-					'edit_visibility'      => t('Edit visibility'),
-				);
-			}
-		}
-	}
-
-	if((x($profile,'address') == 1)
-		|| (x($profile,'locality') == 1)
-		|| (x($profile,'region') == 1)
-		|| (x($profile,'postal_code') == 1)
-		|| (x($profile,'country_name') == 1))
-		$location = t('Location:');
-
-	$gender   = ((x($profile,'gender')   == 1) ? t('Gender:')   : False);
-	$marital  = ((x($profile,'marital')  == 1) ? t('Status:')   : False);
-	$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
-
-	if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-		$location = $pdesc = $gender = $marital = $homepage = False;
-	}
-
-	$firstname = ((strpos($profile['name'],' '))
-		? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
-	$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
-
-	if(is_array($observer) 
-		&& perm_is_allowed($profile['uid'],$observer['xchan_hash'],'view_contacts')) {
-		$contact_block = contact_block();
-	}
-
-	$channel_menu = false;
-	$menu = get_pconfig($profile['uid'],'system','channel_menu');
-	if($menu) {
-		require_once('include/menu.php');
-		$m = menu_fetch($menu,$profile['uid'],$observer['xchan_hash']);
-		if($m)
-			$channel_menu = menu_render($m);
-	}
-	$menublock = get_pconfig($profile['uid'],'system','channel_menublock');
-	if ($menublock) {
-		require_once('include/comanche.php');
-		$channel_menu .= comanche_block($menublock);
-	}
-
-	$tpl = get_markup_template('profile_vcard.tpl');
-
-	$o .= replace_macros($tpl, array(
-		'$profile'       => $profile,
-		'$connect'       => $connect,
-		'$connect_url'   => $connect_url,
-		'$location'      => $location,
-		'$gender'        => $gender,
-		'$pdesc'         => $pdesc,
-		'$marital'       => $marital,
-		'$homepage'      => $homepage,
-		'$chanmenu'      => $channel_menu,
-		'$contact_block' => $contact_block,
-	));
-
-	$arr = array('profile' => &$profile, 'entry' => &$o);
-
-	call_hooks('profile_sidebar', $arr);
-
-	return $o;
-}
-
-
-// FIXME or remove
-
-
-	function get_birthdays() {
-
-		$a = get_app();
-		$o = '';
-
-		if(! local_user())
-			return $o;
-
-		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-		$bd_short = t('F d');
-
-		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
-				LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
-				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
-				ORDER BY `start` ASC ",
-				intval(local_user()),
-				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-				dbesc(datetime_convert('UTC','UTC','now'))
-		);
-
-		if($r && count($r)) {
-			$total = 0;
-			$now = strtotime('now');
-			$cids = array();
-
-			$istoday = false;
-			foreach($r as $rr) {
-				if(strlen($rr['name']))
-					$total ++;
-				if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
-					$istoday = true;
-			}
-			$classtoday = $istoday ? ' birthday-today ' : '';
-			if($total) {
-				foreach($r as &$rr) {
-					if(! strlen($rr['name']))
-						continue;
-
-					// avoid duplicates
-
-					if(in_array($rr['cid'],$cids))
-						continue;
-					$cids[] = $rr['cid'];
-
-					$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
-					$sparkle = '';
-					$url = $rr['url'];
-					if($rr['network'] === NETWORK_DFRN) {
-						$sparkle = " sparkle";
-						$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
-					}
-	
-					$rr['link'] = $url;
-					$rr['title'] = $rr['name'];
-					$rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '');
-					$rr['startime'] = Null;
-					$rr['today'] = $today;
-	
-				}
-			}
-		}
-		$tpl = get_markup_template("birthdays_reminder.tpl");
-		return replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(),
-			'$classtoday' => $classtoday,
-			'$count' => $total,
-			'$event_reminders' => t('Birthday Reminders'),
-			'$event_title' => t('Birthdays this week:'),
-			'$events' => $r,
-			'$lbr' => '{',  // raw brackets mess up if/endif macro processing
-			'$rbr' => '}'
-
-		));
-	}
-
-
-// FIXME
-
-
-	function get_events() {
-
-		require_once('include/bbcode.php');
-
-		$a = get_app();
-
-		if(! local_user())
-			return $o;
-
-		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-		$bd_short = t('F d');
-
-		$r = q("SELECT `event`.* FROM `event`
-				WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
-				ORDER BY `start` ASC ",
-				intval(local_user()),
-				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
-				dbesc(datetime_convert('UTC','UTC','now - 1 days'))
-		);
-
-		if($r && count($r)) {
-			$now = strtotime('now');
-			$istoday = false;
-			foreach($r as $rr) {
-				if(strlen($rr['name']))
-					$total ++;
-
-				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
-				if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
-					$istoday = true;
-			}
-			$classtoday = (($istoday) ? 'event-today' : '');
-
-
-			foreach($r as &$rr) {
-				if($rr['adjust'])
-					$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m');
-				else
-					$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m');
-				$md .= "/#link-".$rr['id'];
-
-				$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-				if(! $title)
-					$title = t('[No description]');
-
-				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
-				$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
-				
-				$rr['link'] = $md;
-				$rr['title'] = $title;
-				$rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
-				$rr['startime'] = $strt;
-				$rr['today'] = $today;
-			}
-		}
-
-		$tpl = get_markup_template("events_reminder.tpl");
-		return replace_macros($tpl, array(
-			'$baseurl' => $a->get_baseurl(),
-			'$classtoday' => $classtoday,
-			'$count' => count($r),
-			'$event_reminders' => t('Event Reminders'),
-			'$event_title' => t('Events this week:'),
-			'$events' => $r,
-		));
-	}
-
-
 
 /**
  *
@@ -2126,27 +1690,6 @@ function current_theme_url($installing = false) {
 	return('view/theme/' . $t . '/css/style.css');
 }
 
-
-function z_birthday($dob,$tz,$format="Y-m-d H:i:s") {
-
-	if(! strlen($tz))
-		$tz = 'UTC';
-
-	$tmp_dob = substr($dob,5);
-	if(intval($tmp_dob)) {
-		$y = datetime_convert($tz,$tz,'now','Y');
-		$bd = $y . '-' . $tmp_dob . ' 00:00';
-		$t_dob = strtotime($bd);
-		$now = strtotime(datetime_convert($tz,$tz,'now'));
-		if($t_dob < $now)
-			$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
-		$birthday = datetime_convert($tz,'UTC',$bd,$format);
-	}
-
-	return $birthday;
-
-}
-
 function is_site_admin() {
 	$a = get_app();
 	if((intval($_SESSION['authenticated'])) 
@@ -2185,173 +1728,6 @@ function load_contact_links($uid) {
 }
 
 
-
-function profile_tabs($a, $is_owner=False, $nickname=Null){
-	//echo "<pre>"; var_dump($a->user); killme();
-	
-	$channel = $a->get_channel();
-
-	if (is_null($nickname))
-		$nickname  = $channel['channel_address'];
-		
-	if(x($_GET,'tab'))
-		$tab = notags(trim($_GET['tab']));
-	
-	$url = $a->get_baseurl() . '/channel/' . $nickname;
-	$pr  = $a->get_baseurl() . '/profile/' . $nickname;
-
-	$tabs = array(
-		array(
-			'label' => t('Channel'),
-			'url'   => $url,
-			'sel'   => ((argv(0) == 'channel') ? 'active' : ''),
-			'title' => t('Status Messages and Posts'),
-			'id'    => 'status-tab',
-		),
-		array(
-			'label' => t('About'),
-			'url' 	=> $pr,
-			'sel'	=> ((argv(0) == 'profile') ? 'active' : ''),
-			'title' => t('Profile Details'),
-			'id'    => 'profile-tab',
-		),
-		array(
-			'label' => t('Photos'),
-			'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
-			'sel'	=> ((argv(0) == 'photos') ? 'active' : ''),
-			'title' => t('Photo Albums'),
-			'id'    => 'photo-tab',
-		),
-	);
-
-
-	if ($is_owner){
-		$tabs[] = array(
-			'label' => t('Events'),
-			'url'	=> $a->get_baseurl() . '/events',
-			'sel' 	=> ((argv(0) == 'events') ? 'active' : ''),
-			'title' => t('Events and Calendar'),
-			'id'    => 'events-tab',
-		);
-		if(feature_enabled(local_user(),'webpages')){
-		$tabs[] = array(
-			'label' => t('Webpages'),
-			'url'	=> $a->get_baseurl() . '/webpages/' . $nickname,
-			'sel' 	=> ((argv(0) == 'webpages') ? 'active' : ''),
-			'title' => t('Manage Webpages'),
-			'id'    => 'webpages-tab',
-		);}
-	}
-	else {
-		// FIXME
-		// we probably need a listing of events that were created by 
-		// this channel and are visible to the observer
-
-
-	}
-
-
-	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
-	call_hooks('profile_tabs', $arr);
-	
-	$tpl = get_markup_template('common_tabs.tpl');
-
-	return replace_macros($tpl,array('$tabs' => $arr['tabs']));
-}
-
-
-function get_my_url() {
-	if(x($_SESSION,'zrl_override'))
-		return $_SESSION['zrl_override'];
-	if(x($_SESSION,'my_url'))
-		return $_SESSION['my_url'];
-	return false;
-}
-
-function get_my_address() {
-	if(x($_SESSION,'zid_override'))
-		return $_SESSION['zid_override'];
-	if(x($_SESSION,'my_address'))
-		return $_SESSION['my_address'];
-	return false;
-}
-
-/**
- * @function zid_init(&$a)
- *   If somebody arrives at our site using a zid, add their xchan to our DB if we don't have it already.
- *   And if they aren't already authenticated here, attempt reverse magic auth.
- *
- * @hooks 'zid_init'
- *      string 'zid' - their zid
- *      string 'url' - the destination url
- *
- */
-
-function zid_init(&$a) {
-	$tmp_str = get_my_address();
-	if(validate_email($tmp_str)) {
-		proc_run('php','include/gprobe.php',bin2hex($tmp_str));
-		$arr = array('zid' => $tmp_str, 'url' => $a->cmd);
-		call_hooks('zid_init',$arr);
-		if((! local_user()) && (! remote_user())) {
-			logger('zid_init: not authenticated. Invoking reverse magic-auth for ' . $tmp_str);
-			$r = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_id desc limit 1",
-				dbesc($tmp_str)
-			);
-			// try to avoid recursion - but send them home to do a proper magic auth
-			$dest = '/' . $a->query_string;
-			$dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest);
-			if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) {
-				goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest);
-			}
-			else
-				logger('zid_init: no hubloc found.');
-		}
-	}
-}
-
-/**
- * @function zid($s,$address = '')
- *   Adds a zid parameter to a url
- * @param string $s
- *   The url to accept the zid
- * @param boolean $address
- *   $address to use instead of session environment
- * @return string
- *
- * @hooks 'zid'
- *      string url - url to accept zid
- *      string zid - urlencoded zid
- *      string result - the return string we calculated, change it if you want to return something else
- */
-
-
-function zid($s,$address = '') {
-	if(! strlen($s) || strpos($s,'zid='))
-		return $s;
-	$has_params = ((strpos($s,'?')) ? true : false);
-	$num_slashes = substr_count($s,'/');
-	if(! $has_params)
-		$has_params = ((strpos($s,'&')) ? true : false);
-	$achar = strpos($s,'?') ? '&' : '?';
-
-	$mine = get_my_url();
-	$myaddr = (($address) ? $address : get_my_address());
-
-	// FIXME checking against our own channel url is no longer reliable. We may have a lot
-	// of urls attached to out channel. Should probably match against our site, since we
-	// will not need to remote authenticate on our own site anyway.
-
-	if($mine && $myaddr && (! link_compare($mine,$s)))
-		$zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
-	else
-		$zurl = $s;
-
-	$arr = array('url' => $s, 'zid' => urlencode($myaddr), 'result' => $zurl);
-	call_hooks('zid', $arr);
-	return $arr['result'];
-}
-
 /**
  * returns querystring as string from a mapped array
  *
@@ -2563,19 +1939,3 @@ function head_get_icon() {
 	return $icon;
 }
 
-// Used from within PCSS themes to set theme parameters. If there's a
-// puid request variable, that is the "page owner" and normally their theme
-// settings take precedence; unless a local user sets the "always_my_theme" 
-// system pconfig, which means they don't want to see anybody else's theme 
-// settings except their own while on this site.
-
-function get_theme_uid() {
-	$uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
-	if(local_user()) {
-		if((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))
-			return local_user();
-		if(! $uid)
-			return local_user();
-	}
-	return $uid;
-}
diff --git a/include/datetime.php b/include/datetime.php
index 94c2e4f1c..c0503fc7d 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -443,3 +443,24 @@ function cal($y = 0,$m = 0, $links = false, $class='') {
 }
 
 
+
+
+function z_birthday($dob,$tz,$format="Y-m-d H:i:s") {
+
+	if(! strlen($tz))
+		$tz = 'UTC';
+
+	$tmp_dob = substr($dob,5);
+	if(intval($tmp_dob)) {
+		$y = datetime_convert($tz,$tz,'now','Y');
+		$bd = $y . '-' . $tmp_dob . ' 00:00';
+		$t_dob = strtotime($bd);
+		$now = strtotime(datetime_convert($tz,$tz,'now'));
+		if($t_dob < $now)
+			$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+		$birthday = datetime_convert($tz,'UTC',$bd,$format);
+	}
+
+	return $birthday;
+
+}
diff --git a/include/identity.php b/include/identity.php
index e26d2b29f..23fc85830 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -395,3 +395,750 @@ function identity_basic_import($arr, $seize_primary = false) {
 
 
 }
+
+
+
+/**
+ *
+ * Function : profile_load
+ * @parameter App    $a
+ * @parameter string $nickname
+ * @parameter string $profile
+ *
+ * Summary: Loads a profile into the page sidebar.
+ * The function requires a writeable copy of the main App structure, and the nickname
+ * of a registered local account.
+ *
+ * If the viewer is an authenticated remote viewer, the profile displayed is the
+ * one that has been configured for his/her viewing in the Contact manager.
+ * Passing a non-zero profile ID can also allow a preview of a selected profile
+ * by the owner.
+ *
+ * Profile information is placed in the App structure for later retrieval.
+ * Honours the owner's chosen theme for display.
+ *
+ */
+
+
+function profile_load(&$a, $nickname, $profile = '') {
+
+	logger('profile_load: ' . $nickname . (($profile) ? ' profile: ' . $profile : ''));
+
+	$user = q("select channel_id from channel where channel_address = '%s' limit 1",
+		dbesc($nickname)
+	);
+		
+	if(! $user) {
+		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+		notice( t('Requested channel is not available.') . EOL );
+		$a->error = 404;
+		return;
+	}
+
+	// get the current observer
+	$observer = $a->get_observer();
+
+	// Can the observer see our profile?
+	require_once('include/permissions.php');
+	if(! perm_is_allowed($user[0]['channel_id'],$observer['xchan_hash'],'view_profile')) {
+		// permission denied
+		notice( t(' Sorry, you don\'t have the permission to view this profile. ') . EOL);
+		return;
+	}
+
+	if(! $profile) {
+		$r = q("SELECT abook_profile FROM abook WHERE abook_xchan = '%s' and abook_channel = '%d' limit 1",
+			dbesc($observer['xchan_hash']),
+			intval($user[0]['channel_id'])
+		);
+		if($r)
+			$profile = $r[0]['abook_profile'];
+	}
+	$r = null;
+
+	if($profile) {
+		$r = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
+				LEFT JOIN channel ON profile.uid = channel.channel_id
+				WHERE channel.channel_address = '%s' AND profile.profile_guid = '%s' LIMIT 1",
+				dbesc($nickname),
+				dbesc($profile)
+		);
+	}
+
+	if(! $r) {
+		$r = q("SELECT profile.uid AS profile_uid, profile.*, channel.* FROM profile
+			LEFT JOIN channel ON profile.uid = channel.channel_id
+			WHERE channel.channel_address = '%s' and not ( channel_pageflags & %d ) 
+			AND profile.is_default = 1 LIMIT 1",
+			dbesc($nickname),
+			intval(PAGE_REMOVED)
+		);
+	}
+
+	if(! $r) {
+		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+		notice( t('Requested profile is not available.') . EOL );
+		$a->error = 404;
+		return;
+	}
+	
+	// fetch user tags if this isn't the default profile
+
+	if(! $r[0]['is_default']) {
+		$x = q("select `keywords` from `profile` where uid = %d and `is_default` = 1 limit 1",
+				intval($profile_uid)
+		);
+		if($x)
+			$r[0]['keywords'] = $x[0]['keywords'];
+	}
+
+	if($r[0]['keywords']) {
+		$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$r[0]['keywords']);
+		if(strlen($keywords))
+			$a->page['htmlhead'] .= '<meta name="keywords" content="' . htmlentities($keywords,ENT_COMPAT,'UTF-8') . '" />' . "\r\n" ;
+
+	}
+
+	$a->profile = $r[0];
+	$a->profile_uid = $r[0]['profile_uid'];
+
+	$a->page['title'] = $a->profile['channel_name'] . " - " . $a->profile['channel_address'] . "@" . $a->get_hostname();
+
+	$a->profile['channel_mobile_theme'] = get_pconfig(local_user(),'system', 'mobile_theme');
+	$_SESSION['theme'] = $a->profile['channel_theme'];
+	$_SESSION['mobile_theme'] = $a->profile['channel_mobile_theme'];
+
+	/**
+	 * load/reload current theme info
+	 */
+
+	$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
+
+	$theme_info_file = "view/theme/".current_theme()."/php/theme.php";
+	if (file_exists($theme_info_file)){
+		require_once($theme_info_file);
+	}
+
+	return;
+}
+
+function profile_create_sidebar(&$a,$connect = true) {
+
+	$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+
+	$a->set_widget('profile',profile_sidebar($a->profile, $block, $connect));
+	return;
+}
+
+
+/**
+ *
+ * Function: profile_sidebar
+ *
+ * Formats a profile for display in the sidebar.
+ * It is very difficult to templatise the HTML completely
+ * because of all the conditional logic.
+ *
+ * @parameter: array $profile
+ *
+ * Returns HTML string stuitable for sidebar inclusion
+ * Exceptions: Returns empty string if passed $profile is wrong type or not populated
+ *
+ */
+
+
+
+function profile_sidebar($profile, $block = 0, $show_connect = true) {
+
+	$a = get_app();
+
+	$observer = $a->get_observer();
+
+	$o = '';
+	$location = false;
+	$address = false;
+	$pdesc = true;
+
+	if((! is_array($profile)) && (! count($profile)))
+		return $o;
+
+
+	head_set_icon($profile['thumb']);
+
+	$is_owner = (($profile['uid'] == local_user()) ? true : false);
+
+	$profile['picdate'] = urlencode($profile['picdate']);
+
+	call_hooks('profile_sidebar_enter', $profile);
+
+	require_once('include/Contact.php');
+
+	if($show_connect) {
+
+		// This will return an empty string if we're already connected.
+
+		$connect_url = rconnect_url($profile['uid'],get_observer_hash());
+		$connect = (($connect_url) ? t('Connect') : '');
+		if($connect_url) 
+			$connect_url = sprintf($connect_url,urlencode($profile['channel_address'] . '@' . $a->get_hostname()));
+
+		// premium channel - over-ride
+
+		if($profile['channel_pageflags'] & PAGE_PREMIUM)
+			$connect_url = z_root() . '/connect/' . $profile['channel_address'];
+	}
+
+	// show edit profile to yourself
+	if($is_owner) {
+
+		$profile['menu'] = array(
+			'chg_photo' => t('Change profile photo'),
+			'entries' => array(),
+		);
+
+
+		if(feature_enabled(local_user(),'multi_profiles')) {
+			$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
+			$profile['menu']['cr_new'] = t('Create New Profile');
+		}
+		else
+			$profile['edit'] = array($a->get_baseurl() . '/profiles/' . $profile['id'], t('Edit Profile'),'',t('Edit Profile'));
+						
+		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+				local_user());
+		
+
+		if($r) {
+			foreach($r as $rr) {
+				$profile['menu']['entries'][] = array(
+					'photo'                => $rr['thumb'],
+					'id'                   => $rr['id'],
+					'alt'                  => t('Profile Image'),
+					'profile_name'         => $rr['profile_name'],
+					'isdefault'            => $rr['is_default'],
+					'visible_to_everybody' => t('visible to everybody'),
+					'edit_visibility'      => t('Edit visibility'),
+				);
+			}
+		}
+	}
+
+	if((x($profile,'address') == 1)
+		|| (x($profile,'locality') == 1)
+		|| (x($profile,'region') == 1)
+		|| (x($profile,'postal_code') == 1)
+		|| (x($profile,'country_name') == 1))
+		$location = t('Location:');
+
+	$gender   = ((x($profile,'gender')   == 1) ? t('Gender:')   : False);
+	$marital  = ((x($profile,'marital')  == 1) ? t('Status:')   : False);
+	$homepage = ((x($profile,'homepage') == 1) ? t('Homepage:') : False);
+
+	if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+		$location = $pdesc = $gender = $marital = $homepage = False;
+	}
+
+	$firstname = ((strpos($profile['name'],' '))
+		? trim(substr($profile['name'],0,strpos($profile['name'],' '))) : $profile['name']);
+	$lastname = (($firstname === $profile['name']) ? '' : trim(substr($profile['name'],strlen($firstname))));
+
+	if(is_array($observer) 
+		&& perm_is_allowed($profile['uid'],$observer['xchan_hash'],'view_contacts')) {
+		$contact_block = contact_block();
+	}
+
+	$channel_menu = false;
+	$menu = get_pconfig($profile['uid'],'system','channel_menu');
+	if($menu) {
+		require_once('include/menu.php');
+		$m = menu_fetch($menu,$profile['uid'],$observer['xchan_hash']);
+		if($m)
+			$channel_menu = menu_render($m);
+	}
+	$menublock = get_pconfig($profile['uid'],'system','channel_menublock');
+	if ($menublock) {
+		require_once('include/comanche.php');
+		$channel_menu .= comanche_block($menublock);
+	}
+
+	$tpl = get_markup_template('profile_vcard.tpl');
+
+	$o .= replace_macros($tpl, array(
+		'$profile'       => $profile,
+		'$connect'       => $connect,
+		'$connect_url'   => $connect_url,
+		'$location'      => $location,
+		'$gender'        => $gender,
+		'$pdesc'         => $pdesc,
+		'$marital'       => $marital,
+		'$homepage'      => $homepage,
+		'$chanmenu'      => $channel_menu,
+		'$contact_block' => $contact_block,
+	));
+
+	$arr = array('profile' => &$profile, 'entry' => &$o);
+
+	call_hooks('profile_sidebar', $arr);
+
+	return $o;
+}
+
+
+// FIXME or remove
+
+
+	function get_birthdays() {
+
+		$a = get_app();
+		$o = '';
+
+		if(! local_user())
+			return $o;
+
+		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
+		$bd_short = t('F d');
+
+		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
+				LEFT JOIN `contact` ON `contact`.`id` = `event`.`cid`
+				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
+				ORDER BY `start` ASC ",
+				intval(local_user()),
+				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+				dbesc(datetime_convert('UTC','UTC','now'))
+		);
+
+		if($r && count($r)) {
+			$total = 0;
+			$now = strtotime('now');
+			$cids = array();
+
+			$istoday = false;
+			foreach($r as $rr) {
+				if(strlen($rr['name']))
+					$total ++;
+				if((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now))
+					$istoday = true;
+			}
+			$classtoday = $istoday ? ' birthday-today ' : '';
+			if($total) {
+				foreach($r as &$rr) {
+					if(! strlen($rr['name']))
+						continue;
+
+					// avoid duplicates
+
+					if(in_array($rr['cid'],$cids))
+						continue;
+					$cids[] = $rr['cid'];
+
+					$today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false);
+					$sparkle = '';
+					$url = $rr['url'];
+					if($rr['network'] === NETWORK_DFRN) {
+						$sparkle = " sparkle";
+						$url = $a->get_baseurl() . '/redir/'  . $rr['cid'];
+					}
+	
+					$rr['link'] = $url;
+					$rr['title'] = $rr['name'];
+					$rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '');
+					$rr['startime'] = Null;
+					$rr['today'] = $today;
+	
+				}
+			}
+		}
+		$tpl = get_markup_template("birthdays_reminder.tpl");
+		return replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$classtoday' => $classtoday,
+			'$count' => $total,
+			'$event_reminders' => t('Birthday Reminders'),
+			'$event_title' => t('Birthdays this week:'),
+			'$events' => $r,
+			'$lbr' => '{',  // raw brackets mess up if/endif macro processing
+			'$rbr' => '}'
+
+		));
+	}
+
+
+// FIXME
+
+
+	function get_events() {
+
+		require_once('include/bbcode.php');
+
+		$a = get_app();
+
+		if(! local_user())
+			return $o;
+
+		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
+		$bd_short = t('F d');
+
+		$r = q("SELECT `event`.* FROM `event`
+				WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
+				ORDER BY `start` ASC ",
+				intval(local_user()),
+				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+				dbesc(datetime_convert('UTC','UTC','now - 1 days'))
+		);
+
+		if($r && count($r)) {
+			$now = strtotime('now');
+			$istoday = false;
+			foreach($r as $rr) {
+				if(strlen($rr['name']))
+					$total ++;
+
+				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start'],'Y-m-d');
+				if($strt === datetime_convert('UTC',$a->timezone,'now','Y-m-d'))
+					$istoday = true;
+			}
+			$classtoday = (($istoday) ? 'event-today' : '');
+
+
+			foreach($r as &$rr) {
+				if($rr['adjust'])
+					$md = datetime_convert('UTC',$a->timezone,$rr['start'],'Y/m');
+				else
+					$md = datetime_convert('UTC','UTC',$rr['start'],'Y/m');
+				$md .= "/#link-".$rr['id'];
+
+				$title = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
+				if(! $title)
+					$title = t('[No description]');
+
+				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+				$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
+				
+				$rr['link'] = $md;
+				$rr['title'] = $title;
+				$rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
+				$rr['startime'] = $strt;
+				$rr['today'] = $today;
+			}
+		}
+
+		$tpl = get_markup_template("events_reminder.tpl");
+		return replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(),
+			'$classtoday' => $classtoday,
+			'$count' => count($r),
+			'$event_reminders' => t('Event Reminders'),
+			'$event_title' => t('Events this week:'),
+			'$events' => $r,
+		));
+	}
+
+
+function advanced_profile(&$a) {
+
+	$o = '';
+
+	$o .= '<h2>' . t('Profile') . '</h2>';
+
+	if($a->profile['name']) {
+
+		$tpl = get_markup_template('profile_advanced.tpl');
+		
+		$profile = array();
+		
+		$profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
+		
+		if($a->profile['gender']) $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
+		
+
+		if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
+		
+			$year_bd_format = t('j F, Y');
+			$short_bd_format = t('j F');
+
+		
+			$val = ((intval($a->profile['dob'])) 
+				? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
+				: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
+
+			$profile['birthday'] = array( t('Birthday:'), $val);
+
+		}
+
+		if($age = age($a->profile['dob'],$a->profile['timezone'],''))  $profile['age'] = array( t('Age:'), $age );
+			
+
+		if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
+
+
+		if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
+
+		if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
+				$profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
+		}
+
+		if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
+
+		if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
+
+		if($a->profile['hometown']) $profile['hometown'] = array( t('Hometown:'), linkify($a->profile['hometown']) );
+
+		if($a->profile['keywords']) $profile['keywords'] = array( t('Tags:'), $a->profile['keywords']);
+
+		if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
+
+		if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
+
+		if($txt = prepare_text($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
+
+		if($txt = prepare_text($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
+
+		if($txt = prepare_text($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
+
+		if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
+
+
+		if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
+
+		if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
+		
+		if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
+
+		if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
+
+		if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
+
+		if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
+		
+		if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
+
+		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
+
+		$r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_page = '%s' and uid = %d and obj_type = %d 
+			order by obj_verb, term",
+				dbesc($a->profile['profile_guid']),
+				intval($a->profile['profile_uid']),
+				intval(TERM_OBJ_THING)
+		);
+
+		$things = null;
+
+		if($r) {
+			$things = array();
+
+			// Use the system obj_verbs array as a sort key, since we don't really
+			// want an alphabetic sort. To change the order, use a plugin to
+			// alter the obj_verbs() array or alter it in code. Unknown verbs come
+			// after the known ones - in no particular order. 
+
+			$v = obj_verbs();
+			foreach($v as $k => $foo)
+				$things[$k] = null;
+			foreach($r as $rr) {
+				if(! $things[$rr['obj_verb']])
+					$things[$rr['obj_verb']] = array();
+				$things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl']);
+			} 
+			$sorted_things = array();
+			if($things)
+				foreach($things as $k => $v)
+					if(is_array($things[$k]))
+						$sorted_things[$k] = $v;
+		}
+
+		logger('mod_profile: things: ' . print_r($sorted_things,true), LOGGER_DATA); 
+
+        return replace_macros($tpl, array(
+            '$title' => t('Profile'),
+            '$profile' => $profile,
+			'$things' => $sorted_things
+        ));
+    }
+
+	return '';
+}
+
+
+
+function profile_tabs($a, $is_owner=False, $nickname=Null){
+	//echo "<pre>"; var_dump($a->user); killme();
+	
+	$channel = $a->get_channel();
+
+	if (is_null($nickname))
+		$nickname  = $channel['channel_address'];
+		
+	if(x($_GET,'tab'))
+		$tab = notags(trim($_GET['tab']));
+	
+	$url = $a->get_baseurl() . '/channel/' . $nickname;
+	$pr  = $a->get_baseurl() . '/profile/' . $nickname;
+
+	$tabs = array(
+		array(
+			'label' => t('Channel'),
+			'url'   => $url,
+			'sel'   => ((argv(0) == 'channel') ? 'active' : ''),
+			'title' => t('Status Messages and Posts'),
+			'id'    => 'status-tab',
+		),
+		array(
+			'label' => t('About'),
+			'url' 	=> $pr,
+			'sel'	=> ((argv(0) == 'profile') ? 'active' : ''),
+			'title' => t('Profile Details'),
+			'id'    => 'profile-tab',
+		),
+		array(
+			'label' => t('Photos'),
+			'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
+			'sel'	=> ((argv(0) == 'photos') ? 'active' : ''),
+			'title' => t('Photo Albums'),
+			'id'    => 'photo-tab',
+		),
+	);
+
+
+	if ($is_owner){
+		$tabs[] = array(
+			'label' => t('Events'),
+			'url'	=> $a->get_baseurl() . '/events',
+			'sel' 	=> ((argv(0) == 'events') ? 'active' : ''),
+			'title' => t('Events and Calendar'),
+			'id'    => 'events-tab',
+		);
+		if(feature_enabled(local_user(),'webpages')){
+		$tabs[] = array(
+			'label' => t('Webpages'),
+			'url'	=> $a->get_baseurl() . '/webpages/' . $nickname,
+			'sel' 	=> ((argv(0) == 'webpages') ? 'active' : ''),
+			'title' => t('Manage Webpages'),
+			'id'    => 'webpages-tab',
+		);}
+	}
+	else {
+		// FIXME
+		// we probably need a listing of events that were created by 
+		// this channel and are visible to the observer
+
+
+	}
+
+
+	$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
+	call_hooks('profile_tabs', $arr);
+	
+	$tpl = get_markup_template('common_tabs.tpl');
+
+	return replace_macros($tpl,array('$tabs' => $arr['tabs']));
+}
+
+
+function get_my_url() {
+	if(x($_SESSION,'zrl_override'))
+		return $_SESSION['zrl_override'];
+	if(x($_SESSION,'my_url'))
+		return $_SESSION['my_url'];
+	return false;
+}
+
+function get_my_address() {
+	if(x($_SESSION,'zid_override'))
+		return $_SESSION['zid_override'];
+	if(x($_SESSION,'my_address'))
+		return $_SESSION['my_address'];
+	return false;
+}
+
+/**
+ * @function zid_init(&$a)
+ *   If somebody arrives at our site using a zid, add their xchan to our DB if we don't have it already.
+ *   And if they aren't already authenticated here, attempt reverse magic auth.
+ *
+ * @hooks 'zid_init'
+ *      string 'zid' - their zid
+ *      string 'url' - the destination url
+ *
+ */
+
+function zid_init(&$a) {
+	$tmp_str = get_my_address();
+	if(validate_email($tmp_str)) {
+		proc_run('php','include/gprobe.php',bin2hex($tmp_str));
+		$arr = array('zid' => $tmp_str, 'url' => $a->cmd);
+		call_hooks('zid_init',$arr);
+		if((! local_user()) && (! remote_user())) {
+			logger('zid_init: not authenticated. Invoking reverse magic-auth for ' . $tmp_str);
+			$r = q("select * from hubloc where hubloc_addr = '%s' order by hubloc_id desc limit 1",
+				dbesc($tmp_str)
+			);
+			// try to avoid recursion - but send them home to do a proper magic auth
+			$dest = '/' . $a->query_string;
+			$dest = str_replace(array('?zid=','&zid='),array('?rzid=','&rzid='),$dest);
+			if($r && ($r[0]['hubloc_url'] != z_root()) && (! strstr($dest,'/magic')) && (! strstr($dest,'/rmagic'))) {
+				goaway($r[0]['hubloc_url'] . '/magic' . '?f=&rev=1&dest=' . z_root() . $dest);
+			}
+			else
+				logger('zid_init: no hubloc found.');
+		}
+	}
+}
+
+/**
+ * @function zid($s,$address = '')
+ *   Adds a zid parameter to a url
+ * @param string $s
+ *   The url to accept the zid
+ * @param boolean $address
+ *   $address to use instead of session environment
+ * @return string
+ *
+ * @hooks 'zid'
+ *      string url - url to accept zid
+ *      string zid - urlencoded zid
+ *      string result - the return string we calculated, change it if you want to return something else
+ */
+
+
+function zid($s,$address = '') {
+	if(! strlen($s) || strpos($s,'zid='))
+		return $s;
+	$has_params = ((strpos($s,'?')) ? true : false);
+	$num_slashes = substr_count($s,'/');
+	if(! $has_params)
+		$has_params = ((strpos($s,'&')) ? true : false);
+	$achar = strpos($s,'?') ? '&' : '?';
+
+	$mine = get_my_url();
+	$myaddr = (($address) ? $address : get_my_address());
+
+	// FIXME checking against our own channel url is no longer reliable. We may have a lot
+	// of urls attached to out channel. Should probably match against our site, since we
+	// will not need to remote authenticate on our own site anyway.
+
+	if($mine && $myaddr && (! link_compare($mine,$s)))
+		$zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr);
+	else
+		$zurl = $s;
+
+	$arr = array('url' => $s, 'zid' => urlencode($myaddr), 'result' => $zurl);
+	call_hooks('zid', $arr);
+	return $arr['result'];
+}
+
+// Used from within PCSS themes to set theme parameters. If there's a
+// puid request variable, that is the "page owner" and normally their theme
+// settings take precedence; unless a local user sets the "always_my_theme" 
+// system pconfig, which means they don't want to see anybody else's theme 
+// settings except their own while on this site.
+
+function get_theme_uid() {
+	$uid = (($_REQUEST['puid']) ? intval($_REQUEST['puid']) : 0);
+	if(local_user()) {
+		if((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))
+			return local_user();
+		if(! $uid)
+			return local_user();
+	}
+	return $uid;
+}
diff --git a/include/profile_advanced.php b/include/profile_advanced.php
deleted file mode 100644
index 21606185d..000000000
--- a/include/profile_advanced.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php /** @file */
-
-function advanced_profile(&$a) {
-
-	$o = '';
-
-	$o .= '<h2>' . t('Profile') . '</h2>';
-
-	if($a->profile['name']) {
-
-		$tpl = get_markup_template('profile_advanced.tpl');
-		
-		$profile = array();
-		
-		$profile['fullname'] = array( t('Full Name:'), $a->profile['name'] ) ;
-		
-		if($a->profile['gender']) $profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
-		
-
-		if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-		
-			$year_bd_format = t('j F, Y');
-			$short_bd_format = t('j F');
-
-		
-			$val = ((intval($a->profile['dob'])) 
-				? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00',$year_bd_format))
-				: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],5) . ' 00:00 +00:00',$short_bd_format)));
-
-			$profile['birthday'] = array( t('Birthday:'), $val);
-
-		}
-
-		if($age = age($a->profile['dob'],$a->profile['timezone'],''))  $profile['age'] = array( t('Age:'), $age );
-			
-
-		if($a->profile['marital']) $profile['marital'] = array( t('Status:'), $a->profile['marital']);
-
-
-		if($a->profile['with']) $profile['marital']['with'] = $a->profile['with'];
-
-		if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') {
-				$profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s'));
-		}
-
-		if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] );
-
-		if($a->profile['homepage']) $profile['homepage'] = array( t('Homepage:'), linkify($a->profile['homepage']) );
-
-		if($a->profile['hometown']) $profile['hometown'] = array( t('Hometown:'), linkify($a->profile['hometown']) );
-
-		if($a->profile['keywords']) $profile['keywords'] = array( t('Tags:'), $a->profile['keywords']);
-
-		if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
-
-		if($a->profile['religion']) $profile['religion'] = array( t('Religion:'), $a->profile['religion']);
-
-		if($txt = prepare_text($a->profile['about'])) $profile['about'] = array( t('About:'), $txt );
-
-		if($txt = prepare_text($a->profile['interest'])) $profile['interest'] = array( t('Hobbies/Interests:'), $txt);
-
-		if($txt = prepare_text($a->profile['likes'])) $profile['likes'] = array( t('Likes:'), $txt);
-
-		if($txt = prepare_text($a->profile['dislikes'])) $profile['dislikes'] = array( t('Dislikes:'), $txt);
-
-
-		if($txt = prepare_text($a->profile['contact'])) $profile['contact'] = array( t('Contact information and Social Networks:'), $txt);
-
-		if($txt = prepare_text($a->profile['music'])) $profile['music'] = array( t('Musical interests:'), $txt);
-		
-		if($txt = prepare_text($a->profile['book'])) $profile['book'] = array( t('Books, literature:'), $txt);
-
-		if($txt = prepare_text($a->profile['tv'])) $profile['tv'] = array( t('Television:'), $txt);
-
-		if($txt = prepare_text($a->profile['film'])) $profile['film'] = array( t('Film/dance/culture/entertainment:'), $txt);
-
-		if($txt = prepare_text($a->profile['romance'])) $profile['romance'] = array( t('Love/Romance:'), $txt);
-		
-		if($txt = prepare_text($a->profile['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
-
-		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-
-		$r = q("select * from obj left join term on obj_obj = term_hash where term_hash != '' and obj_page = '%s' and uid = %d and obj_type = %d 
-			order by obj_verb, term",
-				dbesc($a->profile['profile_guid']),
-				intval($a->profile['profile_uid']),
-				intval(TERM_OBJ_THING)
-		);
-
-		$things = null;
-
-		if($r) {
-			$things = array();
-
-			// Use the system obj_verbs array as a sort key, since we don't really
-			// want an alphabetic sort. To change the order, use a plugin to
-			// alter the obj_verbs() array or alter it in code. Unknown verbs come
-			// after the known ones - in no particular order. 
-
-			$v = obj_verbs();
-			foreach($v as $k => $foo)
-				$things[$k] = null;
-			foreach($r as $rr) {
-				if(! $things[$rr['obj_verb']])
-					$things[$rr['obj_verb']] = array();
-				$things[$rr['obj_verb']][] = array('term' => $rr['term'],'url' => $rr['url'],'img' => $rr['imgurl']);
-			} 
-			$sorted_things = array();
-			if($things)
-				foreach($things as $k => $v)
-					if(is_array($things[$k]))
-						$sorted_things[$k] = $v;
-		}
-
-		logger('mod_profile: things: ' . print_r($sorted_things,true), LOGGER_DATA); 
-
-        return replace_macros($tpl, array(
-            '$title' => t('Profile'),
-            '$profile' => $profile,
-			'$things' => $sorted_things
-        ));
-    }
-
-	return '';
-}
diff --git a/mod/profile.php b/mod/profile.php
index d59602ba0..cd5c3eeef 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -116,7 +116,6 @@ function profile_content(&$a, $update = 0) {
 	$o .= profile_tabs($a, $is_owner, $a->profile['channel_address']);
 
 
-	require_once('include/profile_advanced.php');
 	$o .= advanced_profile($a);
 	call_hooks('profile_advanced',$o);
 	return $o;