X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fvideos.php;h=412966f862b7e3138085f9d92679377010054b2d;hb=de4a2e6fd03cd0aab94a256eba92ed593931534b;hp=19d5ce9402b17ba448508e3f21c89d0dca84e8a1;hpb=09851331a9dc8601919cd0c9200686b92843d235;p=friendica.git diff --git a/mod/videos.php b/mod/videos.php index 19d5ce9402..412966f862 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -1,17 +1,24 @@ argc > 1) + if($a->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; } @@ -19,22 +26,21 @@ function videos_init(App $a) { $o = ''; - if ($a->argc > 1) { + if($a->argc > 1) { $nick = $a->argv[1]; $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", dbesc($nick) ); - if (!dbm::is_result($user)) { + if(! count($user)) return; - } $a->data['user'] = $user[0]; $a->profile_uid = $user[0]['uid']; $profile = get_profiledata_by_nick($nick, $a->profile_uid); - $account_type = account_type($profile); + $account_type = Contact::getAccountType($profile); $tpl = get_markup_template("vcard-widget.tpl"); @@ -53,47 +59,47 @@ function videos_init(App $a) { intval($a->data['user']['uid']) ); - if (count($albums)) { + if(count($albums)) { $a->data['albums'] = $albums; $albums_visible = ((intval($a->data['user']['hidewall']) && (! local_user()) && (! remote_user())) ? false : true); - if ($albums_visible) { + if($albums_visible) { $o .= ''; }*/ - if (! x($a->page,'aside')) + if(! x($a->page,'aside')) $a->page['aside'] = ''; $a->page['aside'] .= $vcard_widget; $tpl = get_markup_template("videos_head.tpl"); $a->page['htmlhead'] .= replace_macros($tpl,array( - '$baseurl' => App::get_baseurl(), + '$baseurl' => System::baseUrl(), )); $tpl = get_markup_template("videos_end.tpl"); $a->page['end'] .= replace_macros($tpl,array( - '$baseurl' => App::get_baseurl(), + '$baseurl' => System::baseUrl(), )); } @@ -108,7 +114,7 @@ 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']); + goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); } if (($a->argc == 2) && x($_POST,'delete') && x($_POST, 'id')) { @@ -116,7 +122,7 @@ function videos_post(App $a) { // 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']); + goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']); } $drop_url = $a->query_string; @@ -144,7 +150,7 @@ function videos_post(App $a) { dbesc($video_id) ); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { q("DELETE FROM `attach` WHERE `uid` = %d AND `id` = '%s'", intval(local_user()), dbesc($video_id) @@ -154,7 +160,7 @@ function videos_post(App $a) { intval(local_user()) ); //echo "
"; var_dump($i); killme();
-			if (dbm::is_result($i)) {
+			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()),
@@ -164,20 +170,20 @@ function videos_post(App $a) {
 				create_tags_from_itemuri($i[0]['uri'], local_user());
 				delete_thread_uri($i[0]['uri'], local_user());
 
-				$url = App::get_baseurl();
+				$url = System::baseUrl();
 				$drop_id = intval($i[0]['id']);
 
 				if ($i[0]['visible']) {
-					proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
+					Worker::add(PRIORITY_HIGH, "Notifier", "drop", $drop_id);
 				}
 			}
 		}
 
-		goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+		goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 		return; // NOTREACHED
 	}
 
-	goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
+	goaway(System::baseUrl() . '/videos/' . $a->data['user']['nickname']);
 
 }
 
@@ -195,7 +201,7 @@ function videos_content(App $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;
 	}
