X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fvideos.php;h=c4e5d0aaa410882caf4eb97430cf310c3fe60948;hb=0b5f7da270bcaa679cb684dbbbbe40781f0b49c6;hp=433ce5fc63f82e2e150b7b7c9ce87325553ba50e;hpb=d2280d4120ca09ff5f3013e961a1f43bb5244cc6;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index 433ce5fc63..c4e5d0aaa4 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; } @@ -33,16 +40,16 @@ function videos_init(App &$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - $account_type = account_type($profile); + $account_type = Contact::getAccountType($profile); $tpl = get_markup_template("vcard-widget.tpl"); - $vcard_widget .= replace_macros($tpl, array( + $vcard_widget = replace_macros($tpl, array( '$name' => $profile['name'], '$photo' => $profile['photo'], - '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""), + '$addr' => defaults($profile, 'addr', ''), '$account_type' => $account_type, - '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""), + '$pdesc' => defaults($profile, 'pdesc', ''), )); @@ -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(), )); } @@ -102,12 +109,12 @@ function videos_init(App &$a) { -function videos_post(App &$a) { +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,26 +170,26 @@ 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']); } -function videos_content(App &$a) { +function videos_content(App $a) { // URLs (most aren't currently implemented): // videos/name @@ -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; @@ -273,8 +280,9 @@ function videos_content(App &$a) { } } - // perhaps they're visiting - but not a community page, so they wouldn't have write access + $groups = []; + // perhaps they're visiting - but not a community page, so they wouldn't have write access if(remote_user() && (! $visitor)) { $contact_id = 0; if(is_array($_SESSION['remote'])) { @@ -291,7 +299,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; } @@ -310,7 +318,7 @@ function videos_content(App &$a) { return; } - $sql_extra = permissions_sql($owner_uid,$remote_contact,$groups); + $sql_extra = permissions_sql($owner_uid, $remote_contact, $groups); $o = ""; @@ -351,12 +359,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,26 +377,20 @@ 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']); - $name_e = template_escape($rr['album']); - } - else { - $alt_e = $rr['filename']; - $name_e = $rr['album']; - } + $alt_e = $rr['filename']; + $name_e = $rr['album']; $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 +403,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) ));