Merge pull request #4170 from MrPetovan/bug/4155-remove-proxy-oembed

[friendica.git] / mod / manage.php

diff --git a/mod/manage.php b/mod/manage.php
index 4835f6fc8c72c9fd8655ecf197d16a1e03ce5dbb..72de332fc70634abbfc5a07495d2c6af1040ab29 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -1,7 +1,10 @@
 <?php
 
-require_once("include/text.php");
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 
+require_once("include/text.php");
 
 function manage_post(App $a) {
 
@@ -12,11 +15,11 @@ 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)) {
+               if (DBM::is_result($r)) {
                        $uid = intval($r[0]['uid']);
                        $orig_record = $r[0];
                }
@@ -36,7 +39,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'];
@@ -57,7 +60,7 @@ function manage_post(App $a) {
                );
        }
 
-       if (! dbm::is_result($r)) {
+       if (! DBM::is_result($r)) {
                return;
        }
 
@@ -70,18 +73,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;
@@ -90,7 +93,7 @@ function manage_post(App $a) {
        $ret = array();
        call_hooks('home_init',$ret);
 
-       goaway( App::get_baseurl() . "/profile/" . $a->user['nickname'] );
+       goaway( System::baseUrl() . "/profile/" . $a->user['nickname'] );
        // NOTREACHED
 }
 
@@ -117,26 +120,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;
        }