X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=3828b8f1fefb649df1a5973261639dac46636b10;hb=8d6d008d2844f55889392f8087de123a88c8349d;hp=bf8d696b60f90cceef1b14d825ba70151cde932f;hpb=743f2e0391315d6945b5c53a4d08938ee85e6aed;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index bf8d696b60..3828b8f1fe 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -6,7 +6,7 @@ require_once('include/security.php'); require_once('include/redir.php'); -function videos_init(&$a) { +function videos_init(App $a) { if($a->argc > 1) auto_redir($a, $a->argv[1]); @@ -33,10 +33,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 = account_type($profile); $tpl = get_markup_template("vcard-widget.tpl"); @@ -62,7 +59,7 @@ function videos_init(&$a) { if($albums_visible) { $o .= '
'; @@ -90,12 +87,12 @@ function videos_init(&$a) { $tpl = get_markup_template("videos_head.tpl"); $a->page['htmlhead'] .= replace_macros($tpl,array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => App::get_baseurl(), )); $tpl = get_markup_template("videos_end.tpl"); $a->page['end'] .= replace_macros($tpl,array( - '$baseurl' => $a->get_baseurl(), + '$baseurl' => App::get_baseurl(), )); } @@ -105,17 +102,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(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($a->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( @@ -137,13 +138,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 +152,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 +163,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 = App::get_baseurl(); $drop_id = intval($i[0]['id']); - if($i[0]['visible']) - proc_run('php',"include/notifier.php","drop","$drop_id"); + if ($i[0]['visible']) { + proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); + } } } - goaway($a->get_baseurl() . '/videos/' . $a->data['user']['nickname']); + goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']); return; // NOTREACHED } - goaway($a->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 @@ -262,11 +263,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 +291,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,7 +351,7 @@ 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); } @@ -366,9 +367,9 @@ function videos_content(&$a) { $videos = array(); - if(count($r)) { - foreach($r as $rr) { - if($a->theme['template_engine'] === 'internal') { + 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']); } @@ -379,13 +380,13 @@ function videos_content(&$a) { $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' => 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'), ), @@ -396,15 +397,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'), 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; } -