Changeset 537

Timestamp:

10/27/08 17:36:04 (15 years ago)

Author:

Moe

google:author:

appears

Message:

DL Manager 1.0-beta10 :

• improved display in media files :

added breadcrumb and link to file's directory on media_player.html

Location:

plugins/dlManager

Files:

• _define.php (modified) (1 diff)
• _public.php (modified) (7 diffs)
• default-templates/media.html (modified) (2 diffs)
• default-templates/media_player.html (modified) (4 diffs)
• lib.dlManager.php (modified) (1 diff)
• locales/fr/main.mo (modified) (previous)
• locales/fr/main.po (modified) (3 diffs)
• public_l10n.php (modified) (1 diff)

plugins/dlManager/_define.php

@@ -28 +28 @@
      /* Description*/                "Download manager with a public page and a widget",
      /* Author */                    "Moe (http://gniark.net/), Osku and Tomtom (http://blog.zenstyle.fr)",
-     /* Version */                   '1.0-beta9',
+     /* Version */                   '1.0-beta10',
      /* Permissions */               'admin'
 );

plugins/dlManager/_public.php

@@ -54 +54 @@
                # exit if the public_path (and Media root) doesn't exist
                if (!is_dir($core->blog->public_path)) {self::p404();}
-               
-               if (!is_object($core->media))
-               {
-                    $core->media = new dcMedia($core);
-               }
-               
+                              
                # define root of DL Manager
                $page_root = $core->blog->settings->dlmanager_root;
@@ -90 +85 @@
                     {
                          $dir = trim($dir);
+                         
+                         # check
+                         if (($dir == '.') OR ($dir == '..')) {self::p404();}
+                         
                          if (!empty($dir))
                          {
@@ -192 +191 @@
           # exit if the public_path (and Media root) doesn't exist
           if (!is_dir($core->blog->public_path)) {self::p404();}
-          
-          if (!is_object($core->media))
-          {
-               $core->media = new dcMedia($core);
-          }
-          
+                    
           $file = $core->media->getFile($args);
           
-          if (empty($file->file))
+          if ((empty($file->file)) || (!is_readable($file->file)))
           {
                self::p404();
           }
-     
+          
+          $_ctx->dlManager_item = $file;
+          $_ctx->file_url = $file->file_url;
+               
+          # define root of DL Manager
           $page_root = $core->blog->settings->dlmanager_root;
           
+          # used to remove root from path
+          $page_root_len = strlen($page_root);
+          
+          # remove slash at the beginning of the string
+          if ($page_root_len > 0) {$page_root_len += 1;}
+          
           if (!empty($page_root))
           {
@@ -214 +218 @@
                }
           }         
-            
-          if (is_readable($file->file))
-          {
-               $_ctx->dlManager_item = $file;
-               $_ctx->file_url = $file->file_url;
-               
-               # compatibility with Dotclear revisions < 2445
-               global $attach_f;
-               $attach_f = new ArrayObject();
-               $attach_f->file_url = $file->file_url;
-
-               $core->tpl->setPath($core->tpl->getPath(),
-                    dirname(__FILE__).'/default-templates/');
-     
-               self::serveDocument('media_player.html','text/html');
-          }
+       
+       $_ctx->dlManager_item->relname =
+               dirname(substr($_ctx->dlManager_item->relname,$page_root_len));
+          if ($_ctx->dlManager_item->relname == '.')
+          {
+               $_ctx->dlManager_item->relname = '';
+          }
+               
+       # BreadCrumb
+          $breadCrumb = array();
+
+          # if visitor asked a directory
+          
+          $_ctx->dlManager_currentDir = $_ctx->dlManager_item->relname;
+          $page_dir = $page_root.'/'.$_ctx->dlManager_currentDir;
+
+          # BreadCrumb
+          $base_url = dlManager::pageURL().'/';
+          $dirs = explode('/',$_ctx->dlManager_currentDir);
+          $path = '';
+          
+          foreach ($dirs as $dir)
+          {
+               $dir = trim($dir);
+               
+               # check
+               if (($dir == '.') OR ($dir == '..')) {self::p404();}
+               
+               if (!empty($dir))
+               {
+                    $path = (($path == '') ? $dir : $path.'/'.$dir); 
+                    $breadCrumb[$dir] = $base_url.$path;
+               }
+          }
+          
+          $_ctx->dlManager_BreadCrumb = $breadCrumb;
+          unset($breadCrumb);
+          # /BreadCrumb
+          
+          # compatibility with Dotclear revisions < 2445
+          global $attach_f;
+          $attach_f = new ArrayObject();
+          $attach_f->file_url = $file->file_url;
+
+          $core->tpl->setPath($core->tpl->getPath(),
+               dirname(__FILE__).'/default-templates/');
+
+          self::serveDocument('media_player.html','text/html');
      }
      
