X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fmanage.php;h=58590264a5ac25e61ec6d0fd6ece252e1f5e67c1;hb=b2d685482928363ce86c3c0519c8ff39d0af43ca;hp=9e724c1e9bca52b44bd4ead0849f262637b24a74;hpb=ce2b1f571573df4d1a9bb26518ab6981d77021b7;p=friendica.git

diff --git a/mod/manage.php b/mod/manage.php
index 9e724c1e9b..58590264a5 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -2,15 +2,14 @@
 /**
  * @file mod/manage.php
  */
+
 use Friendica\App;
-use Friendica\Core\Authentication;
-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()) {
@@ -20,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'])
 		);
@@ -36,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;
 	}
@@ -99,27 +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']);
 	}
 
-	Authentication::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
 }
 
@@ -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: '),