@@ -205,7 +211,7 @@ function videos_content(App $a) {
 	require_once('include/security.php');
 	require_once('include/conversation.php');
 
-	if (! x($a->data,'user')) {
+	if(! x($a->data,'user')) {
 		notice( t('No videos selected') . EOL );
 		return;
 	}
@@ -218,16 +224,16 @@ function videos_content(App $a) {
 	// Parse arguments
 	//
 
-	if ($a->argc > 3) {
+	if($a->argc > 3) {
 		$datatype = $a->argv[2];
 		$datum = $a->argv[3];
 	}
-	elseif (($a->argc > 2) && ($a->argv[2] === 'upload'))
+	elseif(($a->argc > 2) && ($a->argv[2] === 'upload'))
 		$datatype = 'upload';
 	else
 		$datatype = 'summary';
 
-	if ($a->argc > 4)
+	if($a->argc > 4)
 		$cmd = $a->argv[4];
 	else
 		$cmd = 'view';
@@ -246,25 +252,25 @@ function videos_content(App $a) {
 
 	$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
 
-	if ((local_user()) && (local_user() == $owner_uid))
+	if((local_user()) && (local_user() == $owner_uid))
 		$can_post = true;
 	else {
-		if ($community_page && remote_user()) {
-			if (is_array($_SESSION['remote'])) {
-				foreach ($_SESSION['remote'] as $v) {
-					if ($v['uid'] == $owner_uid) {
+		if($community_page && remote_user()) {
+			if(is_array($_SESSION['remote'])) {
+				foreach($_SESSION['remote'] as $v) {
+					if($v['uid'] == $owner_uid) {
 						$contact_id = $v['cid'];
 						break;
 					}
 				}
 			}
-			if ($contact_id) {
+			if($contact_id) {
 
 				$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
 					intval($contact_id),
 					intval($owner_uid)
 				);
-				if (dbm::is_result($r)) {
+				if (DBM::is_result($r)) {
 					$can_post = true;
 					$contact = $r[0];
 					$remote_contact = true;
@@ -276,37 +282,37 @@ function videos_content(App $a) {
 
 	// perhaps they're visiting - but not a community page, so they wouldn't have write access
 
-	if (remote_user() && (! $visitor)) {
+	if(remote_user() && (! $visitor)) {
 		$contact_id = 0;
-		if (is_array($_SESSION['remote'])) {
-			foreach ($_SESSION['remote'] as $v) {
-				if ($v['uid'] == $owner_uid) {
+		if(is_array($_SESSION['remote'])) {
+			foreach($_SESSION['remote'] as $v) {
+				if($v['uid'] == $owner_uid) {
 					$contact_id = $v['cid'];
 					break;
 				}
 			}
 		}
-		if ($contact_id) {
+		if($contact_id) {
 			$groups = init_groups_visitor($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)
 			);
-			if (dbm::is_result($r)) {
+			if (DBM::is_result($r)) {
 				$contact = $r[0];
 				$remote_contact = true;
 			}
 		}
 	}
 
-	if (! $remote_contact) {
-		if (local_user()) {
+	if(! $remote_contact) {
+		if(local_user()) {
 			$contact_id = $_SESSION['cid'];
 			$contact = $a->contact;
 		}
 	}
 
-	if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
+	if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
 		notice( t('Access to this item is restricted.') . EOL);
 		return;
 	}
@@ -324,13 +330,13 @@ function videos_content(App $a) {
 	//
 
 
-	if ($datatype === 'upload') {
+	if($datatype === 'upload') {
 		return; // no uploading for now
 
 		// DELETED -- look at mod/photos.php if you want to implement
 	}
 
-	if ($datatype === 'album') {
+	if($datatype === 'album') {
 
 		return; // no albums for now
 
@@ -338,7 +344,7 @@ function videos_content(App $a) {
 	}
 
 
-	if ($datatype === 'video') {
+	if($datatype === 'video') {
 
 		return; // no single video view for now
 
@@ -352,12 +358,14 @@ function videos_content(App $a) {
 		$sql_extra GROUP BY hash",
 		intval($a->data['user']['uid'])
 	);
-	if (dbm::is_result($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']),
@@ -368,26 +376,20 @@ function videos_content(App $a) {
 
 
 	$videos = array();
-	if (dbm::is_result($r)) {
+	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']);
-			}
-			else {
-				$alt_e = $rr['filename'];
-				$name_e = $rr['album'];
-			}
+			$alt_e = $rr['filename'];
+			$name_e = $rr['album'];
 
 			$videos[] = array(
 				'id'       => $rr['id'],
-				'link'     => App::get_baseurl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
+				'link'     => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/video/' . $rr['resource-id'],
 				'title'    => t('View Video'),
-				'src'      => App::get_baseurl() . '/attach/' . $rr['id'] . '?attachment=0',
+				'src'      => System::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']),
+					'link'  => System::baseUrl() . '/videos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($rr['album']),
 					'name'  => $name_e,
 					'alt'   => t('View Album'),
 				),
@@ -400,9 +402,9 @@ function videos_content(App $a) {
 	$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'),
+		'$upload'     => array(t('Upload New Videos'), System::baseUrl().'/videos/'.$a->data['user']['nickname'].'/upload'),
 		'$videos'     => $videos,
-		'$delete_url' => (($can_post)?App::get_baseurl().'/videos/'.$a->data['user']['nickname']:False)
+		'$delete_url' => (($can_post)?System::baseUrl().'/videos/'.$a->data['user']['nickname']:False)
 	));