X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fvideos.php;h=412966f862b7e3138085f9d92679377010054b2d;hb=a5e91175243a41c77a56e73efc3672f20a7e6d23;hp=bf8d696b60f90cceef1b14d825ba70151cde932f;hpb=8ec424325375aa923c7d2d78ac8ddcc352f09cff;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index bf8d696b60..412966f862 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,10 +40,7 @@ function videos_init(&$a) { $profile = get_profiledata_by_nick($nick, $a->profile_uid); - if((intval($profile['page-flags']) == PAGE_COMMUNITY) || (intval($profile['page-flags']) == PAGE_PRVGROUP)) - $account_type = t('Forum'); - else - $account_type = ""; + $account_type = Contact::getAccountType($profile); $tpl = get_markup_template("vcard-widget.tpl"); @@ -62,7 +66,7 @@ function videos_init(&$a) { if($albums_visible) { $o .= '
'; @@ -90,12 +94,12 @@ function videos_init(&$a) { $tpl = get_markup_template("videos_head.tpl"); $a->page['htmlhead'] .= replace_macros($tpl,array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => System::baseUrl(), )); $tpl = get_markup_template("videos_end.tpl"); $a->page['end'] .= replace_macros($tpl,array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => System::baseUrl(), )); } @@ -105,17 +109,21 @@ function videos_init(&$a) { -function videos_post(&$a) { +function videos_post(App $a) { $owner_uid = $a->data['user']['uid']; - if (local_user() != $owner_uid) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']); + 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) && x($_POST,'delete') && x($_POST, 'id')) { // Check if we should do HTML-based delete confirmation - if(!x($_REQUEST,'confirm')) { - if(x($_REQUEST,'canceled')) goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']); + if (!x($_REQUEST,'confirm')) { + if (x($_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'), array( @@ -137,13 +145,12 @@ function videos_post(&$a) { $video_id = $_POST['id']; - $r = q("SELECT `id` FROM `attach` WHERE `uid` = %d AND `id` = '%s' LIMIT 1", intval(local_user()), dbesc($video_id) ); - if(count($r)) { + if (DBM::is_result($r)) { q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'", intval(local_user()), dbesc($video_id) @@ -152,8 +159,8 @@ function videos_post(&$a) { dbesc($video_id), intval(local_user()) ); - #echo ""; var_dump($i); killme(); - if(count($i)) { + //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()), @@ -163,25 +170,26 @@ function videos_post(&$a) { create_tags_from_itemuri($i[0]['uri'], local_user()); delete_thread_uri($i[0]['uri'], local_user()); - $url = $a->get_baseurl(); + $url = System::baseUrl(); $drop_id = intval($i[0]['id']); - if($i[0]['visible']) - proc_run('php',"include/notifier.php","drop","$drop_id"); + if ($i[0]['visible']) { + Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id); + } } } - goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']); + goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); return; // NOTREACHED } - goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']); + goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); } -function videos_content(&$a) { +function videos_content(App $a) { // URLs (most aren't currently implemented): // videos/name @@ -193,7 +201,7 @@ function videos_content(&$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; } @@ -262,11 +270,11 @@ function videos_content(&$a) { intval($contact_id), intval($owner_uid) ); - if(count($r)) { + if (DBM::is_result($r)) { $can_post = true; $contact = $r[0]; $remote_contact = true; - $visitor = $cid; + $visitor = $contact_id; } } } @@ -290,7 +298,7 @@ function videos_content(&$a) { intval($contact_id), intval($owner_uid) ); - if(count($r)) { + if (DBM::is_result($r)) { $contact = $r[0]; $remote_contact = true; } @@ -350,12 +358,14 @@ function videos_content(&$a) { $sql_extra GROUP BY hash", intval($a->data['user']['uid']) ); - if(count($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']), @@ -366,26 +376,20 @@ function videos_content(&$a) { $videos = array(); - if(count($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']; - } + if (DBM::is_result($r)) { + foreach ($r as $rr) { + $alt_e = $rr['filename']; + $name_e = $rr['album']; $videos[] = array( 'id' => $rr['id'], - 'link' => $a->get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'], - 'title' => t('View Video'), - 'src' => $a->get_baseurl() . '/attach/' . $rr['id'] . '?attachment=0', - 'alt' => $alt_e, - 'mime' => $rr['filetype'], - 'album' => array( - 'link' => $a->get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), + 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'], + 'title' => t('View Video'), + 'src' => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0', + 'alt' => $alt_e, + 'mime' => $rr['filetype'], + 'album' => array( + 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), 'name' => $name_e, 'alt' => t('View Album'), ), @@ -396,15 +400,14 @@ function videos_content(&$a) { $tpl = get_markup_template('videos_recent.tpl'); $o .= replace_macros($tpl, array( - '$title' => t('Recent Videos'), - '$can_post' => $can_post, - '$upload' => array(t('Upload New Videos'), $a->get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'), - '$videos' => $videos, - '$delete_url' => (($can_post)?$a->get_baseurl().'/videos/'.$a->data['user']['nickname']:False) + '$title' => t('Recent Videos'), + '$can_post' => $can_post, + '$upload' => array(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) )); $o .= paginate($a); return $o; } -