X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdelegate.php;h=ed4f854377109c6c4466487ec6ab9f34eedb0eff;hb=f8b74033a4f990e421814ea5bf8b443104e61feb;hp=a6a67c3b828bfc439a7bd90ac680fb5a95ed77fa;hpb=281734d5dc700e79bfb0f625ffe1c934384e0097;p=friendica.git

diff --git a/mod/delegate.php b/mod/delegate.php
index a6a67c3b82..ed4f854377 100644
--- a/mod/delegate.php
+++ b/mod/delegate.php
@@ -2,10 +2,13 @@
 /**
  * @file mod/delegate.php
  */
+
 use Friendica\App;
 use Friendica\Core\L10n;
+use Friendica\Core\Protocol;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\Model\User;
 
 require_once 'mod/settings.php';
 
@@ -28,8 +31,23 @@ function delegate_post(App $a)
 	check_form_security_token_redirectOnErr('/delegate', 'delegate');
 
 	$parent_uid = defaults($_POST, 'parent_user', 0);
+	$parent_password = defaults($_POST, 'parent_password', '');
+
+	if ($parent_uid != 0) {
+		$user = DBA::selectFirst('user', ['nickname'], ['uid' => $parent_uid]);
+		if (!DBA::isResult($user)) {
+			notice(L10n::t('Parent user not found.') . EOL);
+			return;
+		}
 
-	dba::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
+		$success = User::authenticate($user['nickname'], trim($parent_password));
+		if (!$success) {
+			notice(L10n::t('Permission denied.') . EOL);
+			return;
+		}
+	}
+
+	DBA::update('user', ['parent-uid' => $parent_uid], ['uid' => local_user()]);
 }
 
 function delegate_content(App $a)
@@ -47,14 +65,14 @@ function delegate_content(App $a)
 
 		$user_id = $a->argv[2];
 
-		$user = dba::selectFirst('user', ['nickname'], ['uid' => $user_id]);
-		if (DBM::is_result($user)) {
+		$user = DBA::selectFirst('user', ['nickname'], ['uid' => $user_id]);
+		if (DBA::isResult($user)) {
 			$condition = [
 				'uid' => local_user(),
 				'nurl' => normalise_link(System::baseUrl() . '/profile/' . $user['nickname'])
 			];
-			if (dba::exists('contact', $condition)) {
-				dba::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
+			if (DBA::exists('contact', $condition)) {
+				DBA::insert('manage', ['uid' => $user_id, 'mid' => local_user()]);
 			}
 		}
 		goaway(System::baseUrl() . '/delegate');
@@ -66,34 +84,20 @@ function delegate_content(App $a)
 			goaway(System::baseUrl() . '/delegate');
 		}
 
-		dba::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
+		DBA::delete('manage', ['uid' => $a->argv[2], 'mid' => local_user()]);
 		goaway(System::baseUrl() . '/delegate');
 	}
 
-	// These people can manage this account/page with full privilege
-	$full_managers = [];
-	$r = q("SELECT * FROM `user` WHERE `email` = '%s' AND `password` = '%s' ",
-		dbesc($a->user['email']),
-		dbesc($a->user['password'])
-	);
-	if (DBM::is_result($r)) {
-		$full_managers = $r;
-	}
-
 	// find everybody that currently has delegated management to this account/page
 	$delegates = [];
 	$r = q("SELECT * FROM `user` WHERE `uid` IN (SELECT `uid` FROM `manage` WHERE `mid` = %d)",
 		intval(local_user())
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$delegates = $r;
 	}
 
 	$uids = [];
-	foreach ($full_managers as $rr) {
-		$uids[] = $rr['uid'];
-	}
-
 	foreach ($delegates as $rr) {
 		$uids[] = $rr['uid'];
 	}
@@ -107,21 +111,21 @@ function delegate_content(App $a)
 		AND SUBSTRING_INDEX(`nurl`, '/', 3) = '%s'
 		AND `uid` = %d
 		AND `network` = '%s' ",
-		dbesc(normalise_link(System::baseUrl())),
+		DBA::escape(normalise_link(System::baseUrl())),
 		intval(local_user()),
-		dbesc(NETWORK_DFRN)
+		DBA::escape(Protocol::DFRN)
 	);
-	if (DBM::is_result($r)) {
+	if (DBA::isResult($r)) {
 		$nicknames = [];
 		foreach ($r as $rr) {
-			$nicknames[] = "'" . dbesc(basename($rr['nurl'])) . "'";
+			$nicknames[] = "'" . DBA::escape(basename($rr['nurl'])) . "'";
 		}
 
 		$nicks = implode(',', $nicknames);
 
 		// get user records for all potential page delegates who are not already delegates or managers
 		$r = q("SELECT `uid`, `username`, `nickname` FROM `user` WHERE `nickname` IN ($nicks)");
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			foreach ($r as $rr) {
 				if (!in_array($rr['uid'], $uids)) {
 					$potentials[] = $rr;
@@ -132,19 +136,19 @@ function delegate_content(App $a)
 
 	settings_init($a);
 
-	$user = dba::selectFirst('user', ['parent-uid', 'email'], ['uid' => local_user()]);
+	$user = DBA::selectFirst('user', ['parent-uid', 'email'], ['uid' => local_user()]);
 
 	$parent_user = null;
 
-	if (DBM::is_result($user)) {
-		if (!dba::exists('user', ['parent-uid' => local_user()])) {
+	if (DBA::isResult($user)) {
+		if (!DBA::exists('user', ['parent-uid' => local_user()])) {
 			$parent_uid = $user['parent-uid'];
 			$parents = [0 => L10n::t('No parent user')];
 
 			$fields = ['uid', 'username', 'nickname'];
 			$condition = ['email' => $user['email'], 'verified' => true, 'blocked' => false, 'parent-uid' => 0];
-			$parent_users = dba::select('user', $fields, $condition);
-			while ($parent = dba::fetch($parent_users)) {
+			$parent_users = DBA::select('user', $fields, $condition);
+			while ($parent = DBA::fetch($parent_users)) {
 				if ($parent['uid'] != local_user()) {
 					$parents[$parent['uid']] = sprintf('%s (%s)', $parent['username'], $parent['nickname']);
 				}
@@ -153,18 +157,21 @@ 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.')];
+	}
+
 	$o = replace_macros(get_markup_template('delegate.tpl'), [
 		'$form_security_token' => get_form_security_token('delegate'),
 		'$parent_header' => L10n::t('Parent User'),
 		'$parent_user' => $parent_user,
+		'$parent_password' => $parent_password,
 		'$parent_desc' => L10n::t('Parent users have total control about this account, including the account settings. Please double check whom you give this access.'),
 		'$submit' => L10n::t('Save Settings'),
 		'$header' => L10n::t('Delegate Page Management'),
 		'$delegates_header' => L10n::t('Delegates'),
 		'$base' => System::baseUrl(),
 		'$desc' => L10n::t('Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely.'),
-		'$head_managers' => L10n::t('Existing Page Managers'),
-		'$managers' => $full_managers,
 		'$head_delegates' => L10n::t('Existing Page Delegates'),
 		'$delegates' => $delegates,
 		'$head_potentials' => L10n::t('Potential Delegates'),