X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=09b44151d889964ae10a8e39c32414ebbf8e1393;hb=9f2196aa1aa0dc112e3fc238832828d4e22fe137;hp=58c4b6c6508bb4f5adaba776da6551aa487b3c92;hpb=8ec5b06e0440302cef9f6bc2f35730fca5a9030e;p=friendica.git

diff --git a/mod/videos.php b/mod/videos.php
index 58c4b6c650..09b44151d8 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,12 +1,15 @@
 <?php
+
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
 require_once('include/security.php');
 require_once('include/redir.php');
 
-
-function videos_init(App &$a) {
+function videos_init(App $a) {
 
 	if($a->argc > 1)
 		auto_redir($a, $a->argv[1]);
@@ -59,7 +62,7 @@ function videos_init(App &$a) {
 
 			if($albums_visible) {
 				$o .= '<div id="sidebar-photos-albums" class="widget">';
-				$o .= '<h3>' . '<a href="' . App::get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
+				$o .= '<h3>' . '<a href="' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '">' . t('Photo Albums') . '</a></h3>';
 
 				$o .= '<ul>';
 				foreach($albums as $album) {
@@ -74,7 +77,7 @@ function videos_init(App &$a) {
 				$o .= '</ul>';
 			}
 			if(local_user() && $a->data['user']['uid'] == local_user()) {
-				$o .= '<div id="photo-albums-upload-link"><a href="' . App::get_baseurl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
+				$o .= '<div id="photo-albums-upload-link"><a href="' . System::baseUrl() . '/photos/' . $a->data['user']['nickname'] . '/upload" >' .t('Upload New Photos') . '</a></div>';
 			}
 
 			$o .= '</div>';
@@ -87,12 +90,12 @@ function videos_init(App &$a) {
 
 		$tpl = get_markup_template("videos_head.tpl");
 		$a->page['htmlhead'] .= replace_macros($tpl,array(
-			'$baseurl' => App::get_baseurl(),
+			'$baseurl' => System::baseUrl(),
 		));
 
 		$tpl = get_markup_template("videos_end.tpl");
 		$a->page['end'] .= replace_macros($tpl,array(
-			'$baseurl' => App::get_baseurl(),
+			'$baseurl' => System::baseUrl(),
 		));
 
 	}
@@ -102,20 +105,20 @@ function videos_init(App &$a) {
 
 
 
-function videos_post(App &$a) {
+function videos_post(App $a) {
 
 	$owner_uid = $a->data['user']['uid'];
 
 	if (local_user() != $owner_uid) {
-		goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+		goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 	}
 
 	if (($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
 
 		// Check if we should do HTML-based delete confirmation
-		if(!x($_REQUEST,'confirm')) {
+		if (!x($_REQUEST,'confirm')) {
 			if (x($_REQUEST,'canceled')) {
-				goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+				goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 			}
 
 			$drop_url = $a->query_string;
@@ -138,7 +141,6 @@ function videos_post(App &$a) {
 
 		$video_id = $_POST['id'];
 
-
 		$r = q("SELECT `id`  FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1",
 			intval(local_user()),
 			dbesc($video_id)
@@ -164,25 +166,26 @@ function videos_post(App &$a) {
 				create_tags_from_itemuri($i[0]['uri'], local_user());
 				delete_thread_uri($i[0]['uri'], local_user());
 
-				$url = App::get_baseurl();
+				$url = System::baseUrl();
 				$drop_id = intval($i[0]['id']);
 
-				if($i[0]['visible'])
+				if ($i[0]['visible']) {
 					proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+				}
 			}
 		}
 
-		goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+		goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 		return; // NOTREACHED
 	}
 
-	goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+	goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 
 }
 
 
 
-function videos_content(App &$a) {
+function videos_content(App $a) {
 
 	// URLs (most aren't currently implemented):
 	// videos/name
@@ -356,7 +359,9 @@ function videos_content(App &$a) {
 		$a->set_pager_itemspage(20);
 	}
 
-	$r = q("SELECT hash, `id`, `filename`, filetype FROM `attach`
+	$r = q("SELECT hash, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`created`) AS `created`,
+		ANY_VALUE(`filename`) AS `filename`, ANY_VALUE(`filetype`) as `filetype`
+		FROM `attach`
 		WHERE `uid` = %d AND filetype LIKE '%%video%%'
 		$sql_extra GROUP BY hash ORDER BY `created` DESC LIMIT %d , %d",
 		intval($a->data['user']['uid']),
@@ -368,8 +373,8 @@ function videos_content(App &$a) {
 
 	$videos = array();
 	if (dbm::is_result($r)) {
-		foreach($r as $rr) {
-			if($a->theme['template_engine'] === 'internal') {
+		foreach ($r as $rr) {
+			if ($a->theme['template_engine'] === 'internal') {
 				$alt_e = template_escape($rr['filename']);
 				$name_e = template_escape($rr['album']);
 			}
@@ -380,13 +385,13 @@ function videos_content(App &$a) {
 
 			$videos[] = array(
 				'id'       => $rr['id'],
-				'link'     => App::get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
+				'link'     => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
 				'title'    => t('View Video'),
-				'src'      => App::get_baseurl() . '/attach/' . $rr['id'] . '?attachment=0',
+				'src'      => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0',
 				'alt'      => $alt_e,
 				'mime'     => $rr['filetype'],
 				'album' => array(
-					'link'  => App::get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
+					'link'  => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
 					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
@@ -399,13 +404,12 @@ function videos_content(App &$a) {
 	$o .= replace_macros($tpl, array(
 		'$title'      => t('Recent Videos'),
 		'$can_post'   => $can_post,
-		'$upload'     => array(t('Upload New Videos'), App::get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'),
+		'$upload'     => array(t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'),
 		'$videos'     => $videos,
-		'$delete_url' => (($can_post)?App::get_baseurl().'/videos/'.$a->data['user']['nickname']:False)
+		'$delete_url' => (($can_post)?System::baseUrl().'/videos/'.$a->data['user']['nickname']:False)
 	));
 
 
 	$o .= paginate($a);
 	return $o;
 }
-