X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fidentity.php;h=25b24f289b6f8b20198364d7690cf01e56d05d16;hb=d649873f804f9ed77e69ef6cd12af4a263233945;hp=7bd2d2cbc8d530a22815081f015a7c1b0bf36234;hpb=89c5989cfb679449fb776df7380e972d0f676d8d;p=friendica.git

diff --git a/include/identity.php b/include/identity.php
index 7bd2d2cbc8..25b24f289b 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -3,17 +3,17 @@
  * @file include/identity.php
  */
 
-require_once('include/forums.php');
+use Friendica\App;
 
+require_once 'include/ForumManager.php';
+require_once 'include/bbcode.php';
+require_once 'mod/proxy.php';
+require_once 'include/cache.php';
 
 /**
  *
- * Function : profile_load
- * @parameter App    $a
- * @parameter string $nickname
- * @parameter int    $profile
+ * @brief Loads a profile into the page sidebar.
  *
- * 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.
  *
@@ -25,105 +25,108 @@ require_once('include/forums.php');
  * Profile information is placed in the App structure for later retrieval.
  * Honours the owner's chosen theme for display.
  *
- * IMPORTANT: Should only be run in the _init() functions of a module. That ensures that
- * the theme is chosen before the _init() function of a theme is run, which will usually
- * load a lot of theme-specific content
+ * @attention Should only be run in the _init() functions of a module. That ensures that
+ *      the theme is chosen before the _init() function of a theme is run, which will usually
+ *      load a lot of theme-specific content
  *
+ * @param App $a
+ * @param string $nickname
+ * @param int $profile
+ * @param array $profiledata
  */
+function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
 
-if(! function_exists('profile_load')) {
-	function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
-
-		$user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
-			dbesc($nickname)
-		);
+	$user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
+		dbesc($nickname)
+	);
 
-		if(!$user && count($user) && !count($profiledata)) {
-			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-			notice( t('Requested account is not available.') . EOL );
-			$a->error = 404;
-			return;
-		}
-
-		$pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile);
+	if (!$user && count($user) && !count($profiledata)) {
+		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+		notice( t('Requested account is not available.') . EOL );
+		$a->error = 404;
+		return;
+	}
 
-		if(($pdata === false) || (!count($pdata)) && !count($profiledata)) {
-			logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
-			notice( t('Requested profile is not available.') . EOL );
-			$a->error = 404;
-			return;
-		}
+	$pdata = get_profiledata_by_nick($nickname, $user[0]['uid'], $profile);
 
-		// fetch user tags if this isn't the default profile
+	if (($pdata === false) || (!count($pdata)) && !count($profiledata)) {
+		logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
+		notice( t('Requested profile is not available.') . EOL );
+		$a->error = 404;
+		return;
+	}
 
-		if(!$pdata['is-default']) {
-			$x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
-					intval($pdata['profile_uid'])
-			);
-			if($x && count($x))
-				$pdata['pub_keywords'] = $x[0]['pub_keywords'];
-		}
+	// fetch user tags if this isn't the default profile
 
-		$a->profile = $pdata;
-		$a->profile_uid = $pdata['profile_uid'];
+	if (!$pdata['is-default']) {
+		$x = q("SELECT `pub_keywords` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
+				intval($pdata['profile_uid'])
+		);
+		if ($x && count($x))
+			$pdata['pub_keywords'] = $x[0]['pub_keywords'];
+	}
 
-		$a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
-		$a->profile['network'] = NETWORK_DFRN;
+	$a->profile = $pdata;
+	$a->profile_uid = $pdata['profile_uid'];
 
-		$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
+	$a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
+	$a->profile['network'] = NETWORK_DFRN;
 
-//		if (!$profiledata)
-//			$_SESSION['theme'] = $a->profile['theme'];
+	$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
 
-		$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
+		if (!$profiledata  && !get_pconfig(local_user(),'system','always_my_theme'))
+			$_SESSION['theme'] = $a->profile['theme'];
 
-		/**
-		 * load/reload current theme info
-		 */
+	$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
 
-		$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
+	/*
+	 * load/reload current theme info
+	 */
 
-		$theme_info_file = "view/theme/".current_theme()."/theme.php";
-		if (file_exists($theme_info_file)){
-			require_once($theme_info_file);
-		}
+	$a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one
 
-		if(! (x($a->page,'aside')))
-			$a->page['aside'] = '';
+	$theme_info_file = "view/theme/" . current_theme() . "/theme.php";
+	if (file_exists($theme_info_file)) {
+		require_once $theme_info_file;
+	}
 
-		if(local_user() && local_user() == $a->profile['uid'] && $profiledata) {
-			$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
-				'$editprofile' => t('Edit profile'),
-				'$profid' => $a->profile['id']
-			));
-		}
+	if (! (x($a->page,'aside')))
+		$a->page['aside'] = '';
 
