Issue 7285: Perform duplicate check for item URI also with AP

[friendica.git] / mod / manage.php

diff --git a/mod/manage.php b/mod/manage.php
index 2943a229cfd24d3f591503ae7807ac4faf128d1a..58590264a5ac25e61ec6d0fd6ece252e1f5e67c1 100644 (file)
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -2,14 +2,14 @@
 /**
  * @file mod/manage.php
  */
+
 use Friendica\App;
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
-use Friendica\Core\System;
+use Friendica\Core\Renderer;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 
-require_once "include/text.php";
-
 function manage_post(App $a) {
 
        if (! local_user()) {
@@ -19,7 +19,7 @@ function manage_post(App $a) {
        $uid = local_user();
        $orig_record = $a->user;
 
-       if((x($_SESSION,'submanage')) && intval($_SESSION['submanage'])) {
+       if(!empty($_SESSION['submanage'])) {
                $r = q("select * from user where uid = %d limit 1",
                        intval($_SESSION['submanage'])
                );
@@ -35,7 +35,7 @@ function manage_post(App $a) {
 
        $submanage = $r;
 
-       $identity = (x($_POST['identity']) ? intval($_POST['identity']) : 0);
+       $identity = (!empty($_POST['identity']) ? intval($_POST['identity']) : 0);
        if (!$identity) {
                return;
        }
@@ -60,14 +60,14 @@ function manage_post(App $a) {
                // Check if the target user is one of our children
                $r = q("SELECT * FROM `user` WHERE `uid` = %d AND `parent-uid` = %d LIMIT 1",
                        intval($identity),
-                       dbesc($orig_record['uid'])
+                       DBA::escape($orig_record['uid'])
                );
 
                // Check if the target user is one of our siblings
                if (!DBA::isResult($r) && ($orig_record['parent-uid'] != 0)) {
                        $r = q("SELECT * FROM `user` WHERE `uid` = %d AND `parent-uid` = %d LIMIT 1",
                                intval($identity),
-                               dbesc($orig_record['parent-uid'])
+                               DBA::escape($orig_record['parent-uid'])
                        );
                }
 
@@ -98,28 +98,27 @@ function manage_post(App $a) {
        unset($_SESSION['theme']);
        unset($_SESSION['mobile-theme']);
        unset($_SESSION['page_flags']);
-       unset($_SESSION['return_url']);
-       if (x($_SESSION, 'submanage')) {
+       unset($_SESSION['return_path']);
+       if (!empty($_SESSION['submanage'])) {
                unset($_SESSION['submanage']);
        }
-       if (x($_SESSION, 'sysmsg')) {
+       if (!empty($_SESSION['sysmsg'])) {
                unset($_SESSION['sysmsg']);
        }
-       if (x($_SESSION, 'sysmsg_info')) {
+       if (!empty($_SESSION['sysmsg_info'])) {
                unset($_SESSION['sysmsg_info']);
        }
 
-       require_once('include/security.php');
-       authenticate_success($r[0], true, true);
+       Session::setAuthenticatedForUser($a, $r[0], true, true);
 
        if ($limited_id) {
                $_SESSION['submanage'] = $original_id;
        }
 
        $ret = [];
-       Addon::callHooks('home_init',$ret);
+       Hook::callAll('home_init',$ret);
 
-       goaway( System::baseUrl() . "/profile/" . $a->user['nickname'] );
+       $a->internalRedirect('profile/' . $a->user['nickname'] );
        // NOTREACHED
 }
 
@@ -132,7 +131,7 @@ function manage_content(App $a) {
                return;
        }
 
-       if ($_GET['identity']) {
+       if (!empty($_GET['identity'])) {
                $_POST['identity'] = $_GET['identity'];
                manage_post($a);
                return;
@@ -143,7 +142,7 @@ function manage_content(App $a) {
        //getting additinal information for each identity
        foreach ($identities as $key=>$id) {
                $thumb = q("SELECT `thumb` FROM `contact` WHERE `uid` = '%s' AND `self` = 1",
-                       dbesc($id['uid'])
+                       DBA::escape($id['uid'])
                );
 
                $identities[$key]['thumb'] = $thumb[0]['thumb'];
@@ -176,7 +175,7 @@ function manage_content(App $a) {
                $identities[$key]['notifications'] = $notifications;
        }
 
-       $o = replace_macros(get_markup_template('manage.tpl'), [
+       $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('manage.tpl'), [
                '$title' => L10n::t('Manage Identities and/or Pages'),
                '$desc' => L10n::t('Toggle between different identities or community/group pages which share your account details or which you have been granted "manage" permissions'),
                '$choose' => L10n::t('Select an identity to manage: '),