X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=a0c9d0d16edfeb8cd4e761a2784f02104b212799;hb=d72473fd512a63c2831b943834fae3efba3896b8;hp=ac7d0f34e51f107c4750f0a4b448d151e53335f9;hpb=407b2397cbb25a1de9252f16279dfdd786ffade1;p=friendica.git
diff --git a/mod/videos.php b/mod/videos.php
index ac7d0f34e5..a0c9d0d16e 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -2,29 +2,29 @@
/**
* @file mod/videos.php
*/
+
use Friendica\App;
use Friendica\Content\Nav;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\System;
-use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
use Friendica\Model\Group;
+use Friendica\Model\Item;
use Friendica\Model\Profile;
use Friendica\Protocol\DFRN;
require_once 'include/items.php';
-require_once 'include/acl_selectors.php';
-require_once 'include/bbcode.php';
require_once 'include/security.php';
-function videos_init(App $a) {
-
- if($a->argc > 1)
+function videos_init(App $a)
+{
+ if ($a->argc > 1) {
DFRN::autoRedir($a, $a->argv[1]);
+ }
- if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
return;
}
@@ -32,14 +32,15 @@ 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)
+ DBA::escape($nick)
);
- if(! count($user))
+ if (!DBA::isResult($user)) {
return;
+ }
$a->data['user'] = $user[0];
$a->profile_uid = $user[0]['uid'];
@@ -58,7 +59,7 @@ 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",
@@ -68,7 +69,7 @@ function videos_init(App $a) {
if(count($albums)) {
$a->data['albums'] = $albums;
- $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
+ $albums_visible = ((intval($a->data['user']['hidewall']) && (!local_user()) && (!remote_user())) ? false : true);
if($albums_visible) {
$o .= '';
}*/
- if(! x($a->page,'aside'))
+ // If not there, create 'aside' empty
+ if (!isset($a->page['aside'])) {
$a->page['aside'] = '';
- $a->page['aside'] .= $vcard_widget;
+ }
+ $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(),
- ]);
-
}
return;
}
-
-
-function videos_post(App $a) {
-
+function videos_post(App $a)
+{
$owner_uid = $a->data['user']['uid'];
if (local_user() != $owner_uid) {
goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
}
- if (($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) {
-
+ if (($a->argc == 2) && !empty($_POST['delete']) && !empty($_POST['id'])) {
// Check if we should do HTML-based delete confirmation
- if (!x($_REQUEST,'confirm')) {
- if (x($_REQUEST,'canceled')) {
+ 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']
+ ['name' => 'id' , 'value' => $_POST['id']],
+ ['name' => 'delete', 'value' => 'x']
],
'$confirm' => L10n::t('Delete Video'),
'$confirm_url' => $drop_url,
@@ -145,7 +140,9 @@ function videos_post(App $a) {
'$cancel' => L10n::t('Cancel'),
]);
+
$a->error = 1; // Set $a->error so the other module functions don't execute
+
return;
}
@@ -153,35 +150,22 @@ function videos_post(App $a) {
$r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1",
intval(local_user()),
- dbesc($video_id)
+ DBA::escape($video_id)
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
intval(local_user()),
- dbesc($video_id)
+ DBA::escape($video_id)
);
- $i = q("SELECT * FROM `item` WHERE `attach` like '%%attach/%s%%' AND `uid` = %d LIMIT 1",
- dbesc($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())
);
- //echo ""; var_dump($i); killme();
- if (DBM::is_result($i)) {
- q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
- dbesc(datetime_convert()),
- dbesc(datetime_convert()),
- dbesc($i[0]['uri']),
- intval(local_user())
- );
- create_tags_from_itemuri($i[0]['uri'], local_user());
- delete_thread_uri($i[0]['uri'], local_user());
-
- $url = System::baseUrl();
- $drop_id = intval($i[0]['id']);
-
- if ($i[0]['visible']) {
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
- }
+
+ if (DBA::isResult($i)) {
+ Item::deleteForUser(['id' => $i[0]['id']], local_user());
}
}
@@ -190,13 +174,10 @@ function videos_post(App $a) {
}
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
// videos/name/upload
@@ -207,17 +188,15 @@ function videos_content(App $a) {
// videos/name/video/xxxxx/edit
- if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (!local_user()) && (!remote_user())) {
notice(L10n::t('Public access denied.') . EOL);
return;
}
+ require_once 'include/security.php';
+ require_once 'include/conversation.php';
- require_once('include/bbcode.php');
- require_once('include/security.php');
- require_once('include/conversation.php');
-
- if(! x($a->data,'user')) {
+ if (empty($a->data['user'])) {
notice(L10n::t('No videos selected') . EOL );
return;
}
@@ -229,25 +208,24 @@ 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
+ } else {
$datatype = 'summary';
+ }
- if($a->argc > 4)
+ if ($a->argc > 4) {
$cmd = $a->argv[4];
- else
+ } else {
$cmd = 'view';
+ }
//
// Setup permissions structures
//
-
$can_post = false;
$visitor = 0;
$contact = null;
@@ -256,32 +234,31 @@ 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'] == Contact::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) {
- $contact_id = $v['cid'];
- break;
- }
+ } elseif ($community_page && remote_user()) {
+ if (!empty($_SESSION['remote'])) {
+ foreach ($_SESSION['remote'] as $v) {
+ if ($v['uid'] == $owner_uid) {
+ $contact_id = $v['cid'];
+ break;
}
}
- 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),
- intval($owner_uid)
- );
- if (DBM::is_result($r)) {
- $can_post = true;
- $contact = $r[0];
- $remote_contact = true;
- $visitor = $contact_id;
- }
+ }
+
+ if ($contact_id > 0) {
+ $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
+ intval($contact_id),
+ intval($owner_uid)
+ );
+
+ if (DBA::isResult($r)) {
+ $can_post = true;
+ $contact = $r[0];
+ $remote_contact = true;
+ $visitor = $contact_id;
}
}
}
@@ -289,9 +266,10 @@ function videos_content(App $a) {
$groups = [];
// 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'])) {
+
+ if (!empty($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) {
if($v['uid'] == $owner_uid) {
$contact_id = $v['cid'];
@@ -299,27 +277,27 @@ function videos_content(App $a) {
}
}
}
- if($contact_id) {
+
+ if ($contact_id > 0) {
$groups = Group::getIdsByContactId($contact_id);
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
intval($owner_uid)
);
- if (DBM::is_result($r)) {
+
+ if (DBA::isResult($r)) {
$contact = $r[0];
$remote_contact = true;
}
}
}
- if(! $remote_contact) {
- if(local_user()) {
- $contact_id = $_SESSION['cid'];
- $contact = $a->contact;
- }
+ if (!$remote_contact && 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(L10n::t('Access to this item is restricted.') . EOL);
return;
}
@@ -335,24 +313,20 @@ function videos_content(App $a) {
//
// dispatch request
//
-
-
- 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
// DELETED -- look at mod/photos.php if you want to implement
}
- if($datatype === 'video') {
-
+ if ($datatype === 'video') {
return; // no single video view for now
// DELETED -- look at mod/photos.php if you want to implement
@@ -365,7 +339,8 @@ function videos_content(App $a) {
$sql_extra GROUP BY hash",
intval($a->data['user']['uid'])
);
- if (DBM::is_result($r)) {
+
+ if (DBA::isResult($r)) {
$a->set_pager_total(count($r));
$a->set_pager_itemspage(20);
}
@@ -380,17 +355,18 @@ function videos_content(App $a) {
intval($a->pager['itemspage'])
);
-
-
$videos = [];
- if (DBM::is_result($r)) {
+
+ 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,
@@ -400,7 +376,6 @@ function videos_content(App $a) {
'name' => $name_e,
'alt' => L10n::t('View Album'),
],
-
];
}
}
@@ -409,12 +384,12 @@ function videos_content(App $a) {
$o .= replace_macros($tpl, [
'$title' => L10n::t('Recent Videos'),
'$can_post' => $can_post,
- '$upload' => [L10n::t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'],
+ '$upload' => [L10n::t('Upload New Videos'), System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/upload'],
'$videos' => $videos,
- '$delete_url' => (($can_post)?System::baseUrl().'/videos/'.$a->data['user']['nickname']:False)
+ '$delete_url' => (($can_post) ? System::baseUrl() . '/videos/' . $a->data['user']['nickname'] : false)
]);
-
$o .= paginate($a);
+
return $o;
}