X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=662da4ca4beca3b23ed9584242faa7a48425a3b5;hb=b92fc24ff06681f445edff0d45f8f81a7e25ebe6;hp=3828b8f1fefb649df1a5973261639dac46636b10;hpb=61a01141d7e897c30b5931b66675cbb09d6368b8;p=friendica.git
diff --git a/mod/videos.php b/mod/videos.php
index 3828b8f1fe..662da4ca4b 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,17 +1,24 @@
argc > 1)
auto_redir($a, $a->argv[1]);
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
return;
}
@@ -59,7 +66,7 @@ function videos_init(App $a) {
if($albums_visible) {
$o .= '';
@@ -87,12 +94,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(),
));
}
@@ -107,7 +114,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')) {
@@ -115,7 +122,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;
@@ -143,7 +150,7 @@ function videos_post(App $a) {
dbesc($video_id)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'",
intval(local_user()),
dbesc($video_id)
@@ -153,7 +160,7 @@ function videos_post(App $a) {
intval(local_user())
);
//echo ""; var_dump($i); killme();
- if (dbm::is_result($i)) {
+ 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()),
@@ -163,20 +170,20 @@ 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']) {
- proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
}
}
}
- 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']);
}
@@ -194,7 +201,7 @@ function videos_content(App $a) {
// videos/name/video/xxxxx/edit
- if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+ if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
}
@@ -263,7 +270,7 @@ function videos_content(App $a) {
intval($contact_id),
intval($owner_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$can_post = true;
$contact = $r[0];
$remote_contact = true;
@@ -291,7 +298,7 @@ function videos_content(App $a) {
intval($contact_id),
intval($owner_uid)
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$contact = $r[0];
$remote_contact = true;
}
@@ -351,12 +358,14 @@ function videos_content(App $a) {
$sql_extra GROUP BY hash",
intval($a->data['user']['uid'])
);
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$a->set_pager_total(count($r));
$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']),
@@ -367,7 +376,7 @@ function videos_content(App $a) {
$videos = array();
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
foreach ($r as $rr) {
if ($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']);
@@ -380,13 +389,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 +408,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)
));