X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fvideos.php;h=412966f862b7e3138085f9d92679377010054b2d;hb=a5e91175243a41c77a56e73efc3672f20a7e6d23;hp=943a9d09f2bf7ca07cc935022d5e2c329b6706cc;hpb=9a22b4818e0a406c89ff1cc84be4232c8a979f78;p=friendica.git
diff --git a/mod/videos.php b/mod/videos.php
index 943a9d09f2..412966f862 100644
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,41 +1,56 @@
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;
}
+ nav_set_selected('home');
+
$o = '';
if($a->argc > 1) {
$nick = $a->argv[1];
- $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
+ $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
dbesc($nick)
);
- if(! count($r))
+ if(! count($user))
return;
- $a->data['user'] = $r[0];
+ $a->data['user'] = $user[0];
+ $a->profile_uid = $user[0]['uid'];
- $profilephoto = $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg');
+ $profile = get_profiledata_by_nick($nick, $a->profile_uid);
- $tpl = get_markup_template("vcard-widget.tpl");
+ $account_type = Contact::getAccountType($profile);
- $vcard_widget = replace_macros($tpl, array(
- '$name' => $a->data['user']['username'],
- '$photo' => $profilephoto
- ));
+ $tpl = get_markup_template("vcard-widget.tpl");
+
+ $vcard_widget .= replace_macros($tpl, array(
+ '$name' => $profile['name'],
+ '$photo' => $profile['photo'],
+ '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+ '$account_type' => $account_type,
+ '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
+ ));
/*$sql_extra = permissions_sql($a->data['user']['uid']);
@@ -50,8 +65,8 @@ function videos_init(&$a) {
$albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true);
if($albums_visible) {
- $o .= '
';
- $o .= '
';
+ $o .= '';
@@ -79,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(),
));
}
@@ -94,26 +109,30 @@ 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(
'$method' => 'post',
'$message' => t('Do you really want to delete this video?'),
- '$extra_inputs' => [
- ['name'=>'id', 'value'=> $_POST['id']],
- ['name'=>'delete', 'value'=>'x']
- ],
+ '$extra_inputs' => array(
+ array('name'=>'id', 'value'=> $_POST['id']),
+ array('name'=>'delete', 'value'=>'x')
+ ),
'$confirm' => t('Delete Video'),
'$confirm_url' => $drop_url,
'$confirm_name' => 'confirm', // Needed so that confirmation will bring us back into this if statement
@@ -126,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)
@@ -141,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()),
@@ -152,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
@@ -182,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;
}
@@ -251,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;
}
}
}
@@ -279,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;
}
@@ -339,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']),
@@ -355,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'),
),
@@ -385,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;
}
-