-		$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+	if (local_user() && local_user() == $a->profile['uid'] && $profiledata) {
+		$a->page['aside'] .= replace_macros(get_markup_template('profile_edlink.tpl'),array(
+			'$editprofile' => t('Edit profile'),
+			'$profid' => $a->profile['id']
+		));
+	}
 
-		// To-Do:
-		// By now, the contact block isn't shown, when a different profile is given
-		// But: When this profile was on the same server, then we could display the contacts
-		if ($profiledata)
-			$a->page['aside'] .= profile_sidebar($profiledata, true);
-		else
-			$a->page['aside'] .= profile_sidebar($a->profile, $block);
+	$block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
 
+	/**
+	 * @todo
+	 * By now, the contact block isn't shown, when a different profile is given
+	 * But: When this profile was on the same server, then we could display the contacts
+	 */
+	if ($profiledata)
+		$a->page['aside'] .= profile_sidebar($profiledata, true);
+	else
+		$a->page['aside'] .= profile_sidebar($a->profile, $block);
 
-		/*if(! $block)
-		 $a->page['aside'] .= contact_block();*/
+	/*if (! $block)
+	 $a->page['aside'] .= contact_block();*/
 
-		return;
-	}
+	return;
 }
 
 
 /**
  * @brief Get all profil data of a local user
- *	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
- * 
+ *
+ * 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
+ *
  * @param string $nickname
  * @param int $uid
  * @param int $profile
@@ -132,13 +135,13 @@ if(! function_exists('profile_load')) {
  *	Includes all available profile data
  */
 function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