@@ -243 +279 @@
                self::p404();
           }
-          
-          if (!is_object($core->media))
-          {
-               $core->media = new dcMedia($core);
-          }
-
+               
           $file = $core->media->getFile($args);
           
@@ -272 +303 @@
                $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 =& $core->blog->settings;
+               
                $settings->setNamespace('dlmanager');
                $settings->put('dlmanager_count_dl',serialize($count),'string',
@@ -934 +960 @@
                return;
           }
-
-          if (!is_object($core->media))
-          {
-               $core->media = new dcMedia($core);
-          }
-
+               
           # from /dotclear/admin/media.php
           if ($w->file_sort) {

plugins/dlManager/default-templates/media.html

@@ -50 +50 @@
 
      <div id="dlmanager">
-          <h3>{{tpl:lang Directories}}</h3>
-
           <p>
                <a href="{{tpl:DLMBaseURL}}">{{tpl:lang Home}}</a> /
-               <!-- # loop on directory path, display full / 3 / 2 / 1 -->
+               <!-- # loop on directory path, display dir / subdir -->
                <tpl:DLMBreadCrumb>
                     <a href="{{tpl:DLMBreadCrumbDirURL}}">
@@ -62 +60 @@
                </tpl:DLMBreadCrumb>
           </p>
-
+          
+          <h3>{{tpl:lang Directories}}</h3>
+          
           <tpl:DLMIfNoItem type="dirs">
                <p>{{tpl:lang No directory.}}</p>

plugins/dlManager/default-templates/media_player.html

@@ -7 +7 @@
   <meta name="MSSmartTagsPreventParsing" content="TRUE" />
   <meta name="robots" content="noindex, nofollow" />
-  <title>{{tpl:lang Download manager}} - {{tpl:DLMItemTitle}} - {{tpl:BlogName encode_html="1"}}</title>
+  <title>{{tpl:lang Preview}} - {{tpl:DLMItemTitle}} - {{tpl:BlogName encode_html="1"}}</title>
   
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
@@ -38 +38 @@
      <div id="content-info">
           <h2>
-               {{tpl:lang Download manager}}
+               {{tpl:lang Preview}}
           </h2>
      </div>
-     
-     <p><a href="{{tpl:DLMBaseURL}}">{{tpl:lang Home}}</a></p>
-     
+          
      <tpl:DLMIfError>
           <div class="error">
@@ -51 +49 @@
 
      <div id="dlmanager">
-          <h3>{{tpl:lang Preview :}} {{tpl:DLMItemTitle}}</h3>
+          <p>
+               <a href="{{tpl:DLMBaseURL}}">{{tpl:lang Home}}</a> /
+               <!-- # loop on directory path, display dir / subdir -->
+               <tpl:DLMBreadCrumb>
+                    <a href="{{tpl:DLMBreadCrumbDirURL}}">
+                         {{tpl:DLMBreadCrumbDirName}}</a>
+                    <tpl:DLMBreadCrumbSeparator last="1"> / 
+                         </tpl:DLMBreadCrumbSeparator>
+               </tpl:DLMBreadCrumb>
+               {{tpl:DLMItemBasename}}
+          </p>
+          
+          <p><a href="{{tpl:DLMItemDirPath}}">{{tpl:lang Get back to the directory}}</a></p>
+          
           <p>
                <a href="{{tpl:DLMItemDlURL}}" title="{{tpl:DLMItemBasename}}">
@@ -58 +69 @@
           </p>
           
+          <div id="player">
                <tpl:DLMItemIf media_type="image">
-                    <img src="{{tpl:DLMItemImageThumbPath size="m"}}" alt="{{tpl:DLMItemTitle}}" />
+                    <a href="{{tpl:DLMItemDlURL}}" title="{{tpl:DLMItemBasename}}">
+                         <img src="{{tpl:DLMItemImageThumbPath size="m"}}" alt="{{tpl:DLMItemTitle}}" />
+                    </a>
                </tpl:DLMItemIf>
-          
-          <div id="player">
+               
                <tpl:DLMItemIf type="audio/mpeg3">
                     {{tpl:include src="_mp3_player.html"}}

plugins/dlManager/lib.dlManager.php

@@ -36 +36 @@
           global $core;
 
+          # empty default value
           $dirs = array(''=> '');
-
-          $public_path = path::real($core->blog->public_path);
-          if (!is_dir($public_path)) {return(array());}
-
-          # +1 : remove slash at the beginning of the path when using substr()
-          $len_public_path = strlen($public_path)+1;
-
-          $dirList = files::getDirList($public_path);
-
-          foreach ($dirList['dirs'] as $dir)
+          
+          try
           {
-               if ($dir != $public_path)
+               if (!is_object($core->media))
                {
-                    $dir = substr($dir,$len_public_path);
-                    $dirs[$dir] = $dir;
+                    $core->media = new dcMedia($core);
+               }
+               # from gallery/gal.php
+               foreach ($core->media->getRootDirs() as $v)
+               {
+                    $dirs[$v->relname] = $v->relname;
                }
           }
-
+          catch (Exception $e)
+          {
+               $core->error->add($e->getMessage());
+          }
+          
           return($dirs);
      }

