Merge branch 'develop' into rewrites/coding-convention-split2-1-2

[friendica.git] / mod / manage.php

diff --git a/mod/manage.php b/mod/manage.php
index 4835f6fc8c72c9fd8655ecf197d16a1e03ce5dbb..e85561acfb350fc3d64f462efe8d4d929ae50556 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -12,8 +12,8 @@ function manage_post(App $a) {
        $uid = local_user();
        $orig_record = $a->user;
 
-       if ((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
-               $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
+       if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
+               $r = q("select * from user where uid = %d limit 1",
                        intval($_SESSION['submanage'])
                );
                if (dbm::is_result($r)) {
@@ -36,7 +36,7 @@ function manage_post(App $a) {
        $limited_id = 0;
        $original_id = $uid;
 
-       if (count($submanage)) {
+       if (dbm::is_result($submanage)) {
                foreach ($submanage as $m) {
                        if ($identity == $m['mid']) {
                                $limited_id = $m['mid'];
@@ -70,18 +70,18 @@ function manage_post(App $a) {
        unset($_SESSION['mobile-theme']);
        unset($_SESSION['page_flags']);
        unset($_SESSION['return_url']);
-       if (x($_SESSION,'submanage')) {
+       if (x($_SESSION, 'submanage')) {
                unset($_SESSION['submanage']);
        }
-       if (x($_SESSION,'sysmsg')) {
+       if (x($_SESSION, 'sysmsg')) {
                unset($_SESSION['sysmsg']);
        }
-       if (x($_SESSION,'sysmsg_info')) {
+       if (x($_SESSION, 'sysmsg_info')) {
                unset($_SESSION['sysmsg_info']);
        }
 
        require_once('include/security.php');
-       authenticate_success($r[0],true,true);
+       authenticate_success($r[0], true, true);
 
        if ($limited_id) {
                $_SESSION['submanage'] = $original_id;
@@ -117,26 +117,32 @@ function manage_content(App $a) {
                        dbesc($id['uid'])
                );
 
-               $identities[$key][thumb] = $thumb[0][thumb];
+               $identities[$key]['thumb'] = $thumb[0]['thumb'];
 
-               $identities[$key]['selected'] = (($id['nickname'] === $a->user['nickname']) ? true : false);
+               $identities[$key]['selected'] = ($id['nickname'] === $a->user['nickname']);
 
                $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)
+
+               if (dbm::is_result($r)) {
                        $notifications = sizeof($r);
+               }
 
                $r = q("SELECT DISTINCT(`convid`) FROM `mail` WHERE `uid` = %d AND NOT `seen`",
                        intval($id['uid']));
-               if ($r)
+
+               if (dbm::is_result($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)
+
+               if (dbm::is_result($r)) {
                        $notifications = $notifications + $r[0]["introductions"];
+               }
 
                $identities[$key]['notifications'] = $notifications;
        }