-	if(remote_user() && count($_SESSION['remote'])) {
-			foreach($_SESSION['remote'] as $visitor) {
-				if($visitor['uid'] == $uid) {
+	if (remote_user() && count($_SESSION['remote'])) {
+			foreach ($_SESSION['remote'] as $visitor) {
+				if ($visitor['uid'] == $uid) {
 					$r = q("SELECT `profile-id` FROM `contact` WHERE `id` = %d LIMIT 1",
 						intval($visitor['cid'])
 					);
-					if(count($r))
+					if (dbm::is_result($r))
 						$profile = $r[0]['profile-id'];
 					break;
 				}
@@ -147,19 +150,29 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 
 	$r = null;
 
-	if($profile) {
+	if ($profile) {
 		$profile_int = intval($profile);
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* FROM `profile`
-				INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-				WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d AND `contact`.`self` = 1 LIMIT 1",
+		$r = q("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
+				`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
+				`profile`.`uid` AS `profile_uid`, `profile`.*,
+				`contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
+			FROM `profile`
+			INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
+			INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`nickname` = '%s' AND `profile`.`id` = %d LIMIT 1",
 				dbesc($nickname),
 				intval($profile_int)
 		);
 	}
-	if((!$r) && (!count($r))) {
-		$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.* FROM `profile`
-				INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-				WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 AND `contact`.`self` = 1 LIMIT 1",
+	if (!dbm::is_result($r)) {
+		$r = q("SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` as `contact_photo`,
+				`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
+				`profile`.`uid` AS `profile_uid`, `profile`.*,
+				`contact`.`avatar-date` AS picdate, `contact`.`addr`, `user`.*
+			FROM `profile`
+			INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
+			INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
+			WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` LIMIT 1",
 				dbesc($nickname)
 		);
 	}
@@ -170,246 +183,294 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 
 
 /**
+ * @brief Formats a profile for display in the sidebar.
  *
- * 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
+ * @param array $profile
+ * @param int $block
  *
- * Returns HTML string stuitable for sidebar inclusion
- * Exceptions: Returns empty string if passed $profile is wrong type or not populated
+ * @return HTML string stuitable for sidebar inclusion
  *
+ * @note Returns empty string if passed $profile is wrong type or not populated
+ *
+ * @hooks 'profile_sidebar_enter'
+ *      array $profile - profile data
+ * @hooks 'profile_sidebar'
+ *      array $arr
  */
-if(! function_exists('profile_sidebar')) {
-	function profile_sidebar($profile, $block = 0) {
-		$a = get_app();
+function profile_sidebar($profile, $block = 0) {
+	$a = get_app();
 
-		$o = '';
-		$location = false;
-		$address = false;
-		$pdesc = true;
+	$o = '';
+	$location = false;
+	$address = false;
+	// $pdesc = true;
 
-		if((! is_array($profile)) && (! count($profile)))
-			return $o;
+	// This function can also use contact information in $profile
+	$is_contact = x($profile, 'cid');
 
-		$profile['picdate'] = urlencode($profile['picdate']);
+	if ((! is_array($profile)) && (! count($profile))) {
+		return $o;
+	}
 
-		if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
-			$profile['network_name'] = format_network_name($profile['network'],$profile['url']);
-		} else 
-			$profile['network_name'] = "";
+	$profile['picdate'] = urlencode($profile['picdate']);
 
-		call_hooks('profile_sidebar_enter', $profile);
+	if (($profile['network'] != "") AND ($profile['network'] != NETWORK_DFRN)) {
+		$profile['network_name'] = format_network_name($profile['network'], $profile['url']);
+	} else {
+		$profile['network_name'] = "";
+	}
 
+	call_hooks('profile_sidebar_enter', $profile);
 
-		// don't show connect link to yourself
-		$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
 
-		// don't show connect link to authenticated visitors either
-		if(remote_user() && count($_SESSION['remote'])) {
-			foreach($_SESSION['remote'] as $visitor) {
-				if($visitor['uid'] == $profile['uid']) {
-					$connect = false;
-					break;
-				}
+	// don't show connect link to yourself
+	$connect = (($profile['uid'] != local_user()) ? t('Connect')  : False);
+
+	// don't show connect link to authenticated visitors either
+	if (remote_user() && count($_SESSION['remote'])) {
+		foreach ($_SESSION['remote'] as $visitor) {
+			if ($visitor['uid'] == $profile['uid']) {
+				$connect = false;
+				break;
 			}
 		}
+	}
 
-		// Is the local user already connected to that user?
-		if ($connect AND local_user()) {
-			if (isset($profile["url"]))
-				$profile_url = normalise_link($profile["url"]);
-			else
-				$profile_url = normalise_link($a->get_baseurl()."/profile/".$profile["nickname"]);
-
-			$r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
-				local_user(), $profile_url);
-			if (count($r))
-				$connect = false;
+	// Is the local user already connected to that user?
+	if ($connect AND local_user()) {
+		if (isset($profile["url"])) {
+			$profile_url = normalise_link($profile["url"]);
+		} else {
+			$profile_url = normalise_link(App::get_baseurl()."/profile/".$profile["nickname"]);
 		}
 
-		if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
+		$r = q("SELECT * FROM `contact` WHERE NOT `pending` AND `uid` = %d AND `nurl` = '%s'",
+			local_user(), $profile_url);
+
+		if (dbm::is_result($r))
 			$connect = false;
+	}
 
-		if (isset($profile['remoteconnect']))
-			$remoteconnect = $profile['remoteconnect'];
-
-		if ($connect AND ($profile['network'] == NETWORK_DFRN) AND !isset($remoteconnect))
-			$subscribe_feed = t("Atom feed");
-		else
-			$subscribe_feed = false;
-
-		if(get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))
-			$wallmessage = t('Message');
-		else
-			$wallmessage = false;
-
-		// show edit profile to yourself
-		if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
-			$profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
-			$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
-					local_user());
-
-			$profile['menu'] = array(
-				'chg_photo' => t('Change profile photo'),
-				'cr_new' => t('Create New Profile'),
-				'entries' => array(),
-			);
+	if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
+		$connect = false;
+
+	$remoteconnect = NULL;
+	if (isset($profile['remoteconnect']))
+		$remoteconnect = $profile['remoteconnect'];
+
+	if ($connect AND ($profile['network'] == NETWORK_DFRN) AND !isset($remoteconnect))
+		$subscribe_feed = t("Atom feed");
+	else
+		$subscribe_feed = false;
+
+	if (remote_user() OR (get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()))) {
+		$wallmessage = t('Message');
+		$wallmessage_link = "wallmessage/".$profile["nickname"];
+
+		if (remote_user()) {
+			$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `id` = '%s' AND `rel` = %d",
+				intval($profile['uid']),
+				intval(remote_user()),
+				intval(CONTACT_IS_FRIEND));
+		} else {
+			$r = q("SELECT `url` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s' AND `rel` = %d",
+				intval($profile['uid']),
+				dbesc(normalise_link(get_my_url())),
+				intval(CONTACT_IS_FRIEND));
+		}
+		if ($r) {
+			$remote_url = $r[0]["url"];
+			$message_path = preg_replace("=(.*)/profile/(.*)=ism", "$1/message/new/", $remote_url);
+			$wallmessage_link = $message_path.base64_encode($profile["addr"]);
+		}
+	} else {
+		$wallmessage = false;
+		$wallmessage_link = false;
+	}
 
-			if(count($r)) {
+	// show edit profile to yourself
+	if (!$is_contact && $profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) {
+		$profile['edit'] = array(App::get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles'));
+		$r = q("SELECT * FROM `profile` WHERE `uid` = %d",
+				local_user());
 
-				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'],
-						'visibile_to_everybody' =>  t('visible to everybody'),
-						'edit_visibility' => t('Edit visibility'),
+		$profile['menu'] = array(
+			'chg_photo' => t('Change profile photo'),
+			'cr_new' => t('Create New Profile'),
+			'entries' => array(),
+		);
 
-					);
-				}
+		if (dbm::is_result($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'],
+					'visibile_to_everybody' =>  t('visible to everybody'),
+					'edit_visibility' => t('Edit visibility'),
 
+				);
 			}
+
+
 		}
-		if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
-			$profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
-			$profile['menu'] = array(
-				'chg_photo' => t('Change profile photo'),
-				'cr_new' => null,
-				'entries' => array(),
-			);
-		}
+	}
+	if (!$is_contact && $profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) {
+		$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile'));
+		$profile['menu'] = array(
+			'chg_photo' => t('Change profile photo'),
+			'cr_new' => null,
+			'entries' => array(),
+		);
+	}
 
-		if((x($profile['page-flags']) == 1)
-				|| (x($profile['page-flags']) == 2)
-				|| (x($profile['page-flags']) == 5))
-			$account_type = page_type_translate($profile['page-flags']);
+	// Fetch the account type
+	$account_type = account_type($profile);
 
-		if(! $account_type)
-			$account_type = (x($profile['forum']) || x($profile['prv']) || (x($profile['community'])) ? t('Forum') : "");
+	if ((x($profile,'address') == 1)
+			|| (x($profile,'location') == 1)
+			|| (x($profile,'locality') == 1)
+			|| (x($profile,'region') == 1)
+			|| (x($profile,'postal-code') == 1)
+			|| (x($profile,'country-name') == 1))
+		$location = t('Location:');
 
-		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);
 
-		$gender = ((x($profile,'gender') == 1) ? t('Gender:') : False);
 
+	$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
 
-		$marital = ((x($profile,'marital') == 1) ?  t('Status:') : False);
+	$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
 
-		$homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
+	$about = ((x($profile,'about') == 1) ?  t('About:') : False);
 
-		$about = ((x($profile,'about') == 1) ?  t('About:') : False);
+	$xmpp = ((x($profile,'xmpp') == 1) ?  t('XMPP:') : False);
 
-		if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-			$location = $pdesc = $gender = $marital = $homepage = $about = False;
-		}
+	if (($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
+		$location = $pdesc = $gender = $marital = $homepage = $about = 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))));
+	$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 ($profile['guid'] != "")
 		$diaspora = array(
 			'guid' => $profile['guid'],
-			'podloc' => $a->get_baseurl(),
+			'podloc' => App::get_baseurl(),
 			'searchable' => (($profile['publish'] && $profile['net-publish']) ? 'true' : 'false' ),
 			'nickname' => $profile['nickname'],
 			'fullname' => $profile['name'],
 			'firstname' => $firstname,
 			'lastname' => $lastname,
-			'photo300' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'),
-			'photo100' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'),
-			'photo50' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/50/'  . $profile['uid'] . '.jpg'),
+			'photo300' => $profile['contact_photo'],
+			'photo100' => $profile['contact_thumb'],
+			'photo50' => $profile['contact_micro'],
 		);
-
-		if (!$block){
-			$contact_block = contact_block();
-
-			if(is_array($a->profile) AND !$a->profile['hide-friends']) {
-				$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
-					intval($a->profile['uid']));
-				if(count($r))
-					$updated =  date("c", strtotime($r[0]['updated']));
-
-				$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
-						AND `network` IN ('%s', '%s', '%s', '')",
-					intval($profile['uid']),
-					dbesc(NETWORK_DFRN),
-					dbesc(NETWORK_DIASPORA),
-					dbesc(NETWORK_OSTATUS)
-				);
-				if(count($r))
-					$contacts = intval($r[0]['total']);
-			}
+	else
+		$diaspora = false;
+
+	if (!$block) {
+		$contact_block = contact_block();
+
+		if (is_array($a->profile) AND !$a->profile['hide-friends']) {
+			$r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
+				intval($a->profile['uid']));
+			if (dbm::is_result($r))
+				$updated =  date("c", strtotime($r[0]['updated']));
+
+			$r = q("SELECT COUNT(*) AS `total` FROM `contact`
+				WHERE `uid` = %d
+					AND NOT `self` AND NOT `blocked` AND NOT `pending`
+					AND NOT `hidden` AND NOT `archive`
+					AND `network` IN ('%s', '%s', '%s', '')",
+				intval($profile['uid']),
+				dbesc(NETWORK_DFRN),
+				dbesc(NETWORK_DIASPORA),
+				dbesc(NETWORK_OSTATUS)
+			);
+			if (dbm::is_result($r))
+				$contacts = intval($r[0]['total']);
 		}
