Ticket #454: player.diff

themes/default/tpl/_flv_player.html

@@ -3 +3 @@
 <param name="movie" value="{{tpl:BlogQmarkURL}}pf=player_flv.swf" />
 <param name="wmode" value="transparent" />
 <param name="allowFullScreen" value="true" />
-<param name="FlashVars" value="flv={{tpl:AttachmentURL}}&amp;width=400&amp;height=300&amp;margin=1&amp;showfullscreen=1&amp;showvolume=1&amp;showtime=1" />
+<param name="FlashVars" value="flv={{tpl:FileURL}}&amp;width=400&amp;height=300&amp;margin=1&amp;showfullscreen=1&amp;showvolume=1&amp;showtime=1" />
 </object>
+ No newline at end of file

themes/default/tpl/_mp3_player.html

@@ -1 +1 @@
 <object type="application/x-shockwave-flash" data="{{tpl:BlogQmarkURL}}pf=player_mp3.swf" width="200" height="20">
 <param name="movie" value="{{tpl:BlogQmarkURL}}pf=player_mp3.swf" />
 <param name="wmode" value="transparent" />
-<param name="FlashVars" value="mp3={{tpl:AttachmentURL}}&amp;loadingcolor=ff9900&amp;bgcolor1=eeeeee&amp;bgcolor2=cccccc&amp;buttoncolor=0066cc&amp;buttonovercolor=ff9900&amp;slidercolor1=cccccc&amp;slidercolor2=999999&amp;sliderovercolor=0066cc" />
+<param name="FlashVars" value="mp3={{tpl:FileURL}}&amp;loadingcolor=ff9900&amp;bgcolor1=eeeeee&amp;bgcolor2=cccccc&amp;buttoncolor=0066cc&amp;buttonovercolor=ff9900&amp;slidercolor1=cccccc&amp;slidercolor2=999999&amp;sliderovercolor=0066cc" />
 </object>
+ No newline at end of file

inc/public/class.dc.template.php

@@ -60 +60 @@
           $this->addValue('AttachmentTitle',array($this,'AttachmentTitle'));
           $this->addValue('AttachmentThumbnailURL',array($this,'AttachmentThumbnailURL'));
           $this->addValue('AttachmentURL',array($this,'AttachmentURL'));
+          $this->addValue('FileURL',array($this,'FileURL'));
           $this->addBlock('AttachmentIf',array($this,'AttachmentIf'));
           
           # Blog
@@ -556 +557 @@
           "?>\n".
           
           '<?php foreach ($_ctx->attachments as $attach_i => $attach_f) : '.
-          '$GLOBALS[\'attach_i\'] = $attach_i; $GLOBALS[\'attach_f\'] = $attach_f; ?>'.
+          '$GLOBALS[\'attach_i\'] = $attach_i; $GLOBALS[\'attach_f\'] = $attach_f;'.
+          '$_ctx->file_url = $attach_f->file_url; ?>'.
           $content.
-          '<?php endforeach; $_ctx->attachments = null; unset($attach_id); unset($attach_f); ?>'.
+          '<?php endforeach; $_ctx->attachments = null; unset($attach_id,$attach_f,$_ctx->file_url); ?>'.
           
           "<?php } ?>\n";
           
@@ -703 +705 @@
           return '<?php echo '.sprintf($f,'$attach_f->file_url').'; ?>';
      }
      
+     /*dtd
+     <!ELEMENT tpl:FileURL - O -- File URL -->
+     */
+     public function FileURL($attr)
+     {
+          $f = $this->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->file_url').'; ?>';
+     }
      
      /* Blog ----------------------------------------------- */
      /*dtd