X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fprofperm.php;h=218d1973eea101f332d362a19e50db9942b7bc6c;hb=ac9b3b78457f466980c7300cea602d78e7af8d45;hp=0f864d42f3e2b8ca66ce83c31bf55787519e2c46;hpb=219182d41ea84faec0164aed80d0dfbe15f2067d;p=friendica.git

diff --git a/mod/profperm.php b/mod/profperm.php
index 0f864d42f3..218d1973ee 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -6,12 +6,14 @@ use Friendica\App;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Core\Protocol;
+use Friendica\Content\Text\HTML;
+use Friendica\Database\DBA;
 use Friendica\Model\Profile;
 
 function profperm_init(App $a)
 {
-	if (! local_user()) {
+	if (!local_user()) {
 		return;
 	}
 
@@ -24,13 +26,13 @@ function profperm_init(App $a)
 
 function profperm_content(App $a) {
 
-	if (! local_user()) {
+	if (!local_user()) {
 		notice(L10n::t('Permission denied') . EOL);
 		return;
 	}
 
 
-	if($a->argc < 2) {
+	if ($a->argc < 2) {
 		notice(L10n::t('Invalid profile identifier.') . EOL );
 		return;
 	}
@@ -44,24 +46,26 @@ function profperm_content(App $a) {
 		$switchtotext = Config::get('system','groupedit_image_limit', 400);
 	}
 
-	if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
+	if (($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) {
 		$r = q("SELECT `id` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `self` = 0
 			AND `network` = '%s' AND `id` = %d AND `uid` = %d LIMIT 1",
-			dbesc(NETWORK_DFRN),
+			DBA::escape(Protocol::DFRN),
 			intval($a->argv[2]),
 			intval(local_user())
 		);
-		if (DBM::is_result($r))
+
+		if (DBA::isResult($r)) {
 			$change = intval($a->argv[2]);
+		}
 	}
 
 
-	if(($a->argc > 1) && (intval($a->argv[1]))) {
+	if (($a->argc > 1) && (intval($a->argv[1]))) {
 		$r = q("SELECT * FROM `profile` WHERE `id` = %d AND `uid` = %d AND `is-default` = 0 LIMIT 1",
 			intval($a->argv[1]),
 			intval(local_user())
 		);
-		if (! DBM::is_result($r)) {
+		if (!DBA::isResult($r)) {
 			notice(L10n::t('Invalid profile identifier.') . EOL );
 			return;
 		}
@@ -73,14 +77,14 @@ function profperm_content(App $a) {
 		);
 
 		$ingroup = [];
-		if (DBM::is_result($r))
+		if (DBA::isResult($r))
 			foreach($r as $member)
 				$ingroup[] = $member['id'];
 
 		$members = $r;
 
-		if($change) {
-			if(in_array($change,$ingroup)) {
+		if (!empty($change)) {
+			if (in_array($change,$ingroup)) {
 				q("UPDATE `contact` SET `profile-id` = 0 WHERE `id` = %d AND `uid` = %d",
 					intval($change),
 					intval(local_user())
@@ -103,7 +107,7 @@ function profperm_content(App $a) {
 			$members = $r;
 
 			$ingroup = [];
-			if (DBM::is_result($r))
+			if (DBA::isResult($r))
 				foreach($r as $member)
 					$ingroup[] = $member['id'];
 		}
@@ -117,7 +121,7 @@ function profperm_content(App $a) {
 	}
 
 	$o .= '<div id="prof-update-wrapper">';
-	if($change)
+	if (!empty($change))
 		$o = '';
 
 	$o .= '<div id="prof-members-title">';
@@ -128,9 +132,9 @@ function profperm_content(App $a) {
 	$textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false);
 
 	foreach($members as $member) {
-		if($member['url']) {
+		if ($member['url']) {
 			$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
-			$o .= micropro($member,true,'mpprof', $textmode);
+			$o .= HTML::micropro($member,true,'mpprof', $textmode);
 		}
 	}
 	$o .= '</div><div id="prof-members-end"></div>';
@@ -144,24 +148,24 @@ function profperm_content(App $a) {
 		$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0
 			AND `network` = '%s' ORDER BY `name` ASC",
 			intval(local_user()),
-			dbesc(NETWORK_DFRN)
+			DBA::escape(Protocol::DFRN)
 		);
 
-		if (DBM::is_result($r)) {
+		if (DBA::isResult($r)) {
 			$textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false);
 			foreach($r as $member) {
-				if(! in_array($member['id'],$ingroup)) {
+				if (!in_array($member['id'],$ingroup)) {
 					$member['click'] = 'profChangeMember(' . $profile['id'] . ',' . $member['id'] . '); return true;';
-					$o .= micropro($member,true,'mpprof',$textmode);
+					$o .= HTML::micropro($member,true,'mpprof',$textmode);
 				}
 			}
 		}
 
 		$o .= '</div><div id="prof-all-contacts-end"></div>';
 
-	if($change) {
+	if (!empty($change)) {
 		echo $o;
-		killme();
+		exit();
 	}
 	$o .= '</div>';
 	return $o;