From fdf53b85501d43923733845ec503e7114fc4955b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 25 Jun 2015 17:10:45 +0200
Subject: [PATCH] puts the Flickr provider back for backwards compat, adds a
 todo and updates the release config with all providers

---
 .../config/EmbeddedMedia.Release.config       | 72 +++++++++++++++----
 .../EmbedProviders/AbstractOEmbedProvider.cs  |  2 +
 .../Media/EmbedProviders/Flickr.cs            | 25 +++++++
 src/Umbraco.Web/Umbraco.Web.csproj            |  1 +
 4 files changed, 88 insertions(+), 12 deletions(-)
 create mode 100644 src/Umbraco.Web/Media/EmbedProviders/Flickr.cs

diff --git a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config b/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
index fe58a8fa84..6472968e44 100644
--- a/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
+++ b/src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
@@ -1,17 +1,11 @@
 <?xml version="1.0"?>
 <embed>
   <!-- Flickr Settings-->
-  <provider name="Flickr" type="Umbraco.Web.Media.EmbedProviders.Flickr, umbraco">
+  <provider name="Flickr" type="Umbraco.Web.Media.EmbedProviders.OEmbedPhoto, umbraco">
     <urlShemeRegex><![CDATA[flickr\.com/]]></urlShemeRegex>
     <apiEndpoint><![CDATA[http://www.flickr.com/services/oembed/]]></apiEndpoint>
     <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
   </provider>
-  <!-- Screenr Settings -->
-  <provider name="Screenr" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, umbraco" supportsDimensions="False">
-    <urlShemeRegex><![CDATA[screenr\.com/]]></urlShemeRegex>
-    <apiEndpoint><![CDATA[http://www.screenr.com/api/oembed.xml]]></apiEndpoint>
-    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
-  </provider>
   <!-- SlideShare Settings -->
   <provider name="SlideShare" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, umbraco">
     <urlShemeRegex><![CDATA[slideshare\.net/]]></urlShemeRegex>
@@ -20,16 +14,54 @@
       <param name="format">xml</param>
     </requestParams>
   </provider>
+  <!-- Kickstarter Settings-->
+  <provider name="Kickstarter" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[kickstarter\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://www.kickstarter.com/services/oembed]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- Getty Images Settings-->
+  <provider name="GettyImages" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[gty\.im/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://embed.gettyimages.com/oembed]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- Poll Everywhere Settigs -->
+  <provider name="PollEverywhere" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[polleverywhere\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://www.polleverywhere.com/services/oembed/]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- Poll Daddy Settigs -->
+  <provider name="PollDaddy" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[polldaddy\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://polldaddy.com/oembed/]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- IFTTT Settigs -->
+  <provider name="IFTTT" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[ifttt\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://www.ifttt.com/oembed/]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- Instagram Settigs -->
+  <provider name="Instagram" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[instagram\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://api.instagram.com/oembed]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- Rdio Settigs -->
+  <provider name="Rdio" type="Umbraco.Web.Media.EmbedProviders.OEmbedJson, umbraco">
+    <urlShemeRegex><![CDATA[rdio\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://www.rdio.com/api/oembed/]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
   <!-- SoundCloud Settigs -->
   <provider name="SoundCloud" type="Umbraco.Web.Media.EmbedProviders.OEmbedRich, umbraco">
     <urlShemeRegex><![CDATA[soundcloud\.com/]]></urlShemeRegex>
     <apiEndpoint><![CDATA[http://soundcloud.com/oembed]]></apiEndpoint>
     <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
   </provider>
-  <!-- Twitgoo Settings , not an OEmbed one -->
-  <provider name="Twitgoo" type="Umbraco.Web.Media.EmbedProviders.Twitgoo, umbraco">
-    <urlShemeRegex><![CDATA[twitgoo\.com/]]></urlShemeRegex>
-  </provider>
   <!-- Youtube Settings -->
   <provider name="Youtube" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, umbraco">
     <urlShemeRegex><![CDATA[youtu(?:\.be|be\.com)/(?:(.*)v(/|=)|(.*/)?)([a-zA-Z0-9-_]+)]]></urlShemeRegex>
@@ -67,5 +99,21 @@
     <urlShemeRegex><![CDATA[vimeo\.com/]]></urlShemeRegex>
     <apiEndpoint><![CDATA[http://vimeo.com/api/oembed.xml]]></apiEndpoint>
     <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
-  </provider>  
+  </provider>
+  <!-- Ted -->
+  <provider name="Ted" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, umbraco">
+    <urlShemeRegex><![CDATA[ted\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://www.ted.com/talks/oembed.xml]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- Screenr Settings -->
+  <provider name="Screenr" type="Umbraco.Web.Media.EmbedProviders.OEmbedVideo, umbraco" supportsDimensions="False">
+    <urlShemeRegex><![CDATA[screenr\.com/]]></urlShemeRegex>
+    <apiEndpoint><![CDATA[http://www.screenr.com/api/oembed.xml]]></apiEndpoint>
+    <requestParams type="Umbraco.Web.Media.EmbedProviders.Settings.Dictionary, umbraco"></requestParams>
+  </provider>
+  <!-- Twitgoo Settings , not an OEmbed one -->
+  <provider name="Twitgoo" type="Umbraco.Web.Media.EmbedProviders.Twitgoo, umbraco">
+    <urlShemeRegex><![CDATA[twitgoo\.com/]]></urlShemeRegex>
+  </provider>
 </embed>
diff --git a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs b/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
index 2bf01d40b2..51622ed504 100644
--- a/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
+++ b/src/Umbraco.Web/Media/EmbedProviders/AbstractOEmbedProvider.cs
@@ -8,6 +8,8 @@ using Umbraco.Core.Media;
 
 namespace Umbraco.Web.Media.EmbedProviders
 {
+    //TODO: Make all Http calls async
+
     public abstract class AbstractOEmbedProvider: IEmbedProvider
     {
         public virtual bool SupportsDimensions
diff --git a/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
new file mode 100644
index 0000000000..944513ee4f
--- /dev/null
+++ b/src/Umbraco.Web/Media/EmbedProviders/Flickr.cs
@@ -0,0 +1,25 @@
+using System;
+using System.ComponentModel;
+using System.Web;
+
+namespace Umbraco.Web.Media.EmbedProviders
+{
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    [Obsolete("This is no longer used and will be removed from the codebase in the future, for Flickr, use the Umbraco.Web.Media.EmbedProviders.OEmbedPhoto provider")]
+    public class Flickr : AbstractOEmbedProvider
+    {
+        public override string GetMarkup(string url, int maxWidth, int maxHeight)
+        {
+            var flickrUrl = BuildFullUrl(url, maxWidth, maxHeight);
+            var doc = GetXmlResponse(flickrUrl);
+
+            string imageUrl = doc.SelectSingleNode("/oembed/url").InnerText;
+            string imageWidth = doc.SelectSingleNode("/oembed/width").InnerText;
+            string imageHeight = doc.SelectSingleNode("/oembed/height").InnerText;
+            string imageTitle = doc.SelectSingleNode("/oembed/title").InnerText;
+
+            return string.Format("<img src=\"{0}\" width\"{1}\" height=\"{2}\" alt=\"{3}\" />",
+                imageUrl, imageWidth, imageHeight, HttpUtility.HtmlEncode(imageTitle));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 17322a218f..ea3f838076 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -302,6 +302,7 @@
     <Compile Include="ApplicationContextExtensions.cs" />
     <Compile Include="AreaRegistrationContextExtensions.cs" />
     <Compile Include="HtmlHelperBackOfficeExtensions.cs" />
+    <Compile Include="Media\EmbedProviders\Flickr.cs" />
     <Compile Include="PropertyEditors\DatePreValueEditor.cs" />
     <Compile Include="Security\Identity\GetUserSecondsMiddleWare.cs" />
     <Compile Include="Media\EmbedProviders\OEmbedJson.cs" />