+	}
 
-		$p = array();
-		foreach($profile as $k => $v) {
-			$k = str_replace('-','_',$k);
-			$p[$k] = $v;
-		}
-
-		if($a->theme['template_engine'] === 'internal')
-			$location = template_escape($location);
-
-		$tpl = get_markup_template('profile_vcard.tpl');
-		$o .= replace_macros($tpl, array(
-			'$profile' => $p,
-			'$connect'  => $connect,
-			'$remoteconnect'  => $remoteconnect,
-			'$subscribe_feed' => $subscribe_feed,
-			'$wallmessage' => $wallmessage,
-			'$account_type' => $account_type,
-			'$location' => $location,
-			'$gender'   => $gender,
-			'$pdesc'	=> $pdesc,
-			'$marital'  => $marital,
-			'$homepage' => $homepage,
-			'$about' => $about,
-			'$network' =>  t('Network:'),
-			'$contacts' => $contacts,
-			'$updated' => $updated,
-			'$diaspora' => $diaspora,
-			'$contact_block' => $contact_block,
-		));
-
+	$p = array();
+	foreach ($profile as $k => $v) {
+		$k = str_replace('-','_',$k);
+		$p[$k] = $v;
+	}
 
-		$arr = array('profile' => &$profile, 'entry' => &$o);
+	if (isset($p["about"]))
+		$p["about"] = bbcode($p["about"]);
 
