Changeset 519

Timestamp:

10/13/08 02:20:01 (15 years ago)

Author:

Moe

google:author:

appears

Message:

Public Media 1.1.1 :

• {{tpl:MediaItemFileURL}} is back for MP3s en FLV files
• added {{tpl:MediaItemDlURL}} for other files
• fixed bugs with strict PHP standards

Location:

plugins/publicMedia

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (6 diffs)
• default-templates/media.html (modified) (2 diffs)

plugins/publicMedia/_define.php

@@ -25 +25 @@
      /* Name */                      "Public Media",
      /* Description*/                "Display media on a public page or in a widget",
-     /* Author */                    "Moe (http://gniark.net/) and Osku and Tomtom (http://blog.zenstyle.fr)",
-     /* Version */                   '1.1',
+     /* Author */                    "Moe (http://gniark.net/), Osku and Tomtom (http://blog.zenstyle.fr)",
+     /* Version */                   '1.1.1',
      /* Permissions */               'admin'
 );

plugins/publicMedia/_public.php

@@ -156 +156 @@
      
      /**
-     serve downlaod headers
+     serve download headers
      @param    args <b>string</b>  Argument
      */
-     public function wrapper($args)
+     public static function wrapper($args)
      {
           global $core;
@@ -167 +167 @@
           }
           
-          $core->media = new dcMedia($core);
+          if (!is_object($core->media))
+          {
+               $core->media = new dcMedia($core);
+          }
           
           $core->media->chdir($core->blog->settings->publicmedia_page_root);
+          // we need to test if the file is in a subdirectory of -^
           $core->media->getDir();
           
           $items = $core->media->dir['files'];
-
+          
+          # initialize $file
+          $file = '';
+          
           foreach ($items as $media_item) {
                if ($media_item->media_id == $args) {
@@ -189 +196 @@
                $count = unserialize($core->blog->settings->publicmedia_count_dl);
                $count[$file_id] = array_key_exists($file_id,$count) ? $count[$file_id]+1 : 1;
+               // if (!is_object($core->settings)) ?
                $settings = new dcSettings($core,$core->blog->id);
                $settings->setNamespace('system');
@@ -250 +258 @@
 $core->tpl->addValue('MediaItemSize',array('publicMediaPageTpl','itemSize'));
 $core->tpl->addValue('MediaItemFileURL',array('publicMediaPageTpl','itemFileURL'));
+$core->tpl->addValue('MediaItemDlURL',array('publicMediaPageTpl','itemDlURL'));
 
 $core->tpl->addValue('MediaItemBasename',array('publicMediaPageTpl',
@@ -567 +576 @@
           $f = $GLOBALS['core']->tpl->getFilters($attr);
           
-          $link = $GLOBALS['core']->blog->url.'download/';
-          
-          return($link.'<?php echo '.sprintf($f,'$_ctx->media_item->media_id').'; ?>');
+          return('<?php echo '.sprintf($f,'$_ctx->media_item->file_url').'; ?>');
+     }
+     /**
+     Item download URL
+     @param    attr <b>array</b>   Attribute
+     @return   <b>string</b> PHP block
+     */
+     public static function itemDlURL($attr)
+     {
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+
+          return('<?php echo($core->blog->url.\'download/\'.'.sprintf($f,'$_ctx->media_item->media_id').'); ?>');
      }         
      /**
@@ -640 +658 @@
           return 
                '<?php $count = unserialize($core->blog->settings->publicmedia_count_dl); '.
+               'if (empty($count)) {$count = array();}'.
                'echo '.sprintf($f,'array_key_exists($_ctx->media_item->media_id,$count) ? $count[$_ctx->media_item->media_id] : "0"').
                '; ?>';

plugins/publicMedia/default-templates/media.html

@@ -122 +122 @@
                               {{tpl:MediaSwitchCase case="image/tiff"}}
                               {{tpl:MediaSwitchCase case="image/x-xbitmap"}}
-                                   <a href="{{tpl:MediaItemFileURL}}" 
+                                   <a href="{{tpl:MediaItemDlURL}}" 
                                         title="{{tpl:MediaItemBasename}}">
                                    <img src="{{tpl:MediaItemImageThumbPath size="s"}}" alt="{{tpl:MediaItemTitle}}" />
@@ -149 +149 @@
                               <!-- # other files -->
                               {{tpl:MediaSwitchDefault}}
-                                   <a href="{{tpl:MediaItemFileURL}}" 
+                                   <a href="{{tpl:MediaItemDlURL}}" 
                                         title="{{tpl:MediaItemBasename}}">
                                    {{tpl:MediaItemTitle}}