X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=020e5f6cb10c900ca56037b3de87a5696b2e47ca;hb=28c9bc871c12d25dd4112acd822e5ed92b1d5fcd;hp=ad3a27b00362c4180161c0793b7365dd0ce478c3;hpb=b852e5842bffcc1df1e5ac5d356fd9f19b7af499;p=friendica.git

diff --git a/mod/videos.php b/mod/videos.php
index ad3a27b003..020e5f6cb1 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,13 +1,28 @@
 <?php
 /**
- * @file mod/videos.php
+ * @copyright Copyright (C) 2010-2021, the Friendica project
+ *
+ * @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\Core\Config;
-use Friendica\Core\L10n;
+use Friendica\Content\Text\BBCode;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
@@ -17,11 +32,12 @@ 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)
 {
-	if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
+	if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
 		return;
 	}
 
@@ -44,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
@@ -109,13 +125,13 @@ function videos_content(App $a)
 	// videos/name/video/xxxxx/edit
 
 
-	if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
-		notice(L10n::t('Public access denied.') . EOL);
+	if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
+		notice(DI::l10n()->t('Public access denied.'));
 		return;
 	}
 
 	if (empty($a->data['user'])) {
-		notice(L10n::t('No videos selected') . EOL );
+		notice(DI::l10n()->t('No videos selected') . EOL );
 		return;
 	}
 
@@ -163,7 +179,7 @@ function videos_content(App $a)
 	}
 
 	if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && !$remote_contact) {
-		notice(L10n::t('Access to this item is restricted.') . EOL);
+		notice(DI::l10n()->t('Access to this item is restricted.'));
 		return;
 	}
 
@@ -173,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
@@ -209,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`
@@ -233,14 +249,14 @@ function videos_content(App $a)
 			$videos[] = [
 				'id'       => $rr['id'],
 				'link'     => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'],
-				'title'    => L10n::t('View Video'),
+				'title'    => DI::l10n()->t('View Video'),
 				'src'      => DI::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
 				'alt'      => $alt_e,
 				'mime'     => $rr['filetype'],
 				'album' => [
 					'link'  => DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
 					'name'  => $name_e,
-					'alt'   => L10n::t('View Album'),
+					'alt'   => DI::l10n()->t('View Album'),
 				],
 			];
 		}
@@ -248,9 +264,9 @@ function videos_content(App $a)
 
 	$tpl = Renderer::getMarkupTemplate('videos_recent.tpl');
 	$o .= Renderer::replaceMacros($tpl, [
-		'$title'      => L10n::t('Recent Videos'),
+		'$title'      => DI::l10n()->t('Recent Videos'),
 		'$can_post'   => $can_post,
-		'$upload'     => [L10n::t('Upload New Videos'), DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'],
+		'$upload'     => [DI::l10n()->t('Upload New Videos'), DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'],
 		'$videos'     => $videos,
 		'$delete_url' => (($can_post) ? DI::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false)
 	]);