Changeset 4536

Timestamp:

02/02/12 10:46:07 (4 months ago)

Author:

tboutell

Message:

Refactored getEmbedCode() so it doesn't instantiate embed services twice and doesn't crash if the service URL is bogus and the width and height aren't known

Files:

• plugins/apostrophePlugin/branches/1.5/lib/model/doctrine/PluginaMediaItem.class.php (modified) (3 diffs)

plugins/apostrophePlugin/branches/1.5/lib/model/doctrine/PluginaMediaItem.class.php

@@ -278 +278 @@
   public function getEmbedCode($width, $height, $resizeType, $format = 'jpg', $absolute = false, $wmode = 'opaque', $autoplay = false, $options = array())
   {
+    $embeddable = $this->getEmbeddable();
+    $service = null;
+    // A little bit of refactoring to avoid instantiating the service twice.
+    // We need an embed service to handle anything embeddable with a service URL, so
+    // check early
+    if ($embeddable && strlen($this->service_url))
+    {
+      $service = aMediaTools::getEmbedService($this->service_url);
+      if (!$service)
+      {
+        // Most likely explanation: this service was configured, now it's not.
+        // Don't crash
+        return '<div>Video Service Not Available</div>';
+      }
+    }
+    
     if ($height === false)
     {
@@ -284 +300 @@
       {
         // Not known yet. This comes up when previewing a video with a service URL that we haven't saved yet
-        if ($this->service_url)
+        if (isset($service))
         {
-          $service = aMediaTools::getEmbedService($this->service_url);
           $thumbnail = $service->getThumbnail($service->getIdFromUrl($this->service_url));
           if ($thumbnail)
@@ -311 +326 @@
       $title = aHtml::entities($this->getTitle());
     }
-    if ($this->getEmbeddable())
-    {
-      if ($this->service_url)
-      {
-        $service = aMediaTools::getEmbedService($this->service_url);
-        if (!$service)
-        {
-          // Most likely explanation: this service was configured, now it's not.
-          // Don't crash
-          return '<div>Video Service Not Available</div>';
-        }
+    if ($embeddable)
+    {
+      if ($service)
+      {
         return $service->embed($service->getIdFromUrl($this->service_url), $width, $height, $title, $wmode, $autoplay);
       }