X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=52b5eb9f90f076a7fb1508e4393d7fe783e3405b;hb=da30538a980264da72a7c370013e60b2cb55aafa;hp=9e5f022d1bf12f398512603da6d53120a426f830;hpb=dbf7c7d9ad697f7951f102c8372e7d65c167de96;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 9e5f022d1b..52b5eb9f90 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -145,9 +145,7 @@ function dfrn_request_post(App $a) {
 					$photo = $parms["photo"];
 
 					// Escape the entire array
-
-					dbesc_array($parms);
-
+					dbm::esc_array($parms);
 
 					/*
 					 * Create a contact record on our site for the other person
@@ -303,7 +301,7 @@ function dfrn_request_post(App $a) {
 		if (dbm::is_result($r)) {
 			foreach ($r as $rr) {
 				if(! $rr['rel']) {
-					q("DELETE FROM `contact` WHERE `id` = %d",
+					q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
 						intval($rr['cid'])
 					);
 				}
@@ -328,7 +326,7 @@ function dfrn_request_post(App $a) {
 		if (dbm::is_result($r)) {
 			foreach ($r as $rr) {
 				if(! $rr['rel']) {
-					q("DELETE FROM `contact` WHERE `id` = %d",
+					q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
 						intval($rr['cid'])
 					);
 				}
@@ -547,7 +545,7 @@ function dfrn_request_post(App $a) {
 				$parms['issued-id'] = $issued_id;
 				$photo = $parms["photo"];
 
-				dbesc_array($parms);
+				dbm::esc_array($parms);
 				$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `name`, `nick`, `issued-id`, `photo`, `site-pubkey`,
 					`request`, `confirm`, `notify`, `poll`, `poco`, `network`, `blocked`, `pending` )
 					VALUES ( %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d )",