From 092dfee1c6cd8e02776982e58f92517a47dd512a Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sat, 17 Jan 2015 12:06:08 +0100
Subject: [PATCH] spring cleaning in Oembed helper list

Fixed http -> https and removed some dead services
---
 plugins/Oembed/OembedPlugin.php     |  2 ++
 plugins/Oembed/lib/oembedhelper.php | 12 ++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/plugins/Oembed/OembedPlugin.php b/plugins/Oembed/OembedPlugin.php
index ce8591df25..f38e1e44bf 100644
--- a/plugins/Oembed/OembedPlugin.php
+++ b/plugins/Oembed/OembedPlugin.php
@@ -1,5 +1,7 @@
 <?php
 
+if (!defined('GNUSOCIAL')) { exit(1); }
+
 class OembedPlugin extends Plugin
 {
     public function onCheckSchema()
diff --git a/plugins/Oembed/lib/oembedhelper.php b/plugins/Oembed/lib/oembedhelper.php
index fab1131648..34a4923c48 100644
--- a/plugins/Oembed/lib/oembedhelper.php
+++ b/plugins/Oembed/lib/oembedhelper.php
@@ -41,15 +41,11 @@ if (!defined('STATUSNET')) {
 class oEmbedHelper
 {
     protected static $apiMap = array(
-        'flickr.com' => 'http://www.flickr.com/services/oembed/',
-        'yfrog.com' => 'http://www.yfrog.com/api/oembed',
-        'youtube.com' => 'http://www.youtube.com/oembed',
+        'flickr.com' => 'https://www.flickr.com/services/oembed/',
+        'youtube.com' => 'https://www.youtube.com/oembed',
         'viddler.com' => 'http://lab.viddler.com/services/oembed/',
-        'qik.com' => 'http://qik.com/api/oembed.json',
-        'revision3.com' => 'http://revision3.com/api/oembed/',
-        'hulu.com' => 'http://www.hulu.com/api/oembed.json',
-        'vimeo.com' => 'http://www.vimeo.com/api/oembed.json',
-        'my.opera.com' => 'http://my.opera.com/service/oembed',
+        'revision3.com' => 'https://revision3.com/api/oembed/',
+        'vimeo.com' => 'https://vimeo.com/api/oembed.json',
     );
     protected static $functionMap = array(
         'twitpic.com' => 'oEmbedHelper::twitPic',