Merge pull request #9843 from annando/no-filetag

[friendica.git] / mod / videos.php

diff --git a/mod/videos.php b/mod/videos.php
index a7181d4e78aade725eac94e3b57adfc5d2c75393..1ba566eeaab78d4fbb6158c1a0a7667bc1adf25a 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,11 +1,28 @@
 <?php
 /**
- * @file mod/videos.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 use Friendica\App;
 use Friendica\Content\Nav;
 use Friendica\Content\Pager;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -15,7 +32,8 @@ use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Model\User;
-use Friendica\Util\Security;
+use Friendica\Module\BaseProfile;
+use Friendica\Security\Security;
 
 function videos_init(App $a)
 {
@@ -42,14 +60,14 @@ function videos_init(App $a)
 
                $account_type = Contact::getAccountType($profile);
 
-               $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl");
+               $tpl = Renderer::getMarkupTemplate('widget/vcard.tpl');
 
                $vcard_widget = Renderer::replaceMacros($tpl, [
                        '$name' => $profile['name'],
                        '$photo' => $profile['photo'],
                        '$addr' => $profile['addr'] ?? '',
                        '$account_type' => $account_type,
-                       '$pdesc' => $profile['pdesc'] ?? '',
+                       '$about' => BBCode::convert($profile['about']),
                ]);
 
                // If not there, create 'aside' empty
@@ -108,7 +126,7 @@ function videos_content(App $a)
 
 
        if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
-               notice(DI::l10n()->t('Public access denied.') . EOL);
+               notice(DI::l10n()->t('Public access denied.'));
                return;
        }
 
@@ -161,7 +179,7 @@ function videos_content(App $a)
        }
 
        if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
-               notice(DI::l10n()->t('Access to this item is restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this item is restricted.'));
                return;
        }
 
@@ -171,7 +189,7 @@ function videos_content(App $a)
 
        // tabs
        $_is_owner = (local_user() && (local_user() == $owner_uid));
-       $o .= Profile::getTabs($a, 'videos', $_is_owner, $a->data['user']['nickname']);
+       $o .= BaseProfile::getTabsHTML($a, 'videos', $_is_owner, $a->data['user']['nickname']);
 
        //
        // dispatch request
@@ -207,7 +225,7 @@ function videos_content(App $a)
                $total = count($r);
        }
 
-       $pager = new Pager(DI::args()->getQueryString(), 20);
+       $pager = new Pager(DI::l10n(), 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`