X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=2ee73c211d438c1787432bebb2069e1f7fe312b2;hb=7034d6efbd988e7481ac6f5d6413a8925221ed6b;hp=92e5fe55484868cece8d8020de40325254e68064;hpb=e1f366164509fc8217f9d0cf21d7475f6d71b73a;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index 92e5fe5548..2ee73c211d 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -1,12 +1,14 @@ argc > 1) auto_redir($a, $a->argv[1]); @@ -102,17 +104,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(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']); + if (local_user() != $owner_uid) { + goaway(App::get_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(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']); + if (!x($_REQUEST,'confirm')) { + if (x($_REQUEST,'canceled')) { + goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']); + } $drop_url = $a->query_string; $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( @@ -134,7 +140,6 @@ 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) @@ -149,8 +154,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,8 +168,9 @@ function videos_post(&$a) { $url = App::get_baseurl(); $drop_id = intval($i[0]['id']); - if($i[0]['visible']) + if ($i[0]['visible']) { proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); + } } } @@ -172,13 +178,13 @@ function videos_post(&$a) { return; // NOTREACHED } - goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']); + goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']); } -function videos_content(&$a) { +function videos_content(App $a) { // URLs (most aren't currently implemented): // videos/name @@ -352,7 +358,9 @@ function videos_content(&$a) { $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']), @@ -364,8 +372,8 @@ function videos_content(&$a) { $videos = array(); if (dbm::is_result($r)) { - foreach($r as $rr) { - if($a->theme['template_engine'] === 'internal') { + foreach ($r as $rr) { + if ($a->theme['template_engine'] === 'internal') { $alt_e = template_escape($rr['filename']); $name_e = template_escape($rr['album']); } @@ -376,12 +384,12 @@ function videos_content(&$a) { $videos[] = array( 'id' => $rr['id'], - 'link' => App::get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'], - 'title' => t('View Video'), - 'src' => App::get_baseurl() . '/attach/' . $rr['id'] . '?attachment=0', - 'alt' => $alt_e, - 'mime' => $rr['filetype'], - 'album' => array( + 'link' => App::get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'], + 'title' => t('View Video'), + 'src' => App::get_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']), 'name' => $name_e, 'alt' => t('View Album'), @@ -393,15 +401,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'), App::get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'), - '$videos' => $videos, - '$delete_url' => (($can_post)?App::get_baseurl().'/videos/'.$a->data['user']['nickname']:False) + '$title' => t('Recent Videos'), + '$can_post' => $can_post, + '$upload' => array(t('Upload New Videos'), App::get_baseurl().'/videos/'.$a->data['user']['nickname'].'/upload'), + '$videos' => $videos, + '$delete_url' => (($can_post)?App::get_baseurl().'/videos/'.$a->data['user']['nickname']:False) )); $o .= paginate($a); return $o; } -