X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=39b212fbddc37a4847d51e09739dfc4ae9292739;hb=f22fe7118d52251dbd0898279ef078b797885ec4;hp=4efb4119e1c7df065ec6c29fd0091f00b1533149;hpb=6f6b029c4d8028ac0289a356b25807e7ab5ff32a;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 4efb4119e1..39b212fbdd 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -13,10 +13,13 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
 use Friendica\Network\Probe;
 
 require_once 'include/enotify.php';
-require_once 'include/probe.php';
 require_once 'include/group.php';
 
 function dfrn_request_init(App $a) {
@@ -53,7 +56,7 @@ function dfrn_request_post(App $a) {
 
 
 	if(x($_POST, 'cancel')) {
-		goaway(z_root());
+		goaway(System::baseUrl());
 	}
 
 
@@ -93,7 +96,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'])) {
 
 						/*
@@ -147,7 +150,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
@@ -187,7 +190,7 @@ 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);
@@ -195,9 +198,9 @@ function dfrn_request_post(App $a) {
 					if (isset($photo))
 						update_contact_avatar($photo, local_user(), $r[0]["id"], true);
 
-					$forwardurl = App::get_baseurl()."/contacts/".$r[0]['id'];
+					$forwardurl = System::baseUrl()."/contacts/".$r[0]['id'];
 				} else {
-					$forwardurl = App::get_baseurl()."/contacts";
+					$forwardurl = System::baseUrl()."/contacts";
 				}
 
 				/*
@@ -225,7 +228,7 @@ function dfrn_request_post(App $a) {
  		// invalid/bogus request
 
 		notice( t('Unrecoverable protocol error.') . EOL );
-		goaway(z_root());
+		goaway(System::baseUrl());
 		return; // NOTREACHED
 	}
 
@@ -278,7 +281,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);
@@ -300,7 +303,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`",
@@ -325,7 +328,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`",
@@ -366,8 +369,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) {
@@ -376,7 +379,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;
 				}
@@ -403,7 +406,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"]);
@@ -451,7 +454,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
@@ -478,7 +481,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;
@@ -506,19 +509,19 @@ function dfrn_request_post(App $a) {
 			else {
 				if (! validate_url($url)) {
 					notice( t('Invalid profile URL.') . EOL);
-					goaway(App::get_baseurl() . '/' . $a->cmd);
+					goaway(System::baseUrl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
 				if (! allowed_url($url)) {
 					notice( t('Disallowed profile URL.') . EOL);
-					goaway(App::get_baseurl() . '/' . $a->cmd);
+					goaway(System::baseUrl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
 				if (blocked_url($url)) {
 					notice( t('Blocked domain') . EOL);
-					goaway(App::get_baseurl() . '/' . $a->cmd);
+					goaway(System::baseUrl() . '/' . $a->cmd);
 					return; // NOTREACHED
 				}
 
@@ -526,7 +529,7 @@ function dfrn_request_post(App $a) {
 
 				if (! count($parms)) {
 					notice( t('Profile location is not valid or does not contain profile information.') . EOL );
-					goaway(App::get_baseurl() . '/' . $a->cmd);
+					goaway(System::baseUrl() . '/' . $a->cmd);
 				}
 				else {
 					if (! x($parms,'fn')) {
@@ -550,7 +553,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 )",
@@ -582,7 +585,7 @@ 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);
 					}
@@ -616,7 +619,7 @@ function dfrn_request_post(App $a) {
 
 			// "Homecoming" - send the requestor back to their site to record the introduction.
 
-			$dfrn_url = bin2hex(App::get_baseurl() . '/profile/' . $nickname);
+			$dfrn_url = bin2hex(System::baseUrl() . '/profile/' . $nickname);
 			$aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0);
 
 			goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url"
@@ -626,7 +629,7 @@ function dfrn_request_post(App $a) {
 			);
 			// NOTREACHED
 			// END $network === NETWORK_DFRN
-		} elseif (($network != NETWORK_PHANTOM) AND ($url != "")) {
+		} elseif (($network != NETWORK_PHANTOM) && ($url != "")) {
 
 			/*
 			 *
@@ -645,7 +648,7 @@ function dfrn_request_post(App $a) {
 
 				$uri = urlencode($uri);
 			} else {
-				$uri = App::get_baseurl().'/profile/'.$nickname;
+				$uri = System::baseUrl().'/profile/'.$nickname;
 			}
 
 			$url = str_replace('{uri}', $uri, $url);
@@ -693,7 +696,7 @@ function dfrn_request_content(App $a) {
 		$confirm_key = (x($_GET,'confirm_key') ? $_GET['confirm_key'] : "");
 
 		// Checking fastlane for validity
-		if (x($_SESSION, "fastlane") AND (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
+		if (x($_SESSION, "fastlane") && (normalise_link($_SESSION["fastlane"]) == normalise_link($dfrn_url))) {
 			$_POST["dfrn_url"] = $dfrn_url;
 			$_POST["confirm_key"] = $confirm_key;
 			$_POST["localconfirm"] = 1;
@@ -733,7 +736,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",
@@ -742,7 +745,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;
 
@@ -755,7 +758,7 @@ function dfrn_request_content(App $a) {
 						'to_name'      => $r[0]['username'],
 						'to_email'     => $r[0]['email'],
 						'uid'          => $r[0]['uid'],
-						'link'         => App::get_baseurl() . '/notifications/intros',
+						'link'         => System::baseUrl() . '/notifications/intros',
 						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')),
 						'source_link'  => $r[0]['url'],
 						'source_photo' => $r[0]['photo'],
@@ -772,7 +775,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);
 				}
@@ -799,8 +802,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;
 			}
@@ -813,22 +816,22 @@ function dfrn_request_content(App $a) {
 
 		// At first look if an address was provided
 		// Otherwise take the local address
-		if (x($_GET,'addr') AND ($_GET['addr'] != "")) {
+		if (x($_GET,'addr') && ($_GET['addr'] != "")) {
 			$myaddr = hex2bin($_GET['addr']);
-		} elseif (x($_GET,'address') AND ($_GET['address'] != "")) {
+		} elseif (x($_GET,'address') && ($_GET['address'] != "")) {
 			$myaddr = $_GET['address'];
 		} elseif (local_user()) {
 			if (strlen($a->path)) {
-				$myaddr = App::get_baseurl() . '/profile/' . $a->user['nickname'];
+				$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
 			} else {
-				$myaddr = $a->user['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
+				$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
 			}
 		} else {
 			// last, try a zrl
 			$myaddr = get_my_url();
 		}
 
-		$target_addr = $a->profile['nickname'] . '@' . substr(z_root(), strpos(z_root(),'://') + 3 );
+		$target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(),'://') + 3 );
 
 
 		/*
@@ -849,9 +852,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;
 		}
 
@@ -859,7 +862,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;
 			}
 		}