X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fidentity.php;h=a792c4714426a9a1334442a90f07620177f9ca85;hb=88e336b3bc14f2e6c23c59732150abd6e17b00da;hp=136452e787b2e99fc6f745a3bfaec13be949752a;hpb=7495a34b32fdf1ea08bd2eaa378b216345077f7f;p=friendica.git

diff --git a/include/identity.php b/include/identity.php
index 136452e787..a792c47144 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -71,8 +71,8 @@ function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
 	$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
 
-//		if (!$profiledata)
-//			$_SESSION['theme'] = $a->profile['theme'];
+		if (!$profiledata  && !get_pconfig(local_user(),'system','always_my_theme'))
+			$_SESSION['theme'] = $a->profile['theme'];
 
 	$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
 
@@ -149,17 +149,23 @@ function get_profiledata_by_nick($nickname, $uid = 0, $profile = 0) {
 
 	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`, `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",
+		$r = q("SELECT `contact`.`id` AS `contact_id`, `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)
 		);
 	}
@@ -310,15 +316,8 @@ function profile_sidebar($profile, $block = 0) {
 		);
 	}
 
-	// check if profile is a forum
-	if((intval($profile['page-flags']) == PAGE_COMMUNITY)
-			|| (intval($profile['page-flags']) == PAGE_PRVGROUP)
-			|| (isset($profile['forum']) && intval($profile['forum']))
-			|| (isset($profile['prv']) && intval($profile['prv']))
-			|| (isset($profile['community']) && intval($profile['community'])))
-		$account_type = t('Forum');
-	else
-		$account_type = "";
+	// Fetch the account type
+	$account_type = account_type($profile);
 
 	if((x($profile,'address') == 1)
 			|| (x($profile,'location') == 1)
@@ -337,6 +336,8 @@ function profile_sidebar($profile, $block = 0) {
 
 	$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;
 	}
@@ -370,7 +371,7 @@ function profile_sidebar($profile, $block = 0) {
 			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
+			$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive`
 					AND `network` IN ('%s', '%s', '%s', '')",
 				intval($profile['uid']),
 				dbesc(NETWORK_DFRN),
@@ -405,6 +406,7 @@ function profile_sidebar($profile, $block = 0) {
 	$tpl = get_markup_template('profile_vcard.tpl');
 	$o .= replace_macros($tpl, array(
 		'$profile' => $p,
+		'$xmpp' => $xmpp,
 		'$connect'  => $connect,
 		'$remoteconnect'  => $remoteconnect,
 		'$subscribe_feed' => $subscribe_feed,
@@ -687,6 +689,8 @@ function advanced_profile(&$a) {
 
 		return replace_macros($tpl, array(
 			'$title' => t('Profile'),
+			'$basic' => t('Basic'),
+			'$advanced' => t('Advanced'),
 			'$profile' => $profile
 		));
 	}
@@ -809,14 +813,13 @@ function zrl_init(&$a) {
 
 		$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;
 			}
 		}
 
-		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);
 	}