Move PConfig::load() to DI::pConfig()->load()

[friendica.git] / mod / videos.php

diff --git a/mod/videos.php b/mod/videos.php
index 6ff4236a1bdca54aa959c5d77f5da0d8806450c6..ad3a27b00362c4180161c0793b7365dd0ce478c3 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -9,20 +9,19 @@ use Friendica\Content\Pager;
 use Friendica\Core\Config;
 use Friendica\Core\L10n;
 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;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Protocol\DFRN;
 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;
        }
 
@@ -50,20 +49,20 @@ 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
-               if (!isset($a->page['aside'])) {
-                       $a->page['aside'] = '';
+               if (!isset(DI::page()['aside'])) {
+                       DI::page()['aside'] = '';
                }
 
-               $a->page['aside'] .= $vcard_widget;
+               DI::page()['aside'] .= $vcard_widget;
 
                $tpl = Renderer::getMarkupTemplate("videos_head.tpl");
-               $a->page['htmlhead'] .= Renderer::replaceMacros($tpl);
+               DI::page()['htmlhead'] .= Renderer::replaceMacros($tpl);
        }
 
        return;
@@ -74,7 +73,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'])) {
@@ -91,11 +90,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)
@@ -110,7 +109,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;
        }
@@ -122,7 +121,7 @@ function videos_content(App $a)
 
        //$phototypes = Photo::supportedTypes();
 
-       $_SESSION['video_return'] = $a->cmd;
+       $_SESSION['video_return'] = DI::args()->getCommand();
 
        //
        // Parse arguments
@@ -150,16 +149,16 @@ function videos_content(App $a)
 
        if ((local_user()) && (local_user() == $owner_uid)) {
                $can_post = true;
-       } elseif ($community_page && !empty(remote_user($owner_uid))) {
-               $contact_id = remote_user($owner_uid);
+       } elseif ($community_page && !empty(Session::getRemoteContactID($owner_uid))) {
+               $contact_id = Session::getRemoteContactID($owner_uid);
                $can_post = true;
                $remote_contact = true;
                $visitor = $contact_id;
        }
 
        // perhaps they're visiting - but not a community page, so they wouldn't have write access
-       if (!empty(remote_user($owner_uid)) && !$visitor) {
-               $contact_id = remote_user($owner_uid);
+       if (!empty(Session::getRemoteContactID($owner_uid)) && !$visitor) {
+               $contact_id = Session::getRemoteContactID($owner_uid);
                $remote_contact = true;
        }
 
@@ -210,7 +209,7 @@ function videos_content(App $a)
                $total = count($r);
        }
 
-       $pager = new Pager($a->query_string, 20);
+       $pager = new Pager(DI::args()->getQueryString(), 20);
 
        $r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`,
                ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype`
@@ -233,13 +232,13 @@ function videos_content(App $a)
 
                        $videos[] = [
                                'id'       => $rr['id'],
-                               'link'     => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'],
+                               'link'     => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'],
                                'title'    => L10n::t('View Video'),
-                               'src'      => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
+                               'src'      => DI::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
                                'alt'      => $alt_e,
                                'mime'     => $rr['filetype'],
                                'album' => [
-                                       'link'  => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+                                       'link'  => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
                                        'name'  => $name_e,
                                        'alt'   => L10n::t('View Album'),
                                ],
@@ -251,9 +250,9 @@ function videos_content(App $a)
        $o .= Renderer::replaceMacros($tpl, [
                '$title'      => L10n::t('Recent Videos'),
                '$can_post'   => $can_post,
-               '$upload'     => [L10n::t('Upload New Videos'), System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'],
+               '$upload'     => [L10n::t('Upload New Videos'), DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'],
                '$videos'     => $videos,
-               '$delete_url' => (($can_post) ? System::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false)
+               '$delete_url' => (($can_post) ? DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false)
        ]);
 
        $o .= $pager->renderFull($total);