X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=c6f342aa70c332bf7ce1762017577e34d159d8a2;hb=8e6973b774efeff5dd381e8984c22171c6a14c31;hp=fd40e79c90dcf6c390b18620315ff0d06c7dbe58;hpb=1c26baec466171e6d4d8bbefb5924eb9ba775c63;p=friendica.git

diff --git a/mod/videos.php b/mod/videos.php
index fd40e79c90..c6f342aa70 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -12,6 +12,7 @@ use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Attach;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
@@ -23,7 +24,7 @@ use Friendica\Util\Security;
 
 function videos_init(App $a)
 {
-	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+	if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
 		return;
 	}
 
@@ -51,9 +52,9 @@ function videos_init(App $a)
 		$vcard_widget = Renderer::replaceMacros($tpl, [
 			'$name' => $profile['name'],
 			'$photo' => $profile['photo'],
-			'$addr' => defaults($profile, 'addr', ''),
+			'$addr' => $profile['addr'] ?? '',
 			'$account_type' => $account_type,
-			'$pdesc' => defaults($profile, 'pdesc', ''),
+			'$pdesc' => $profile['pdesc'] ?? '',
 		]);
 
 		// If not there, create 'aside' empty
@@ -75,7 +76,7 @@ function videos_post(App $a)
 	$owner_uid = $a->data['user']['uid'];
 
 	if (local_user() != $owner_uid) {
-		$a->internalRedirect('videos/' . $a->data['user']['nickname']);
+		DI::baseUrl()->redirect('videos/' . $a->data['user']['nickname']);
 	}
 
 	if (($a->argc == 2) && !empty($_POST['delete']) && !empty($_POST['id'])) {
@@ -92,11 +93,11 @@ function videos_post(App $a)
 			], local_user());
 		}
 
-		$a->internalRedirect('videos/' . $a->data['user']['nickname']);
+		DI::baseUrl()->redirect('videos/' . $a->data['user']['nickname']);
 		return; // NOTREACHED
 	}
 
-	$a->internalRedirect('videos/' . $a->data['user']['nickname']);
+	DI::baseUrl()->redirect('videos/' . $a->data['user']['nickname']);
 }
 
 function videos_content(App $a)
@@ -111,7 +112,7 @@ function videos_content(App $a)
 	// videos/name/video/xxxxx/edit
 
 
-	if (Config::get('system', 'block_public') && !local_user() && !remote_user()) {
+	if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
 		notice(L10n::t('Public access denied.') . EOL);
 		return;
 	}