Changeset 520

Timestamp:

10/13/08 03:05:14 (15 years ago)

Author:

Moe

google:author:

appears

Message:

Public Media 1.1.2 :

• fixed bugs with settings' namespace (definitely)
• fixed bug with BreadCrumb? when a page root is defined
• added test before downloading file, the file must be in the root directory or its subdirectories
• added compatibility with myUrlHandlers plugin

Location:

plugins/publicMedia

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (4 diffs)

plugins/publicMedia/_admin.php

@@ -43 +43 @@
           global $core;
 
-          $settings->setNameSpace('publicmedia_page');
+          $settings->setNameSpace('publicmedia');
           $settings->put('publicmedia_page_active',!empty($_POST['publicmedia_page_active']),
                'boolean','Activate Media Page');
@@ -54 +54 @@
                (!empty($_POST['publicmedia_page_root']) ? $_POST['publicmedia_page_root'] : ''),
                'string', 'root directory');
-          $settings->put('publicmedia_count_dl',
+          /*$settings->put('publicmedia_count_dl',
                (!empty($_POST['publicmedia_count_dl']) ? $_POST['publicmedia_count_dl'] : serialize(array())),
-               'string', 'Download counter');
+               'string', 'Download counter');*/
           # inspirated from lightbox/admin.php
           $settings->setNameSpace('system');

plugins/publicMedia/_define.php

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

plugins/publicMedia/_install.php

@@ -38 +38 @@
 $cur = $core->con->openCursor($core->prefix.'setting');
 $cur->setting_ns = 'publicmedia';
-$cur->update('WHERE (setting_id LIKE \'publicmedia_page%\') '.
+$cur->update('WHERE (setting_id LIKE \'publicmedia_%\') '.
      'AND setting_ns = \'system\';');
 

plugins/publicMedia/_public.php

@@ -75 +75 @@
                     $dirs = explode('/',$_ctx->mediaPage_currentDir);
                     $path = '';
+                    //die('<pre>'.print_r($dirs,true).'</pre>');
                     foreach ($dirs as $dir)
                     {
-                         $path = (($path == '') ? $dir : $path.'/'.$dir); 
-                         $breadCrumb[$dir] = $base_url.$path;
+                         $dir = trim($dir);
+                         if (!empty($dir))
+                         {
+                              $path = (($path == '') ? $dir : $path.'/'.$dir); 
+                              $breadCrumb[$dir] = $base_url.$path;
+                         }
                     }
                }
@@ -130 +135 @@
                          $item->relname =
                               substr($item->relname,$page_root_len);
+                         # parent directory
                          if ($item->file == $parent_dir_full_path)
                          {
@@ -171 +177 @@
                $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) {
-                    $file_id = $media_item->media_id;
-                    $file_ext = $media_item->extension;
-                    $file_mime = $media_item->type;
-                    $file_name = $media_item->media_title;
-                    $file = $media_item->file;
-                    break;
+
+          $file = $core->media->getFile($args);
+          
+          $page_root = $core->blog->settings->publicmedia_page_root;
+          
+          if (!empty($page_root))
+          {
+               if (strpos($file->relname,$page_root) !== 0)
+               {
+                    self::p404();
                }
-          }
-          unset($items);
+          }         
             
-          if ($file && is_readable($file)) {
+          if ($file->file && is_readable($file->file)) {
                $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');
+               $count[$file->media_id] = array_key_exists($file->media_id,$count) ? $count[$file->media_id]+1 : 1;
+               if (!is_object($core->blog->settings))
+               {
+                    $settings = new dcSettings($core,$core->blog->id);
+               }
+               else
+               {
+                    $settings =& $core->blog->settings;
+               }
+               $settings->setNamespace('publicmedia');
                $settings->put('publicmedia_count_dl',serialize($count),'string','Download counter');
                //$core->callBehavior('publicDownloadedFile',(integer)$args);
-               header('Content-type: '.$file_mime);
-               header('Content-Disposition: attachment; filename="'.$file_name.'"');
-               readfile($file);
+               header('Content-type: '.$file->type);
+               header('Content-Disposition: attachment; filename="'.$file->basename.'"');
+               readfile($file->file);
                exit;
           }
@@ -587 +590 @@
           $f = $GLOBALS['core']->tpl->getFilters($attr);
 
-          return('<?php echo($core->blog->url.\'download/\'.'.sprintf($f,'$_ctx->media_item->media_id').'); ?>');
+          return('<?php echo($core->blog->url.$core->url->getBase(\'download\').\'/\'.'.sprintf($f,'$_ctx->media_item->media_id').'); ?>');
      }         
      /**