X-Git-Url: http://git.pippins.net/embedvideo/.git/%27%20%20%20%20.%20%24GLOBALS%5B%27phpgw%27%5D-%3Elink%28%27inc/jquery/jquery.tablesorter.css%27%29.%27?a=blobdiff_plain;f=ItemAddEmbedVideo.inc;h=ac3f12ad3d83091c4ea61e318440e957614ef3e7;hb=8870ef4a2301f397d4b71da6ac25f4e2e5564199;hp=46e290b2904cce8df84ef9154ef40e36cc34e1d4;hpb=3feb31a7ea3788264c4fe4dbd30e531a4c5960fd;p=embedvideo%2F.git
diff --git a/ItemAddEmbedVideo.inc b/ItemAddEmbedVideo.inc
index 46e290b..ac3f12a 100644
--- a/ItemAddEmbedVideo.inc
+++ b/ItemAddEmbedVideo.inc
@@ -34,7 +34,7 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
* @see ItemAddPlugin::handleRequest
*/
function handleRequest($form, &$item) {
- global $gallery;
+ global $gallery, $url;
$status = $error = array();
@@ -90,6 +90,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$watermarkImage = $this->getParameter($ItemAddEmbedVideo, 'watermarkImage', "");
$watermarkVideos = $this->getParameter($ItemAddEmbedVideo, 'watermarkVideos', "false");
$watermarkAlignment = $this->getParameter($ItemAddEmbedVideo, 'watermarkAlignment', "left");
+ $wordwrapSummary = $this->getParameter($ItemAddEmbedVideo, 'wordwrapSummary', "0");
+ $wordwrapDescription = $this->getParameter($ItemAddEmbedVideo, 'wordwrapDescription', "0");
/* Print our stored/set Parameters */
if(!strcmp($debugOutput,"true")) {
@@ -109,6 +111,8 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
print "watermarkVideos=$watermarkVideos
\n";
print "watermarkImage=$watermarkImage
\n";
print "watermarkAlignment=$watermarkAlignment
\n";
+ print "wordwrapSummary=$wordwrapSummary
\n";
+ print "wordwrapDescription=$wordwrapDescription
\n";
print "
\n";
}
@@ -236,7 +240,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -316,7 +319,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description.= $video_id.$autoStartStr.$youtubeShowRelatedStr;
$description.= '" type="application/x-shockwave-flash" wmode="transparent" ';
$description.= 'width="'.$width.'" height="'.$height.'">';
- $description.= "
$summary";
}
/*
**********************************
@@ -379,7 +381,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description.= 'type="application/x-shockwave-flash" ';
$description.= 'src="'.$googlePlayer.'?docId='.$doc_id.$autoStartStr.'" flashvars=""> ';
$description.= '';
- $description.= "
$summary";
/*
**********************************
@@ -427,7 +428,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/width='\d+'/","width='".$width."'",$description);
$description=preg_replace("/height='\d+'/","height='".$height."'",$description);
}
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -479,7 +479,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/\.swf/",".swf?playerVars=autoPlay=yes",$description);
}
$description.= "";
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -538,7 +537,6 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
$description=preg_replace("/$height/",$height.";autoplay:true",$description);
}
$description.= ">";
- $description.= "
$summary";
} else {
return array(GalleryCoreApi::error(ERROR_BAD_PATH,__FILE__,__LINE__,
"Unable to extract embedded video information from url: $url"),NULL,NULL);
@@ -570,18 +568,18 @@ class ItemAddEmbedVideo extends ItemAddPlugin {
}
/* Extract the summary from the webpage contents */
- preg_match('//i', $contents, $matches);
+ preg_match('/(.+?)<\/div>/i', $contents, $matches);
$summary=$matches[1];
/* Extract the title from the webpage contents */
preg_match('//i', $contents, $matches);
- $title=$matches[1];
+ $title=htmlentities($matches[1], ENT_QUOTES, "UTF-8");
/* Build the thumbnail URL from the item_id */
$thumbnail=$dailymotionThumbnailUrl.$item_id;
/* Format the description to hold a reference to the embedded video */
- if(preg_match('/Embeddable Player:.+?value="(.+?)"/', $contents, $matches)) {
+ if(preg_match('/