X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=09b44151d889964ae10a8e39c32414ebbf8e1393;hb=9f2196aa1aa0dc112e3fc238832828d4e22fe137;hp=19d5ce9402b17ba448508e3f21c89d0dca84e8a1;hpb=0cd241bcbe762e38e2eba0c58800eb60a2240e36;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index 19d5ce9402..09b44151d8 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -1,17 +1,20 @@ argc > 1) + if($a->argc > 1) auto_redir($a, $a->argv[1]); - if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { return; } @@ -19,15 +22,14 @@ function videos_init(App $a) { $o = ''; - if ($a->argc > 1) { + if($a->argc > 1) { $nick = $a->argv[1]; $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", dbesc($nick) ); - if (!dbm::is_result($user)) { + if(! count($user)) return; - } $a->data['user'] = $user[0]; $a->profile_uid = $user[0]['uid']; @@ -53,47 +55,47 @@ function videos_init(App $a) { intval($a->data['user']['uid']) ); - if (count($albums)) { + if(count($albums)) { $a->data['albums'] = $albums; $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true); - if ($albums_visible) { + if($albums_visible) { $o .= ''; }*/ - if (! x($a->page,'aside')) + if(! x($a->page,'aside')) $a->page['aside'] = ''; $a->page['aside'] .= $vcard_widget; $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(), )); } @@ -108,7 +110,7 @@ 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')) { @@ -116,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; @@ -164,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']) { @@ -173,11 +175,11 @@ 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']); } @@ -195,7 +197,7 @@ function videos_content(App $a) { // videos/name/video/xxxxx/edit - if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -205,7 +207,7 @@ function videos_content(App $a) { require_once('include/security.php'); require_once('include/conversation.php'); - if (! x($a->data,'user')) { + if(! x($a->data,'user')) { notice( t('No videos selected') . EOL ); return; } @@ -218,16 +220,16 @@ function videos_content(App $a) { // Parse arguments // - if ($a->argc > 3) { + if($a->argc > 3) { $datatype = $a->argv[2]; $datum = $a->argv[3]; } - elseif (($a->argc > 2) && ($a->argv[2] === 'upload')) + elseif(($a->argc > 2) && ($a->argv[2] === 'upload')) $datatype = 'upload'; else $datatype = 'summary'; - if ($a->argc > 4) + if($a->argc > 4) $cmd = $a->argv[4]; else $cmd = 'view'; @@ -246,19 +248,19 @@ function videos_content(App $a) { $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false); - if ((local_user()) && (local_user() == $owner_uid)) + if((local_user()) && (local_user() == $owner_uid)) $can_post = true; else { - if ($community_page && remote_user()) { - if (is_array($_SESSION['remote'])) { - foreach ($_SESSION['remote'] as $v) { - if ($v['uid'] == $owner_uid) { + if($community_page && remote_user()) { + if(is_array($_SESSION['remote'])) { + foreach($_SESSION['remote'] as $v) { + if($v['uid'] == $owner_uid) { $contact_id = $v['cid']; break; } } } - if ($contact_id) { + if($contact_id) { $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), @@ -276,17 +278,17 @@ function videos_content(App $a) { // perhaps they're visiting - but not a community page, so they wouldn't have write access - if (remote_user() && (! $visitor)) { + if(remote_user() && (! $visitor)) { $contact_id = 0; - if (is_array($_SESSION['remote'])) { - foreach ($_SESSION['remote'] as $v) { - if ($v['uid'] == $owner_uid) { + if(is_array($_SESSION['remote'])) { + foreach($_SESSION['remote'] as $v) { + if($v['uid'] == $owner_uid) { $contact_id = $v['cid']; break; } } } - if ($contact_id) { + if($contact_id) { $groups = init_groups_visitor($contact_id); $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), @@ -299,14 +301,14 @@ function videos_content(App $a) { } } - if (! $remote_contact) { - if (local_user()) { + if(! $remote_contact) { + if(local_user()) { $contact_id = $_SESSION['cid']; $contact = $a->contact; } } - if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) { + if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) { notice( t('Access to this item is restricted.') . EOL); return; } @@ -324,13 +326,13 @@ function videos_content(App $a) { // - if ($datatype === 'upload') { + if($datatype === 'upload') { return; // no uploading for now // DELETED -- look at mod/photos.php if you want to implement } - if ($datatype === 'album') { + if($datatype === 'album') { return; // no albums for now @@ -338,7 +340,7 @@ function videos_content(App $a) { } - if ($datatype === 'video') { + if($datatype === 'video') { return; // no single video view for now @@ -357,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']), @@ -381,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'), ), @@ -400,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) ));