-		call_hooks('profile_sidebar', $arr);
+	if (isset($p["address"]))
+		$p["address"] = bbcode($p["address"]);
+	else
+		$p["address"] = bbcode($p["location"]);
 
-		return $o;
+	if (isset($p["photo"])) {
+		$p["photo"] = proxy_url($p["photo"], false, PROXY_SIZE_SMALL);
 	}
+	if ($a->theme['template_engine'] === 'internal')
+		$location = template_escape($location);
+
+	$tpl = get_markup_template('profile_vcard.tpl');
+	$o .= replace_macros($tpl, array(
+		'$profile' => $p,
+		'$xmpp' => $xmpp,
+		'$connect'  => $connect,
+		'$remoteconnect'  => $remoteconnect,
+		'$subscribe_feed' => $subscribe_feed,
+		'$wallmessage' => $wallmessage,
+		'$wallmessage_link' => $wallmessage_link,
+		'$account_type' => $account_type,
+		'$location' => $location,
+		'$gender'   => $gender,
+//			'$pdesc'	=> $pdesc,
+		'$marital'  => $marital,
+		'$homepage' => $homepage,
+		'$about' => $about,
+		'$network' =>  t('Network:'),
+		'$contacts' => $contacts,
+		'$updated' => $updated,
+		'$diaspora' => $diaspora,
+		'$contact_block' => $contact_block,
+	));
+
+	$arr = array('profile' => &$profile, 'entry' => &$o);
+
+	call_hooks('profile_sidebar', $arr);
+
+	return $o;
 }
 
 
-if(! function_exists('get_birthdays')) {
-	function get_birthdays() {
+function get_birthdays() {
 
-		$a = get_app();
-		$o = '';
+	$a = get_app();
+	$o = '';
 
-		if(! local_user() || $a->is_mobile || $a->is_tablet)
-			return $o;
+	if (! local_user() || $a->is_mobile || $a->is_tablet)
+		return $o;
 
 //		$mobile_detect = new Mobile_Detect();
 //		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 
-//		if($is_mobile)
+//		if ($is_mobile)
 //			return $o;
 
-		$bd_format = t('g A l F d') ; // 8 AM Friday January 18
-		$bd_short = t('F d');
+	$bd_format = t('g A l F d') ; // 8 AM Friday January 18
+	$bd_short = t('F d');
 
+	$cachekey = "get_birthdays:".local_user();
+	$r = Cache::get($cachekey);
+	if (is_null($r)) {
 		$r = q("SELECT `event`.*, `event`.`id` AS `eid`, `contact`.* FROM `event`
 				INNER JOIN `contact` ON `contact`.`id` = `event`.`cid`
 				WHERE `event`.`uid` = %d AND `type` = 'birthday' AND `start` < '%s' AND `finish` > '%s'
@@ -418,147 +479,151 @@ if(! function_exists('get_birthdays')) {
 				dbesc(datetime_convert('UTC','UTC','now + 6 days')),
 				dbesc(datetime_convert('UTC','UTC','now'))
 		);
+		if (dbm::is_result($r)) {
+			Cache::set($cachekey, $r, CACHE_HOUR);
+		}
+	}
+	if (dbm::is_result($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;
 
-		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;
+				// 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 = App::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' => '}'
-
-		));
 	}
-}
+	$tpl = get_markup_template("birthdays_reminder.tpl");
+	return replace_macros($tpl, array(
+		'$baseurl' => App::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' => '}'
 
+	));
+}
 
