X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=9e19ecf11744d4d53da9b6d163095007919b2e52;hb=b2d685482928363ce86c3c0519c8ff39d0af43ca;hp=b0f8868d550ea788ea1c2567a99f344df0bb606f;hpb=1213fce8e596a27af9de4be308d05d28da626982;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index b0f8868d55..9e19ecf117 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -5,18 +5,20 @@ use Friendica\App; use Friendica\Content\Nav; +use Friendica\Content\Pager; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; +use Friendica\Model\Attach; use Friendica\Model\Contact; use Friendica\Model\Group; use Friendica\Model\Item; use Friendica\Model\Profile; +use Friendica\Model\User; use Friendica\Protocol\DFRN; - -require_once 'include/items.php'; -require_once 'include/security.php'; +use Friendica\Util\Security; function videos_init(App $a) { @@ -30,8 +32,6 @@ function videos_init(App $a) Nav::setSelected('home'); - $o = ''; - if ($a->argc > 1) { $nick = $a->argv[1]; $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", @@ -49,9 +49,9 @@ function videos_init(App $a) $account_type = Contact::getAccountType($profile); - $tpl = get_markup_template("vcard-widget.tpl"); + $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl"); - $vcard_widget = replace_macros($tpl, [ + $vcard_widget = Renderer::replaceMacros($tpl, [ '$name' => $profile['name'], '$photo' => $profile['photo'], '$addr' => defaults($profile, 'addr', ''), @@ -59,41 +59,6 @@ function videos_init(App $a) '$pdesc' => defaults($profile, 'pdesc', ''), ]); - /// @TODO Old-lost code? - /*$sql_extra = permissions_sql($a->data['user']['uid']); - - $albums = q("SELECT distinct(`album`) AS `album` FROM `photo` WHERE `uid` = %d $sql_extra order by created desc", - intval($a->data['user']['uid']) - ); - - if(count($albums)) { - $a->data['albums'] = $albums; - - $albums_visible = ((intval($a->data['user']['hidewall']) && (!local_user()) && (!remote_user())) ? false : true); - - if($albums_visible) { - $o .= ''; - }*/ - // If not there, create 'aside' empty if (!isset($a->page['aside'])) { $a->page['aside'] = ''; @@ -101,16 +66,8 @@ function videos_init(App $a) $a->page['aside'] .= $vcard_widget; - $tpl = get_markup_template("videos_head.tpl"); - $a->page['htmlhead'] .= replace_macros($tpl,[ - '$baseurl' => System::baseUrl(), - ]); - - $tpl = get_markup_template("videos_end.tpl"); - $a->page['end'] .= replace_macros($tpl,[ - '$baseurl' => System::baseUrl(), - ]); - + $tpl = Renderer::getMarkupTemplate("videos_head.tpl"); + $a->page['htmlhead'] .= Renderer::replaceMacros($tpl); } return; @@ -121,65 +78,28 @@ function videos_post(App $a) $owner_uid = $a->data['user']['uid']; if (local_user() != $owner_uid) { - goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); + $a->internalRedirect('videos/' . $a->data['user']['nickname']); } if (($a->argc == 2) && !empty($_POST['delete']) && !empty($_POST['id'])) { - // Check if we should do HTML-based delete confirmation - if (empty($_REQUEST['confirm'])) { - if (!empty($_REQUEST['canceled'])) { - goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); - } - - $drop_url = $a->query_string; - - $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [ - '$method' => 'post', - '$message' => L10n::t('Do you really want to delete this video?'), - '$extra_inputs' => [ - ['name' => 'id' , 'value' => $_POST['id']], - ['name' => 'delete', 'value' => 'x'] - ], - '$confirm' => L10n::t('Delete Video'), - '$confirm_url' => $drop_url, - '$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement - '$cancel' => L10n::t('Cancel'), - - ]); - - $a->error = 1; // Set $a->error so the other module functions don't execute - - return; - } - $video_id = $_POST['id']; - $r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1", - intval(local_user()), - DBA::escape($video_id) - ); - - if (DBA::isResult($r)) { - q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'", - intval(local_user()), - DBA::escape($video_id) - ); - - $i = q("SELECT `id` FROM `item` WHERE `attach` like '%%attach/%s%%' AND `uid` = %d LIMIT 1", - DBA::escape($video_id), - intval(local_user()) - ); + if (Attach::exists(['id' => $video_id, 'uid' => local_user()])) { + // delete the attachment + Attach::delete(['id' => $video_id, 'uid' => local_user()]); - if (DBA::isResult($i)) { - Item::deleteForUser(['id' => $i[0]['id']], local_user()); - } + // delete items where the attach is used + Item::deleteForUser(['`attach` LIKE ? AND `uid` = ?', + '%attach/' . $video_id . '%', + local_user() + ], local_user()); } - goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); + $a->internalRedirect('videos/' . $a->data['user']['nickname']); return; // NOTREACHED } - goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); + $a->internalRedirect('videos/' . $a->data['user']['nickname']); } function videos_content(App $a) @@ -199,9 +119,6 @@ function videos_content(App $a) return; } - require_once 'include/security.php'; - require_once 'include/conversation.php'; - if (empty($a->data['user'])) { notice(L10n::t('No videos selected') . EOL ); return; @@ -216,19 +133,12 @@ function videos_content(App $a) // if ($a->argc > 3) { $datatype = $a->argv[2]; - $datum = $a->argv[3]; } elseif(($a->argc > 2) && ($a->argv[2] === 'upload')) { $datatype = 'upload'; } else { $datatype = 'summary'; } - if ($a->argc > 4) { - $cmd = $a->argv[4]; - } else { - $cmd = 'view'; - } - // // Setup permissions structures // @@ -240,7 +150,7 @@ function videos_content(App $a) $owner_uid = $a->data['user']['uid']; - $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false); + $community_page = (($a->data['user']['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? true : false); if ((local_user()) && (local_user() == $owner_uid)) { $can_post = true; @@ -262,7 +172,6 @@ function videos_content(App $a) if (DBA::isResult($r)) { $can_post = true; - $contact = $r[0]; $remote_contact = true; $visitor = $contact_id; } @@ -274,6 +183,7 @@ 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)) { $contact_id = 0; + if (!empty($_SESSION['remote'])) { foreach($_SESSION['remote'] as $v) { if($v['uid'] == $owner_uid) { @@ -291,29 +201,23 @@ function videos_content(App $a) ); if (DBA::isResult($r)) { - $contact = $r[0]; $remote_contact = true; } } } - if (!$remote_contact && local_user()) { - $contact_id = $_SESSION['cid']; - $contact = $a->contact; - } - if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (!$remote_contact)) { notice(L10n::t('Access to this item is restricted.') . EOL); return; } - $sql_extra = permissions_sql($owner_uid, $remote_contact, $groups); + $sql_extra = Security::getPermissionsSQLByUserId($owner_uid, $remote_contact, $groups); $o = ""; // tabs $_is_owner = (local_user() && (local_user() == $owner_uid)); - $o .= Profile::getTabs($a, $_is_owner, $a->data['user']['nickname']); + $o .= Profile::getTabs($a, 'videos', $_is_owner, $a->data['user']['nickname']); // // dispatch request @@ -340,24 +244,25 @@ function videos_content(App $a) // Default - show recent videos (no upload link for now) //$o = ''; + $total = 0; $r = q("SELECT hash FROM `attach` WHERE `uid` = %d AND filetype LIKE '%%video%%' $sql_extra GROUP BY hash", intval($a->data['user']['uid']) ); - if (DBA::isResult($r)) { - $a->set_pager_total(count($r)); - $a->set_pager_itemspage(20); + $total = count($r); } + $pager = new Pager($a->query_string, 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` 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']), - intval($a->pager['start']), - intval($a->pager['itemspage']) + $pager->getStart(), + $pager->getItemsPerPage() ); $videos = []; @@ -365,11 +270,13 @@ function videos_content(App $a) if (DBA::isResult($r)) { foreach ($r as $rr) { $alt_e = $rr['filename']; + /// @todo The album isn't part of the above query. This seems to be some unfinished code that needs to be reworked completely. + $rr['album'] = ''; $name_e = $rr['album']; $videos[] = [ 'id' => $rr['id'], - 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'], + 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['hash'], 'title' => L10n::t('View Video'), 'src' => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0', 'alt' => $alt_e, @@ -383,8 +290,8 @@ function videos_content(App $a) } } - $tpl = get_markup_template('videos_recent.tpl'); - $o .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('videos_recent.tpl'); + $o .= Renderer::replaceMacros($tpl, [ '$title' => L10n::t('Recent Videos'), '$can_post' => $can_post, '$upload' => [L10n::t('Upload New Videos'), System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'], @@ -392,7 +299,7 @@ function videos_content(App $a) '$delete_url' => (($can_post) ? System::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false) ]); - $o .= paginate($a); + $o .= $pager->renderFull($total); return $o; }