X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdelegate.php;h=456078451570cbc1db5f929201f6de0fa5cd6ad3;hb=b2d685482928363ce86c3c0519c8ff39d0af43ca;hp=e38ce058e57305d4eca69a7f484e54a59b3baf2e;hpb=7ee8bdafc53a88fe51f233e14169bb4af0d376ab;p=friendica.git

diff --git a/mod/delegate.php b/mod/delegate.php
index e38ce058e5..4560784515 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -7,16 +7,17 @@ use Friendica\App;
 use Friendica\BaseModule;
 use Friendica\Core\L10n;
 use Friendica\Core\Protocol;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
 use Friendica\Model\User;
-use Friendica\Util\Security;
+use Friendica\Util\Strings;
 
 require_once 'mod/settings.php';
 
 function delegate_init(App $a)
 {
-	return settings_init($a);
+	settings_init($a);
 }
 
 function delegate_post(App $a)
@@ -25,7 +26,7 @@ function delegate_post(App $a)
 		return;
 	}
 
-	if (count($a->user) && x($a->user, 'uid') && $a->user['uid'] != local_user()) {
+	if (count($a->user) && !empty($a->user['uid']) && $a->user['uid'] != local_user()) {
 		notice(L10n::t('Permission denied.') . EOL);
 		return;
 	}
@@ -61,7 +62,7 @@ function delegate_content(App $a)
 
 	if ($a->argc > 2 && $a->argv[1] === 'add' && intval($a->argv[2])) {
 		// delegated admins can view but not change delegation permissions
-		if (x($_SESSION, 'submanage')) {
+		if (!empty($_SESSION['submanage'])) {
 			$a->internalRedirect('delegate');
 		}
 
@@ -71,7 +72,7 @@ function delegate_content(App $a)
 		if (DBA::isResult($user)) {
 			$condition = [
 				'uid' => local_user(),
-				'nurl' => normalise_link(System::baseUrl() . '/profile/' . $user['nickname'])
+				'nurl' => Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname'])
 			];
 			if (DBA::exists('contact', $condition)) {
 				DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
@@ -82,7 +83,7 @@ function delegate_content(App $a)
 
 	if ($a->argc > 2 && $a->argv[1] === 'remove' && intval($a->argv[2])) {
 		// delegated admins can view but not change delegation permissions
-		if (x($_SESSION, 'submanage')) {
+		if (!empty($_SESSION['submanage'])) {
 			$a->internalRedirect('delegate');
 		}
 
@@ -113,7 +114,7 @@ function delegate_content(App $a)
 		AND SUBSTRING_INDEX(`nurl`, '/', 3) = '%s'
 		AND `uid` = %d
 		AND `network` = '%s' ",
-		DBA::escape(normalise_link(System::baseUrl())),
+		DBA::escape(Strings::normaliseLink(System::baseUrl())),
 		intval(local_user()),
 		DBA::escape(Protocol::DFRN)
 	);
@@ -161,9 +162,11 @@ function delegate_content(App $a)
 
 	if (!is_null($parent_user)) {
 		$parent_password = ['parent_password', L10n::t('Parent Password:'), '', L10n::t('Please enter the password of the parent account to legitimize your request.')];
+	} else {
+		$parent_password = '';
 	}
 
-	$o = replace_macros(get_markup_template('delegate.tpl'), [
+	$o = Renderer::replaceMacros(Renderer::getMarkupTemplate('delegate.tpl'), [
 		'$form_security_token' => BaseModule::getFormSecurityToken('delegate'),
 		'$parent_header' => L10n::t('Parent User'),
 		'$parent_user' => $parent_user,