plugins/dlManager/locales/fr/main.po

@@ -3 +3 @@
 "Project-Id-Version: DL Manager\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-26 23:28+0100\n"
-"PO-Revision-Date: 2008-10-26 23:28+0100\n"
+"POT-Creation-Date: 2008-10-27 17:29+0100\n"
+"PO-Revision-Date: 2008-10-27 17:29+0100\n"
 "Last-Translator: Moe <poedit@gniark.net>\n"
 "Language-Team: Moe <poedit@gniark.net>\n"
@@ -17 +17 @@
 "X-Poedit-SearchPath-0: .\n"
 
-#: _public.php:155
+#: _public.php:154
 #: public_l10n.php:7
 msgid "parent directory"
 msgstr "répertoire parent"
 
-#: _public.php:948
-#: _public.php:954
+#: _public.php:982
+#: _public.php:989
 msgid "Preview :"
 msgstr ""
 
-#: _public.php:949
-#: _public.php:955
+#: _public.php:984
+#: _public.php:991
 msgid "Preview"
 msgstr ""
 
-#: lib.dlManager.php:71
+#: lib.dlManager.php:72
 msgid "By names, ascendant"
 msgstr "Par noms, croissants"
 
-#: lib.dlManager.php:72
+#: lib.dlManager.php:73
 msgid "By names, descendant"
 msgstr "Par noms, décroissants"
 
-#: lib.dlManager.php:73
+#: lib.dlManager.php:74
 msgid "By dates, ascendant"
 msgstr "Par dates, croissantes"
 
-#: lib.dlManager.php:74
+#: lib.dlManager.php:75
 msgid "By dates, descendant"
 msgstr "Par dates, décroissantes"
@@ -214 +214 @@
 
 #: public_l10n.php:25
+msgid "Get back to the directory"
+msgstr "Revenir au répertoire"
+
+#: public_l10n.php:26
 msgid "Download this file"
 msgstr "Télécharger ce fichier"
 
+#: public_l10n.php:27
+msgid "Image meta"
+msgstr "Méta données"
+

plugins/dlManager/public_l10n.php

@@ -23 +23 @@
 
 # media_item.html
+__('Get back to the directory');
 __('Download this file');
+__('Image meta');
 ?>