X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmanage.php;h=4beb8e46c65384d545951fb39d7b72df37769dc6;hb=9259feec6f4b0a24c15f971a3dc8fa54f4f08141;hp=37d7542fe56fe575f102aa0df803fc467a91899f;hpb=87c559d60504ed7069f1fdb4784303437f11eb8f;p=friendica.git

diff --git a/mod/manage.php b/mod/manage.php
index 37d7542fe5..4beb8e46c6 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -3,10 +3,11 @@
 require_once("include/text.php");
 
 
-function manage_post(&$a) {
+function manage_post(App $a) {
 
-	if(! local_user())
+	if (! local_user()) {
 		return;
+	}
 
 	$uid = local_user();
 	$orig_record = $a->user;
@@ -15,7 +16,7 @@ function manage_post(&$a) {
 		$r = q("select * from user where uid = %d limit 1",
 			intval($_SESSION['submanage'])
 		);
-		if(count($r)) {
+		if (dbm::is_result($r)) {
 			$uid = intval($r[0]['uid']);
 			$orig_record = $r[0];
 		}
@@ -56,8 +57,9 @@ function manage_post(&$a) {
 		);
 	}
 
-	if(! count($r))
+	if (! dbm::is_result($r)) {
 		return;
+	}
 
 	unset($_SESSION['authenticated']);
 	unset($_SESSION['uid']);
@@ -84,34 +86,55 @@ function manage_post(&$a) {
 	$ret = array();
 	call_hooks('home_init',$ret);
 
-	goaway( $a->get_baseurl() . "/profile/" . $a->user['nickname'] );
+	goaway( App::get_baseurl() . "/profile/" . $a->user['nickname'] );
 	// NOTREACHED
 }
 
 
 
-function manage_content(&$a) {
+function manage_content(App $a) {
 
-	if(! local_user()) {
+	if (! local_user()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
+	if ($_GET['identity']) {
+		$_POST['identity'] = $_GET['identity'];
+		manage_post($a);
+		return;
+	}
+
 	$identities = $a->identities;
 
 	//getting additinal information for each identity
 	foreach ($identities as $key=>$id) {
-		$thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = %d AND `name` = '%s' AND `nick` = '%s' AND `nurl` = '%s'
-			AND (`network` = '%s' OR `self` = 1)",
-			intval($a->user['uid']),
-			dbesc($id['username']),
-			dbesc($id['nickname']),
-			dbesc(normalise_link($a->get_baseurl() . '/profile/' . $id['nickname'])),
-			dbesc(NETWORK_DFRN)
-			);
+		$thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = '%s' AND `self` = 1",
+			dbesc($id['uid'])
+		);
+
 		$identities[$key][thumb] = $thumb[0][thumb];
 
 		$identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false);
+
+		$notifications = 0;
+
+		$r = q("SELECT DISTINCT(`parent`) FROM `notify` WHERE `uid` = %d AND NOT `seen` AND NOT (`type` IN (%d, %d))",
+			intval($id['uid']), intval(NOTIFY_INTRO), intval(NOTIFY_MAIL));
+		if ($r)
+			$notifications = sizeof($r);
+
+		$r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
+			intval($id['uid']));
+		if ($r)
+			$notifications = $notifications + sizeof($r);
+
+		$r = q("SELECT COUNT(*) AS `introductions` FROM `intro` WHERE NOT `blocked` AND NOT `ignore` AND `uid` = %d",
+			intval($id['uid']));
+		if ($r)
+			$notifications = $notifications + $r[0]["introductions"];
+
+		$identities[$key]['notifications'] = $notifications;
 	}
 
 	$o = replace_macros(get_markup_template('manage.tpl'), array(