Merge pull request #3033 from annando/1612-object-type

[friendica.git] / mod / manage.php

diff --git a/mod/manage.php b/mod/manage.php
index bfa4d1475c891f3de026fd48d8fa8e14c0acc4d5..66891db720a540fbe659644b4a25a7d0d85b23be 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -15,7 +15,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,7 +56,7 @@ function manage_post(&$a) {
                );
        }
 
-       if(! count($r))
+       if(! dbm::is_result($r))
                return;
 
        unset($_SESSION['authenticated']);
@@ -97,6 +97,12 @@ 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
@@ -108,6 +114,25 @@ function manage_content(&$a) {
                $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(