Merge pull request #2148 from annando/issue-1871

[friendica.git] / mod / manage.php

diff --git a/mod/manage.php b/mod/manage.php
index 3f553dfa6b19d363946552526b51f4db3ad89a97..adcc3d787aac0d58563cbd5d38e82e50384498d2 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -97,19 +97,42 @@ function manage_content(&$a) {
                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 (`network` = '%s' OR `self` = 1)",
-                       intval($a->user['uid']),
-                       dbesc($id['username']),
-                       dbesc($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(