From 6002ae04a748e6b41a7cdecfe0d8d320d1f59d16 Mon Sep 17 00:00:00 2001
From: "Alexia E. Smith" <washuu@gmail.com>
Date: Thu, 26 May 2016 16:16:55 -0500
Subject: [PATCH] Alphabetize and add service examples.

---
 README.md                |  1 +
 README.mediawiki         | 13 +++++++++----
 classes/VideoService.php | 24 ++++++++++++------------
 3 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index caaf215..3c3225a 100644
--- a/README.md
+++ b/README.md
@@ -140,6 +140,7 @@ As of version 2.x, EmbedVideo supports embedding video content from the followin
 | [Beam](https://beam.pro/)                                | `beam`                                                                                | RocketBear                                                                            | https://beam.pro/RocketBear                                                                                    |
 | [Bing](http://www.bing.com/videos/)                      | `bing`                                                                                | 31ncp9r7l                                                                             | http://www.bing.com/videos/watch/video/adorable-cats-attempt-to-eat-invisible-tuna/31ncp9r7l                   |
 | [Blip.tv](http://www.blip.tv/)                           | `blip` - Blip requires the full URL to the video page and does not accept the raw ID. |                                                                                       | http://blip.tv/vinylrewind/review-6864612                                                                      |
+| [C3TV](https://media.ccc.de/)                            | `mediacccde`                                                                          | 32c3-7305-quantum_cryptography                                                        | https://media.ccc.de/v/32c3-7305-quantum\_cryptography                                                         |
 | [CollegeHumor](http://www.collegehumor.com/)             | `collegehumor`                                                                        | 6875289                                                                               | http://www.collegehumor.com/video/6875289/batman-says-his-goodbyes                                             |
 | [Dailymotion](http://www.dailymotion.com/)               | `dailymotion`                                                                         | x1adiiw\_archer-waking-up-as-h-jon-benjamin\_shortfilms                               | http://www.dailymotion.com/video/x1adiiw\_archer-waking-up-as-h-jon-benjamin\_shortfilms                       |
 | [Daum TVPot](http://tvpot.daum.net/)                     | `tvpot` - Obtain the URL or ID from the share menu URL.                               | s9011HdLzYwpLwBodQzCHRB                                                               | http://tvpot.daum.net/v/s9011HdLzYwpLwBodQzCHRB                                                                |
diff --git a/README.mediawiki b/README.mediawiki
index b590768..18aaa9b 100644
--- a/README.mediawiki
+++ b/README.mediawiki
@@ -153,22 +153,27 @@ As of version 2.x, EmbedVideo supports embedding video content from the followin
 | <nowiki>RocketBear</nowiki>
 | <nowiki>https://beam.pro/RocketBear</nowiki>
 |-
-! [http://www.bing.com/videos/ Bing] 
+! [http://www.bing.com/videos/ Bing]
 | colspan="2"|<tt>bing</tt>
 | <nowiki>31ncp9r7l</nowiki>
 | <nowiki>http://www.bing.com/videos/watch/video/adorable-cats-attempt-to-eat-invisible-tuna/31ncp9r7l</nowiki>
 |-
-! [http://www.blip.tv/ Blip.tv] 
+! [http://www.blip.tv/ Blip.tv]
 | colspan="2"|<tt>blip</tt> - Blip requires the full URL to the video page and does not accept the raw ID.
 | 
 |<nowiki>http://blip.tv/vinylrewind/review-6864612</nowiki>
 |-
-! [http://www.collegehumor.com/ CollegeHumor] 
+! [https://media.ccc.de/ C3TV]
+| colspan="2"|<tt>mediacccde</tt>
+| <nowiki>32c3-7305-quantum_cryptography</nowiki>
+| <nowiki>https://media.ccc.de/v/32c3-7305-quantum_cryptography</nowiki>
+|-
+! [http://www.collegehumor.com/ CollegeHumor]
 | colspan="2"|<tt>collegehumor</tt>
 | <nowiki>6875289</nowiki>
 | <nowiki>http://www.collegehumor.com/video/6875289/batman-says-his-goodbyes</nowiki>
 |-
-! [http://www.dailymotion.com/ Dailymotion] 
+! [http://www.dailymotion.com/ Dailymotion]
 | colspan="2"|<tt>dailymotion</tt>
 | <nowiki>x1adiiw_archer-waking-up-as-h-jon-benjamin_shortfilms</nowiki>
 | <nowiki>http://www.dailymotion.com/video/x1adiiw_archer-waking-up-as-h-jon-benjamin_shortfilms</nowiki>
diff --git a/classes/VideoService.php b/classes/VideoService.php
index 139da98..e966a3a 100644
--- a/classes/VideoService.php
+++ b/classes/VideoService.php
@@ -163,6 +163,18 @@ class VideoService {
 				'#^([\d\w-]+/[\d\w-]+)$#is'
 			]
 		],
+		'mediacccde' => [
+			'embed'     => '<iframe src="https://media.ccc.de/v/%1$s/oembed" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true" scrolling="no"></iframe>',
+			'default_width' => 660,
+			'default_ratio' => 1.77777777777778, //(16 / 9),
+			'https_enabled' => true,
+			'url_regex' => [
+				'#conferences/.*?([\d\w_-]+)(?:/oembed)?.html$#is'
+			],
+			'id_regex'    => [
+				'#^([\d\w_-]+)$#is'
+			]
+		],
 		'metacafe' => [
 			'embed'			=> '<iframe src="http://www.metacafe.com/embed/%1$s/" width="%2$d" height="%3$d" frameborder="0" allowFullScreen="true"></iframe>',
 			'default_width'	=> 640,
@@ -361,18 +373,6 @@ class VideoService {
 			'id_regex'		=> [
 				'#^(?:id_)?([\d\w-]+)$#is'
 			]
-		],
-		'mediacccde' => [
-			'embed'     => '<iframe src="https://media.ccc.de/v/%1$s/oembed" width="%2$d" height="%3$d" frameborder="0" allowfullscreen="true" scrolling="no"></iframe>',
-			'default_width' => 660,
-			'default_ratio' => 1.77777777777778, //(16 / 9),
-			'https_enabled' => true,
-			'url_regex' => [
-				'#conferences/.*?([\d\w_-]+)(?:/oembed)?.html$#is'
-			],
-			'id_regex'    => [
-				'#^([\d\w_-]+)$#is'
-			]
 		]
 	];