X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fvideos.php;h=ac7d0f34e51f107c4750f0a4b448d151e53335f9;hb=6ef2fd56f78b3bfe1df59bbd35bd9fdb547b3291;hp=412966f862b7e3138085f9d92679377010054b2d;hpb=9612496e9e4732122bac39a16c8f191f165fd219;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index 412966f862..ac7d0f34e5 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -1,28 +1,34 @@ argc > 1) - auto_redir($a, $a->argv[1]); + DFRN::autoRedir($a, $a->argv[1]); if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { return; } - nav_set_selected('home'); + Nav::setSelected('home'); $o = ''; @@ -38,19 +44,19 @@ function videos_init(App $a) { $a->data['user'] = $user[0]; $a->profile_uid = $user[0]['uid']; - $profile = get_profiledata_by_nick($nick, $a->profile_uid); + $profile = Profile::getByNickname($nick, $a->profile_uid); $account_type = Contact::getAccountType($profile); $tpl = get_markup_template("vcard-widget.tpl"); - $vcard_widget .= replace_macros($tpl, array( + $vcard_widget = replace_macros($tpl, [ '$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', ''), + ]); /*$sql_extra = permissions_sql($a->data['user']['uid']); @@ -66,7 +72,7 @@ function videos_init(App $a) { if($albums_visible) { $o .= ''; @@ -93,14 +99,14 @@ function videos_init(App $a) { $tpl = get_markup_template("videos_head.tpl"); - $a->page['htmlhead'] .= replace_macros($tpl,array( + $a->page['htmlhead'] .= replace_macros($tpl,[ '$baseurl' => System::baseUrl(), - )); + ]); $tpl = get_markup_template("videos_end.tpl"); - $a->page['end'] .= replace_macros($tpl,array( + $a->page['end'] .= replace_macros($tpl,[ '$baseurl' => System::baseUrl(), - )); + ]); } @@ -126,19 +132,19 @@ function videos_post(App $a) { } $drop_url = $a->query_string; - $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( + $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), [ '$method' => 'post', - '$message' => t('Do you really want to delete this video?'), - '$extra_inputs' => array( - array('name'=>'id', 'value'=> $_POST['id']), - array('name'=>'delete', 'value'=>'x') - ), - '$confirm' => t('Delete Video'), + '$message' => L10n::t('Do you really want to delete this video?'), + '$extra_inputs' => [ + ['name'=>'id', 'value'=> $_POST['id']], + ['name'=>'delete', 'value'=>'x'] + ], + '$confirm' => L10n::t('Delete Video'), '$confirm_url' => $drop_url, '$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement - '$cancel' => t('Cancel'), + '$cancel' => L10n::t('Cancel'), - )); + ]); $a->error = 1; // Set $a->error so the other module functions don't execute return; } @@ -202,7 +208,7 @@ function videos_content(App $a) { if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { - notice( t('Public access denied.') . EOL); + notice(L10n::t('Public access denied.') . EOL); return; } @@ -212,7 +218,7 @@ function videos_content(App $a) { require_once('include/conversation.php'); if(! x($a->data,'user')) { - notice( t('No videos selected') . EOL ); + notice(L10n::t('No videos selected') . EOL ); return; } @@ -280,8 +286,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'])) { @@ -293,7 +300,7 @@ function videos_content(App $a) { } } if($contact_id) { - $groups = init_groups_visitor($contact_id); + $groups = Group::getIdsByContactId($contact_id); $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), intval($owner_uid) @@ -313,17 +320,17 @@ function videos_content(App $a) { } if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) { - notice( t('Access to this item is restricted.') . EOL); + notice(L10n::t('Access to this item is restricted.') . EOL); return; } - $sql_extra = permissions_sql($owner_uid,$remote_contact,$groups); + $sql_extra = permissions_sql($owner_uid, $remote_contact, $groups); $o = ""; // tabs $_is_owner = (local_user() && (local_user() == $owner_uid)); - $o .= profile_tabs($a,$_is_owner, $a->data['user']['nickname']); + $o .= Profile::getTabs($a, $_is_owner, $a->data['user']['nickname']); // // dispatch request @@ -375,37 +382,37 @@ function videos_content(App $a) { - $videos = array(); + $videos = []; if (DBM::is_result($r)) { foreach ($r as $rr) { $alt_e = $rr['filename']; $name_e = $rr['album']; - $videos[] = array( + $videos[] = [ 'id' => $rr['id'], 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'], - 'title' => t('View Video'), + 'title' => L10n::t('View Video'), 'src' => System::baseUrl() . '/attach/' . $rr['id'] . '?attachment=0', 'alt' => $alt_e, 'mime' => $rr['filetype'], - 'album' => array( + 'album' => [ 'link' => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']), 'name' => $name_e, - 'alt' => t('View Album'), - ), + 'alt' => L10n::t('View Album'), + ], - ); + ]; } } $tpl = get_markup_template('videos_recent.tpl'); - $o .= replace_macros($tpl, array( - '$title' => t('Recent Videos'), + $o .= replace_macros($tpl, [ + '$title' => L10n::t('Recent Videos'), '$can_post' => $can_post, - '$upload' => array(t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'), + '$upload' => [L10n::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);