Changeset 20809 for extensions/gvideo/include/functions.inc.php

Timestamp:

Feb 18, 2013, 2:45:55 PM (11 years ago)

Author:

mistic100

Message:

better handle of private videos, show info about privacy

File:

• extensions/gvideo/include/functions.inc.php (modified) (11 diffs)

extensions/gvideo/include/functions.inc.php

@@ -43 +43 @@
       
       $video['url'] = 'http://youtube.com/watch?v='.$video['video_id'];
+      $video['title'] = 'YouTube #'.$video['video_id'];
       
       if (!$safe_mode)
       {
-        $fields = 'entry(id,author,media:group(media:title(text()),media:description(text()),media:thumbnail(@url),media:keywords))';
-        $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['video_id'].'?v=2&alt=json&fields='.$fields;
+        $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['video_id'].'?v=2&alt=json';
         $json = gvideo_download_remote_file($api_url, true);
         
         if ($json===false || $json=='file_error') return false;
+        if (strip_tags($json) == 'GDataInvalidRequestUriExceptionInvalid id') return false; // unknown video
+        if (strip_tags($json) == 'GDataServiceForbiddenExceptionPrivate video') return false; // private video
         
         $json = json_decode($json, true);
@@ -56 +58 @@
           'title' => $json['entry']['media$group']['media$title']['$t'],
           'description' => $json['entry']['media$group']['media$description']['$t'],
-          'thumbnail' => $json['entry']['media$group']['media$thumbnail'][0]['url'],
+          'thumbnail' => $json['entry']['media$group']['media$thumbnail'][2]['url'],
           'author' => $json['entry']['author'][0]['name']['$t'],
           ));
@@ -64 +66 @@
         }
       }
-      else
-      {
-        $video['title'] = 'YouTube #'.$video['video_id'];
-      }
       
       break;
@@ -81 +79 @@
       
       $video['url'] = 'http://vimeo.com/'.$video['video_id'];
+      $video['title'] = 'Vimeo #'.$video['video_id'];
       
       if (!$safe_mode)
@@ -116 +115 @@
         }
       }
-      else
-      {
-        $video['title'] = 'Vimeo #'.$video['video_id'];
-      }
       
       break;
@@ -134 +129 @@
       
       $video['url'] = 'http://dailymotion.com/video/'.$video['video_id'];
+      $video['title'] = $video['video_id'];
       
       if (!$safe_mode)
@@ -143 +139 @@
         
         $json = json_decode($json, true);
+        if (@$json['error']['type'] == 'access_forbidden') return false; // private video
         $json['thumbnail_large_url'] = preg_replace('#\?([0-9]+)$#', null, $json['thumbnail_large_url']);
         
@@ -153 +150 @@
           ));
       }
-      else
-      {
-        $video['title'] = $video['video_id'];
-      }
       
       break;
@@ -164 +157 @@
     case 'wat':
     {
+      if (!$safe_mode) return false; // no safe_mode for wat.tv, must connect to get the video id
+      
       $video['type'] = 'wat';
       
-      // no safe_mode for wat.tv
       $html = gvideo_download_remote_file($source_url, true);
       
@@ -202 +196 @@
       
       $video['url'] = 'http://wideo.fr/video/'.$video['video_id'].'.html';
+      $video['title'] = $video['video_id'];
       
       if (!$safe_mode)
@@ -223 +218 @@
         preg_match('#<meta name="keywords" content="([^">]+)" />#', $html, $matches);
         $video['tags'] = $matches[1];
-      }
-      else
-      {
-        $video['title'] = $video['video_id'];
       }