We now should send all data in the new format

[friendica.git] / mod / videos.php

diff --git a/mod/videos.php b/mod/videos.php
index dbfc044ea0efdb89ee526b25749bfe3b2f13eace..2ee73c211d438c1787432bebb2069e1f7fe312b2 100644 (file)
--- a/mod/videos.php
+++ b/mod/videos.php
@@ -1,12 +1,14 @@
 <?php
+
+use Friendica\App;
+
 require_once('include/items.php');
 require_once('include/acl_selectors.php');
 require_once('include/bbcode.php');
 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]);
@@ -102,7 +104,7 @@ function videos_init(&$a) {
 
 
 
-function videos_post(&$a) {
+function videos_post(App $a) {
 
        $owner_uid = $a->data['user']['uid'];
 
@@ -113,7 +115,7 @@ function videos_post(&$a) {
        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,'confirm')) {
                        if (x($_REQUEST,'canceled')) {
                                goaway(App::get_baseurl() . '/videos/' . $a->data['user']['nickname']);
                        }
@@ -138,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)
@@ -154,7 +155,7 @@ function videos_post(&$a) {
                                intval(local_user())
                        );
                        //echo "<pre>"; var_dump($i); killme();
-                       if(count($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()),
@@ -167,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);
+                               }
                        }
                }
 
@@ -182,7 +184,7 @@ function videos_post(&$a) {
 
 
 
-function videos_content(&$a) {
+function videos_content(App $a) {
 
        // URLs (most aren't currently implemented):
        // videos/name
@@ -356,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']),
@@ -408,4 +412,3 @@ function videos_content(&$a) {
        $o .= paginate($a);
        return $o;
 }
-