X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fdfrn_request.php;h=38a3f310acc2b2839825033f8ac40b1190b3260b;hb=b9dba631aadf6c25a97b679808c684276b3dd76a;hp=f7dc5f55cdabd77952269ccbd60c84ff936f4c6f;hpb=e944d7bed6b971494bff82396960d280e6a82cca;p=friendica.git

diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index f7dc5f55cd..38a3f310ac 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -335,19 +335,19 @@ function dfrn_request_post(App $a)
 				$url = Network::isUrlValid($url);
 				if (!$url) {
 					notice(L10n::t('Invalid profile URL.') . EOL);
-					DI::baseUrl()->redirect($a->cmd);
+					DI::baseUrl()->redirect(DI::args()->getCommand());
 					return; // NOTREACHED
 				}
 
 				if (!Network::isUrlAllowed($url)) {
 					notice(L10n::t('Disallowed profile URL.') . EOL);
-					DI::baseUrl()->redirect($a->cmd);
+					DI::baseUrl()->redirect(DI::args()->getCommand());
 					return; // NOTREACHED
 				}
 
 				if (Network::isUrlBlocked($url)) {
 					notice(L10n::t('Blocked domain') . EOL);
-					DI::baseUrl()->redirect($a->cmd);
+					DI::baseUrl()->redirect(DI::args()->getCommand());
 					return; // NOTREACHED
 				}
 
@@ -355,7 +355,7 @@ function dfrn_request_post(App $a)
 
 				if (!count($parms)) {
 					notice(L10n::t('Profile location is not valid or does not contain profile information.') . EOL);
-					DI::baseUrl()->redirect($a->cmd);
+					DI::baseUrl()->redirect(DI::args()->getCommand());
 				} else {
 					if (empty($parms['fn'])) {
 						notice(L10n::t('Warning: profile location has no identifiable owner name.') . EOL);
@@ -559,7 +559,7 @@ function dfrn_request_content(App $a)
 						'to_name'      => $r[0]['username'],
 						'to_email'     => $r[0]['email'],
 						'uid'          => $r[0]['uid'],
-						'link'         => System::baseUrl() . '/notifications/intros',
+						'link'         => DI::baseUrl() . '/notifications/intros',
 						'source_name'  => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : L10n::t('[Name Withheld]')),
 						'source_link'  => $r[0]['url'],
 						'source_photo' => $r[0]['photo'],
@@ -611,16 +611,16 @@ function dfrn_request_content(App $a)
 			$myaddr = $_GET['address'];
 		} elseif (local_user()) {
 			if (strlen(DI::baseUrl()->getUrlPath())) {
-				$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
+				$myaddr = DI::baseUrl() . '/profile/' . $a->user['nickname'];
 			} else {
-				$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+				$myaddr = $a->user['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 			}
 		} else {
 			// last, try a zrl
 			$myaddr = Profile::getMyURL();
 		}
 
-		$target_addr = $a->profile['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
+		$target_addr = $a->profile['nickname'] . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
 
 		/* The auto_request form only has the profile address
 		 * because nobody is going to read the comments and