-if(! function_exists('get_events')) {
-	function get_events() {
 
-		require_once('include/bbcode.php');
+function get_events() {
 
-		$a = get_app();
+	require_once 'include/bbcode.php';
 
-		if(! local_user() || $a->is_mobile || $a->is_tablet)
-			return $o;
+	$a = get_app();
 
+	if (! local_user() || $a->is_mobile || $a->is_tablet) {
+		return $o;
+	}
 
 //		$mobile_detect = new Mobile_Detect();
 //		$is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
 
-//		if($is_mobile)
+//		if ($is_mobile)
 //			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 + 7 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 ++;
+	$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 + 7 days')),
+			dbesc(datetime_convert('UTC','UTC','now - 1 days'))
+	);
+
+	if (dbm::is_result($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;
+			$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' : '');
+		}
+		$classtoday = (($istoday) ? 'event-today' : '');
 
-			$skip = 0;
+		$skip = 0;
 
-			foreach($r as &$rr) {
-				$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
+		foreach ($r as &$rr) {
+			$title = strip_tags(html_entity_decode(bbcode($rr['summary']),ENT_QUOTES,'UTF-8'));
 
-				if(strlen($title) > 35)
-					$title = substr($title,0,32) . '... ';
+			if (strlen($title) > 35) {
+				$title = substr($title,0,32) . '... ';
+			}
 
-				$description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
-				if(! $description)
-					$description = t('[No description]');
+			$description = substr(strip_tags(bbcode($rr['desc'])),0,32) . '... ';
+			if (! $description) {
+				$description = t('[No description]');
+			}
 
-				$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+			$strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
 
-				if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
-					$skip++;
-					continue;
-				}
+			if (substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
+				$skip++;
+				continue;
+			}
 
-				$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
+			$today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
 
-				$rr['title'] = $title;
-				$rr['description'] = $desciption;
-				$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;
-			}
+			$rr['title'] = $title;
+			$rr['description'] = $desciption;
+			$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) - $skip,
-			'$event_reminders' => t('Event Reminders'),
-			'$event_title' => t('Events this week:'),
-			'$events' => $r,
-		));
 	}
+
+	$tpl = get_markup_template("events_reminder.tpl");
+	return replace_macros($tpl, array(
+		'$baseurl' => App::get_baseurl(),
+		'$classtoday' => $classtoday,
+		'$count' => count($r) - $skip,
+		'$event_reminders' => t('Event Reminders'),
+		'$event_title' => t('Events this week:'),
+		'$events' => $r,
+	));
 }
 
