Added CNNMoney

README.md

@@ -59,6 +59,11 @@ Media BB Codes for XenForo, imported from [s9e\TextFormatter](https://github.com
 			<td>CNN</td>
 			<td>http://edition.cnn.com/video/data/2.0/video/showbiz/2013/10/25/spc-preview-savages-stephen-king-thor.cnn.html<br/>http://us.cnn.com/video/data/2.0/video/bestoftv/2013/10/23/vo-nr-prince-george-christening-arrival.cnn.html</td>
 		</tr>
+		<tr>
+			<td><code>cnnmoney</code></td>
+			<td>CNNMoney</td>
+			<td>http://money.cnn.com/video/technology/2014/05/20/t-twitch-vp-on-future.cnnmoney/</td>
+		</tr>
 		<tr>
 			<td><code>colbertnation</code></td>
 			<td>Colbert Nation</td>

build/addon.xml

@@ -1,4 +1,4 @@
-<addon addon_id="s9e" title="s9e Media Pack" url="https://github.com/s9e/XenForoMediaBBCodes" version_id="201408070" version_string="20140807" install_callback_class="s9e_MediaBBCodes" install_callback_method="install">
+<addon addon_id="s9e" title="s9e Media Pack" url="https://github.com/s9e/XenForoMediaBBCodes" version_id="201408080" version_string="20140808" install_callback_class="s9e_MediaBBCodes" install_callback_method="install">
   <bb_code_media_sites>
     <site media_site_id="abcnews" site_title="ABC News" site_url="http://abcnews.go.com/" match_is_regex="1" supported="1">
       <match_urls>!abcnews\.go\.com/[^/]+/video/[^/]+-(?'id'\d+)!</match_urls>
@@ -37,9 +37,13 @@
       <embed_html><![CDATA[<object type="application/x-shockwave-flash" typemustmatch="" width="400" height="380" data="//plus.cnbc.com/rssvideosearch/action/player/id/{$id}/code/cnbcplayershare"><param name="allowfullscreen" value="true"/><embed type="application/x-shockwave-flash" src="//plus.cnbc.com/rssvideosearch/action/player/id/{$id}/code/cnbcplayershare" width="400" height="380" allowfullscreen=""/></object>]]></embed_html>
     </site>
     <site media_site_id="cnn" site_title="CNN" site_url="http://edition.cnn.com/video/" match_is_regex="1" supported="1">
-      <match_urls>!cnn\.com/video/data/2\.0/video/(?'id'.*\.cnn)!</match_urls>
+      <match_urls>!(?=.*?[./](?&gt;edition|us)\.cnn\.com).*?cnn\.com/video/data/2\.0/video/(?'id'.*\.cnn)!</match_urls>
       <embed_html><![CDATA[<iframe width="560" height="315" src="http://edition.cnn.com/.element/widget/video/videoapi/html/embed.html#/video/{$id}" allowfullscreen="" frameborder="0" scrolling="no"></iframe>]]></embed_html>
     </site>
+    <site media_site_id="cnnmoney" site_title="CNNMoney" site_url="http://money.cnn.com/video/" match_is_regex="1" supported="1">
+      <match_urls>!money\.cnn\.com/video/(?'id'.*\.cnnmoney)!</match_urls>
+      <embed_html><![CDATA[<iframe width="560" height="360" src="http://money.cnn.com/.element/ssi/video/7.0/players/embed.player.html?videoid=video/{$id}&amp;width=560&amp;height=360" allowfullscreen="" frameborder="0" scrolling="no"></iframe>]]></embed_html>
+    </site>
     <site media_site_id="colbertnation" site_title="Colbert Nation" site_url="http://thecolbertreport.cc.com/" match_is_regex="1" supported="1" embed_html_callback_class="s9e_MediaBBCodes" embed_html_callback_method="embed" match_callback_class="s9e_MediaBBCodes" match_callback_method="matchColbertnation">
       <match_urls>!(?'id')thecolbertreport\.cc\.com/videos/!</match_urls>
       <embed_html><![CDATA[<iframe width="512" height="288" src="//media.mtvnservices.com/embed/{$id}" allowfullscreen="" frameborder="0" scrolling="no"></iframe>]]></embed_html>