--- drigg_embed.module 2008-04-10 01:44:19.000000000 -0400
+++ drigg_embed.module.new 2008-06-10 22:33:56.000000000 -0400
@@ -76,20 +76,6 @@ function drigg_embed_admin_settings(){
'#required' => FALSE
);
- $form['collegehumor'] = array(
- '#type' => 'fieldset',
- '#title' => t('CollegeHumor settings'),
- '#collapsible' => FALSE,
- '#collapsed' => FALSE
- );
-
- $form['collegehumor']['drigg_embed_show_collegehumor'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable Collegehumor video embedding in stories'),
- '#default_value' => variable_get('drigg_embed_show_collegehumor',FALSE),
- '#required' => FALSE
- );
-
$form['metacafe'] = array(
'#type' => 'fieldset',
'#title' => t('Metacafe settings'),
@@ -184,11 +170,9 @@ function drigg_embed_contents($o,$node_u
if(variable_get('drigg_embed_show_yahoo_video',FALSE)){
if(preg_match('|video.yahoo.com/watch/([^/]*)/(.*)$|', $url, $matches)){
-
if($teaser){
- $return = '';
- } else {
-
+ $return = '';
+ } else {
$return = '';
}
return variable_get('drigg_embed_before', '').$return.variable_get('drigg_embed_after', '');
@@ -198,11 +182,9 @@ function drigg_embed_contents($o,$node_u
if(variable_get('drigg_embed_show_google_video',FALSE)){
if(preg_match('|video.google.com/videoplay\?docid=(.*)$|', $url, $matches)){
-
if($teaser){
- $return = '';
+ $return = '';
} else {
-
$return = '';
}
return variable_get('drigg_embed_before', '').$return.variable_get('drigg_embed_after', '');
@@ -210,12 +192,12 @@ function drigg_embed_contents($o,$node_u
}
if(variable_get('drigg_embed_show_ifilm',FALSE)){
- if(preg_match('|www.spike.com/video/(.*)$|', $url, $matches)){
+ if(preg_match('|www.spike.com/video/(.*)$|', $url, $matches)){
+ $split = explode("/", $matches[1]);
if($teaser){
- $return = '';
+ $return = '';
} else {
-
$return = '';
}
return variable_get('drigg_embed_before', '').$return.variable_get('drigg_embed_after', '');
@@ -223,12 +205,11 @@ function drigg_embed_contents($o,$node_u
}
if(variable_get('drigg_embed_show_veoh',FALSE)){
- if(preg_match('|veoh.com/videos/([^/?]*)|', $url, $matches)){
+ if(preg_match('|veoh.com/videos/([^/?]*)|', $url, $matches)){
if($teaser){
- $return = '';
- } else {
-
+ $return = '';
+ } else {
$return = '';
}
return variable_get('drigg_embed_before', '').$return.variable_get('drigg_embed_after', '');
@@ -236,12 +217,11 @@ function drigg_embed_contents($o,$node_u
}
if(variable_get('drigg_embed_show_revver',FALSE)){
- if(preg_match('|revver.com/video/(.*?)/.*$|', $url, $matches)){
+ if(preg_match('|revver.com/video/(.*?)/.*$|', $url, $matches)){
if($teaser){
- $return = '';
+ $return = '';
} else {
-
$return = '
';
}
return variable_get('drigg_embed_before', '').$return.variable_get('drigg_embed_after', '');
@@ -249,40 +229,24 @@ function drigg_embed_contents($o,$node_u
}
if(variable_get('drigg_embed_show_metacafe',FALSE)){
- if(preg_match('|www\.metacafe\.com/watch/(.*?)/?$|', $url, $matches)){
+ if(preg_match('|www\.metacafe\.com/watch/(.*?)/?$|', $url, $matches)){
+ $split = explode("/", $matches[1]);
if($teaser){
- $return = '';
+ $return = '';
} else {
-
$return = '';
}
return variable_get('drigg_embed_before', '').$return.variable_get('drigg_embed_after', '');
}
}
-
- if(variable_get('drigg_embed_show_collegehumor',FALSE)){
- if(preg_match('|^http://www.collegehumor.com/video:([^\&]+)|', $url, $matches)){
-
- if($teaser){
- $return = '';
- } else {
- $return = '';
- }
- return variable_get('drigg_embed_before', '').$return.variable_get('drigg_embed_after', '');
- }
- }
-
// Youtube: 'youtube'
if(variable_get('drigg_embed_show_youtube',FALSE)){
-
- #if(preg_match('|^http://www.youtube.com/watch\?v=([^\&]+)|', $url, $matches)){
- if(preg_match('/youtube\.com\/watch\?v=(.*)/', $url, $matches)){
-
+ if(preg_match('/youtube\.com\/watch\?v=([A-Za-z0-9._%-]*)[&\w;=\+_\-]*/', $url, $matches)){
if($teaser){
- $return = '';
+ $return = '';
} else {
$return = '';
}