-function advanced_profile(&$a) {
+function advanced_profile(App $a) {
 
 	$o = '';
 	$uid = $a->profile['uid'];
@@ -567,7 +632,7 @@ function advanced_profile(&$a) {
 		'$title' => t('Profile')
 	));
 
-	if($a->profile['name']) {
+	if ($a->profile['name']) {
 
 		$tpl = get_markup_template('profile_advanced.tpl');
 
@@ -575,11 +640,11 @@ function advanced_profile(&$a) {
 
 		$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')) {
+		if ($a->profile['gender']) {
+			$profile['gender'] = array( t('Gender:'),  $a->profile['gender'] );
+		}
 
+		if (($a->profile['dob']) && ($a->profile['dob'] > '0001-01-01')) {
 			$year_bd_format = t('j F, Y');
 			$short_bd_format = t('j F');
 
@@ -592,65 +657,108 @@ function advanced_profile(&$a) {
 
 		}
 
-		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 ($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'];
+		/// @TODO Maybe use x() here, plus below?
+		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 (strlen($a->profile['howlong']) && $a->profile['howlong'] >= NULL_DATE) {
+			$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['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['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['hometown']) {
+			$profile['hometown'] = array( t('Hometown:'), linkify($a->profile['hometown']) );
+		}
 
-		if($a->profile['pub_keywords']) $profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
+		if ($a->profile['pub_keywords']) {
+			$profile['pub_keywords'] = array( t('Tags:'), $a->profile['pub_keywords']);
+		}
 
-		if($a->profile['politic']) $profile['politic'] = array( t('Political Views:'), $a->profile['politic']);
+		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 ($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['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['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['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['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['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['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['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['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['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['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['work'])) $profile['work'] = array( t('Work/employment:'), $txt);
+		if ($txt = prepare_text($a->profile['education'])) {
+			$profile['education'] = array( t('School/education:'), $txt );
+		}
 
-		if($txt = prepare_text($a->profile['education'])) $profile['education'] = array( t('School/education:'), $txt );
-	
 		//show subcribed forum if it is enabled in the usersettings
 		if (feature_enabled($uid,'forumlist_profile')) {
-			$profile['forumlist'] = array( t('Forums:'), forumlist_profile_advanced($uid));
+			$profile['forumlist'] = array( t('Forums:'), ForumManager::profile_advanced($uid));
 		}
 
-		if ($a->profile['uid'] == local_user())
-			$profile['edit'] = array($a->get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+		if ($a->profile['uid'] == local_user()) {
+			$profile['edit'] = array(App::get_baseurl(). '/profiles/'.$a->profile['id'], t('Edit profile'),"", t('Edit profile'));
+		}
 
 		return replace_macros($tpl, array(
 			'$title' => t('Profile'),
+			'$basic' => t('Basic'),
+			'$advanced' => t('Advanced'),
 			'$profile' => $profile
 		));
 	}
@@ -658,137 +766,170 @@ function advanced_profile(&$a) {
 	return '';
 }
 
-if(! function_exists('profile_tabs')){
-	function profile_tabs($a, $is_owner=False, $nickname=Null){
-		//echo "<pre>"; var_dump($a->user); killme();
-
-		if (is_null($nickname))
-			$nickname  = $a->user['nickname'];
-
-		if(x($_GET,'tab'))
-			$tab = notags(trim($_GET['tab']));
-
-		$url = $a->get_baseurl() . '/profile/' . $nickname;
-
-		$tabs = array(
-			array(
-				'label'=>t('Status'),
-				'url' => $url,
-				'sel' => ((!isset($tab)&&$a->argv[0]=='profile')?'active':''),
-				'title' => t('Status Messages and Posts'),
-				'id' => 'status-tab',
-				'accesskey' => 'm',
-			),
-			array(
-				'label' => t('Profile'),
-				'url' 	=> $url.'/?tab=profile',
-				'sel'	=> ((isset($tab) && $tab=='profile')?'active':''),
-				'title' => t('Profile Details'),
-				'id' => 'profile-tab',
-				'accesskey' => 'r',
-			),
-			array(
-				'label' => t('Photos'),
-				'url'	=> $a->get_baseurl() . '/photos/' . $nickname,
-				'sel'	=> ((!isset($tab)&&$a->argv[0]=='photos')?'active':''),
-				'title' => t('Photo Albums'),
-				'id' => 'photo-tab',
-				'accesskey' => 'h',
-			),
-			array(
-				'label' => t('Videos'),
-				'url'	=> $a->get_baseurl() . '/videos/' . $nickname,
-				'sel'	=> ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
-				'title' => t('Videos'),
-				'id' => 'video-tab',
-				'accesskey' => 'v',
-			),
-		);
+function profile_tabs($a, $is_owner=False, $nickname=Null) {
+	//echo "<pre>"; var_dump($a->user); killme();
 
-		if ($is_owner){
-			if ($a->theme_events_in_profile)
-				$tabs[] = array(
-					'label' => t('Events'),
-					'url'	=> $a->get_baseurl() . '/events',
-					'sel' 	=>((!isset($tab)&&$a->argv[0]=='events')?'active':''),
-					'title' => t('Events and Calendar'),
-					'id' => 'events-tab',
-					'accesskey' => 'e',
-				);
+	if (is_null($nickname)) {
+		$nickname  = $a->user['nickname'];
+	}
+
+	if (x($_GET,'tab')) {
+		$tab = notags(trim($_GET['tab']));
+	}
+
+	$url = App::get_baseurl() . '/profile/' . $nickname;
+
+	$tabs = array(
+		array(
+			'label'=>t('Status'),
+			'url' => $url,
+			'sel' => ((!isset($tab) && $a->argv[0]=='profile') ? 'active' : ''),
+			'title' => t('Status Messages and Posts'),
+			'id' => 'status-tab',
+			'accesskey' => 'm',
+		),
+		array(
+			'label' => t('Profile'),
+			'url' 	=> $url.'/?tab=profile',
+			'sel'	=> ((isset($tab) && $tab=='profile') ? 'active' : ''),
+			'title' => t('Profile Details'),
+			'id' => 'profile-tab',
+			'accesskey' => 'r',
+		),
+		array(
+			'label' => t('Photos'),
+			'url'	=> App::get_baseurl() . '/photos/' . $nickname,
+			'sel'	=> ((!isset($tab) && $a->argv[0]=='photos') ? 'active' : ''),
+			'title' => t('Photo Albums'),
+			'id' => 'photo-tab',
+			'accesskey' => 'h',
+		),
+		array(
+			'label' => t('Videos'),
+			'url'	=> App::get_baseurl() . '/videos/' . $nickname,
+			'sel'	=> ((!isset($tab) && $a->argv[0]=='videos') ? 'active' : ''),
+			'title' => t('Videos'),
+			'id' => 'video-tab',
+			'accesskey' => 'v',
+		),
+	);
+
+	// the calendar link for the full featured events calendar
+	if ($is_owner && $a->theme_events_in_profile) {
 			$tabs[] = array(
-				'label' => t('Personal Notes'),
-				'url'	=> $a->get_baseurl() . '/notes',
-				'sel' 	=>((!isset($tab)&&$a->argv[0]=='notes')?'active':''),
-				'title' => t('Only You Can See This'),
-				'id' => 'notes-tab',
-				'accesskey' => 't',
+				'label' => t('Events'),
+				'url'	=> App::get_baseurl() . '/events',
+				'sel' 	=>((!isset($tab) && $a->argv[0]=='events') ? 'active' : ''),
+				'title' => t('Events and Calendar'),
+				'id' => 'events-tab',
+				'accesskey' => 'e',
 			);
-		}
+	// if the user is not the owner of the calendar we only show a calendar
+	// with the public events of the calendar owner
+	} elseif (! $is_owner) {
+		$tabs[] = array(
+				'label' => t('Events'),
+				'url'	=> App::get_baseurl() . '/cal/' . $nickname,
+				'sel' 	=>((!isset($tab) && $a->argv[0]=='cal') ? 'active' : ''),
+				'title' => t('Events and Calendar'),
+				'id' => 'events-tab',
+				'accesskey' => 'e',
+			);
+	}
 
+	if ($is_owner) {
+		$tabs[] = array(
+			'label' => t('Personal Notes'),
+			'url'	=> App::get_baseurl() . '/notes',
+			'sel' 	=>((!isset($tab) && $a->argv[0]=='notes') ? 'active' : ''),
+			'title' => t('Only You Can See This'),
+			'id' => 'notes-tab',
+			'accesskey' => 't',
+		);
+	}
+
+	if ((! $is_owner) && ((count($a->profile)) || (! $a->profile['hide-friends']))) {
+		$tabs[] = array(
+			'label' => t('Contacts'),
+			'url'	=> App::get_baseurl() . '/viewcontacts/' . $nickname,
+			'sel'	=> ((!isset($tab) && $a->argv[0]=='viewcontacts') ? 'active' : ''),
+			'title' => t('Contacts'),
+			'id' => 'viewcontacts-tab',
+			'accesskey' => 'k',
+		);
+	}
 
-		$arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
-		call_hooks('profile_tabs', $arr);
+	$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');
+	$tpl = get_markup_template('common_tabs.tpl');
 
-		return replace_macros($tpl,array('$tabs' => $arr['tabs']));
-	}
+	return replace_macros($tpl,array('$tabs' => $arr['tabs']));
 }
 
 function get_my_url() {
-	if(x($_SESSION,'my_url'))
+	if (x($_SESSION, 'my_url')) {
 		return $_SESSION['my_url'];
+	}
 	return false;
 }
 
-function zrl_init(&$a) {
+function zrl_init(App $a) {
 	$tmp_str = get_my_url();
-	if(validate_url($tmp_str)) {
+	if (validate_url($tmp_str)) {
 
 		// Is it a DDoS attempt?
 		// The check fetches the cached value from gprobe to reduce the load for this system
 		$urlparts = parse_url($tmp_str);
 
-		$result = Cache::get("gprobe:".$urlparts["host"]);
-		if (!is_null($result)) {
-			$result = unserialize($result);
-			if (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) {
-				logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
-				return;
-			}
+		$result = Cache::get("gprobe:" . $urlparts["host"]);
+		if ((!is_null($result)) && (in_array($result["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
+			logger("DDoS attempt detected for " . $urlparts["host"] . " by " . $_SERVER["REMOTE_ADDR"] . ". server data: " . print_r($_SERVER, true), LOGGER_DEBUG);
+			return;
 		}
 
-		proc_run('php','include/gprobe.php',bin2hex($tmp_str));
+		proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($tmp_str));
 		$arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
-		call_hooks('zrl_init',$arr);
+		call_hooks('zrl_init', $arr);
 	}
 }
 
-function zrl($s,$force = false) {
-	if(! strlen($s))
+function zrl($s, $force = false) {
+	if (! strlen($s)) {
 		return $s;
-	if((! strpos($s,'/profile/')) && (! $force))
+	}
+	if ((! strpos($s, '/profile/')) && (! $force)) {
 		return $s;
-	if($force && substr($s,-1,1) !== '/')
+	}
+	if ($force && substr($s, -1, 1) !== '/') {
 		$s = $s . '/';
-	$achar = strpos($s,'?') ? '&' : '?';
+	}
+	$achar = strpos($s, '?') ? '&' : '?';
 	$mine = get_my_url();
-	if($mine and ! link_compare($mine,$s))
+	if ($mine && ! link_compare($mine, $s)) {
 		return $s . $achar . 'zrl=' . urlencode($mine);
+	}
 	return $s;
 }
 
-// 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.
-
+/**
+ * @brief Get the user ID of the page owner
+ *
+ * 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.
+ *
+ * @return int user ID
+ *
+ * @note Returns local_user instead of user ID if "always_my_theme"
+ *      is set to true
+ */
 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 ((local_user()) && ((get_pconfig(local_user(),'system','always_my_theme')) || (! $uid))) {
+		return local_user();
 	}
 
 	return $uid;