X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fvideos.php;h=09b44151d889964ae10a8e39c32414ebbf8e1393;hb=10ede7314136edb1c475e1af546a59ff4c5648cf;hp=433ce5fc63f82e2e150b7b7c9ce87325553ba50e;hpb=4f25396faeaa501907e93b24ee51ebdd08f84993;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index 433ce5fc63..09b44151d8 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -1,12 +1,15 @@ argc > 1) auto_redir($a, $a->argv[1]); @@ -59,7 +62,7 @@ function videos_init(App &$a) { if($albums_visible) { $o .= '
'; @@ -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,12 +105,12 @@ 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')) { @@ -115,7 +118,7 @@ function videos_post(App &$a) { // Check if we should do HTML-based delete confirmation 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; @@ -163,7 +166,7 @@ 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']) { @@ -172,17 +175,17 @@ function videos_post(App &$a) { } } - 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']), @@ -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,9 +404,9 @@ 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) ));