X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=4120c136f177c009562fe385047b6ea82d59549c;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=9e64321f3ed52d2bc295c9cbcfa0b1af54405f32;hpb=7d5494dd67f58e1fc63c6571946e26290092321c;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index 9e64321f3e..4120c136f1 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -11,15 +11,15 @@ 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; use Friendica\Util\Security; -require_once 'include/items.php'; - function videos_init(App $a) { if ($a->argc > 1) { @@ -32,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", @@ -61,41 +59,6 @@ function videos_init(App $a) '$pdesc' => defaults($profile, 'pdesc', ''), ]); - /// @TODO Old-lost code? - /*$sql_extra = Security::getPermissionsSQLByUserId($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'] = ''; @@ -150,25 +113,15 @@ 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()), - 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) - ); + if (Attach::exists(['id' => $video_id, 'uid' => local_user()])) { + // delete the attachment + Attach::delete(['id' => $video_id, 'uid' => local_user()]); - $i = q("SELECT `id` FROM `item` WHERE `attach` like '%%attach/%s%%' AND `uid` = %d LIMIT 1", - DBA::escape($video_id), - intval(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()); } $a->internalRedirect('videos/' . $a->data['user']['nickname']); @@ -195,8 +148,6 @@ function videos_content(App $a) return; } - require_once 'include/conversation.php'; - if (empty($a->data['user'])) { notice(L10n::t('No videos selected') . EOL ); return; @@ -211,19 +162,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 // @@ -235,7 +179,7 @@ function videos_content(App $a) $owner_uid = $a->data['user']['uid']; - $community_page = (($a->data['user']['page-flags'] == Contact::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; @@ -257,7 +201,6 @@ function videos_content(App $a) if (DBA::isResult($r)) { $can_post = true; - $contact = $r[0]; $remote_contact = true; $visitor = $contact_id; } @@ -287,17 +230,11 @@ 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;