X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fdfrn_request.php;h=3c7584318690b8f62d432010221ac9c252a2d961;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=067700641d7f74dc5112a75901a8abf4fb312899;hpb=5adfeb0bd5fed2f793332056c03bb7c043d5fc69;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 067700641d..3c75843186 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * @file mod/dfrn_request.php
  * @brief Module: dfrn_request
@@ -11,21 +10,23 @@
  *    You also find a graphic which describes the confirmation process at
  *    https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_request.png
  */
-
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
 use Friendica\Core\System;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
+use Friendica\Object\Contact;
 
 require_once 'include/enotify.php';
-require_once 'include/probe.php';
 require_once 'include/group.php';
 
-function dfrn_request_init(App $a) {
-
-	if($a->argc > 1)
+function dfrn_request_init(App $a)
+{
+	if ($a->argc > 1)
 		$which = $a->argv[1];
 
-	profile_load($a,$which);
+	profile_load($a, $which);
 	return;
 }
 
@@ -94,7 +95,7 @@ function dfrn_request_post(App $a) {
 					dbesc(normalise_link($dfrn_url))
 				);
 
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					if(strlen($r[0]['dfrn-id'])) {
 
 						/*
@@ -148,7 +149,7 @@ function dfrn_request_post(App $a) {
 					$photo = $parms["photo"];
 
 					// Escape the entire array
-					dbm::esc_array($parms);
+					DBM::esc_array($parms);
 
 					/*
 					 * Create a contact record on our site for the other person
@@ -188,13 +189,13 @@ function dfrn_request_post(App $a) {
 					dbesc($dfrn_url),
 					$parms['key'] // this was already escaped
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$def_gid = get_default_group(local_user(), $r[0]["network"]);
 					if(intval($def_gid))
 						group_add_member(local_user(), '', $r[0]['id'], $def_gid);
 
 					if (isset($photo))
-						update_contact_avatar($photo, local_user(), $r[0]["id"], true);
+						Contact::updateAvatar($photo, local_user(), $r[0]["id"], true);
 
 					$forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
 				} else {
@@ -279,7 +280,7 @@ function dfrn_request_post(App $a) {
 				dbesc(datetime_convert('UTC','UTC','now - 24 hours')),
 				intval($uid)
 			);
-			if (dbm::is_result($r) && count($r) > $maxreq) {
+			if (DBM::is_result($r) && count($r) > $maxreq) {
 				notice( sprintf( t('%s has received too many connection requests today.'),  $a->profile['name']) . EOL);
 				notice( t('Spam protection measures have been invoked.') . EOL);
 				notice( t('Friends are advised to please try again in 24 hours.') . EOL);
@@ -301,7 +302,7 @@ function dfrn_request_post(App $a) {
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ",
 			dbesc(NETWORK_MAIL2)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
@@ -326,7 +327,7 @@ function dfrn_request_post(App $a) {
 			AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 3 DAY ",
 			dbesc(NETWORK_MAIL2)
 		);
-		if (dbm::is_result($r)) {
+		if (DBM::is_result($r)) {
 			foreach ($r as $rr) {
 				if(! $rr['rel']) {
 					q("DELETE FROM `contact` WHERE `id` = %d AND NOT `self`",
@@ -367,8 +368,8 @@ function dfrn_request_post(App $a) {
 			$network = NETWORK_MAIL2;
 			$rel     = CONTACT_IS_FOLLOWER;
 
-			$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
-			if(get_config('system','dfrn_only'))
+			$mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
+			if(Config::get('system','dfrn_only'))
 				$mail_disabled = 1;
 
 			if(! $mail_disabled) {
@@ -377,7 +378,7 @@ function dfrn_request_post(App $a) {
 					intval($uid)
 				);
 
-				if (! dbm::is_result($r)) {
+				if (! DBM::is_result($r)) {
 					notice( t('This account has not been configured for email. Request failed.') . EOL);
 					return;
 				}
@@ -404,7 +405,7 @@ function dfrn_request_post(App $a) {
 				dbesc($poll),
 				intval($uid)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$contact_id = $r[0]['id'];
 
 				$def_gid = get_default_group($uid, $r[0]["network"]);
@@ -452,7 +453,7 @@ function dfrn_request_post(App $a) {
 
 		} else {
 			// Detect the network
-			$data = probe_url($url);
+			$data = Probe::uri($url);
 			$network = $data["network"];
 
 			// Canonicalise email-style profile locator
@@ -479,7 +480,7 @@ function dfrn_request_post(App $a) {
 				dbesc($url)
 			);
 
-			if (dbm::is_result($ret)) {
+			if (DBM::is_result($ret)) {
 				if(strlen($ret[0]['issued-id'])) {
 					notice( t('You have already introduced yourself here.') . EOL );
 					return;
@@ -551,7 +552,7 @@ function dfrn_request_post(App $a) {
 				$parms['issued-id'] = $issued_id;
 				$photo = $parms["photo"];
 
-				dbm::esc_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 )",
@@ -583,9 +584,9 @@ function dfrn_request_post(App $a) {
 						$parms['url'],
 						$parms['issued-id']
 					);
-					if (dbm::is_result($r)) {
+					if (DBM::is_result($r)) {
 						$contact_record = $r[0];
-						update_contact_avatar($photo, $uid, $contact_record["id"], true);
+						Contact::updateAvatar($photo, $uid, $contact_record["id"], true);
 					}
 				}
 
@@ -734,7 +735,7 @@ function dfrn_request_content(App $a) {
 			dbesc($_GET['confirm_key'])
 		);
 
-		if (dbm::is_result($intro)) {
+		if (DBM::is_result($intro)) {
 
 			$r = q("SELECT `contact`.*, `user`.* FROM `contact` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
 				WHERE `contact`.`id` = %d LIMIT 1",
@@ -743,7 +744,7 @@ function dfrn_request_content(App $a) {
 
 			$auto_confirm = false;
 
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				if(($r[0]['page-flags'] != PAGE_NORMAL) && ($r[0]['page-flags'] != PAGE_PRVGROUP))
 					$auto_confirm = true;
 
@@ -773,7 +774,7 @@ function dfrn_request_content(App $a) {
 						'dfrn_id'  => $r[0]['issued-id'],
 						'intro_id' => $intro[0]['id'],
 						'duplex'   => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0),
-						'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend'))
+						'activity' => intval(PConfig::get($r[0]['uid'],'system','post_newfriend'))
 					);
 					dfrn_confirm_post($a,$handsfree);
 				}
@@ -800,8 +801,8 @@ function dfrn_request_content(App $a) {
 		 * Normal web request. Display our user's introduction form.
 		 */
 
-		if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-			if(! get_config('system','local_block')) {
+		if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+			if(! Config::get('system','local_block')) {
 				notice( t('Public access denied.') . EOL);
 				return;
 			}
@@ -850,9 +851,9 @@ function dfrn_request_content(App $a) {
 
 		// see if we are allowed to have NETWORK_MAIL2 contacts
 
-		$mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+		$mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1);
 
-		if (get_config('system','dfrn_only')) {
+		if (Config::get('system','dfrn_only')) {
 			$mail_disabled = 1;
 		}
 
@@ -860,7 +861,7 @@ function dfrn_request_content(App $a) {
 			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
 				intval($a->profile['uid'])
 			);
-			if (! dbm::is_result($r)) {
+			if (! DBM::is_result($r)) {
 				$mail_disabled = 1;
 			}
 		}