Changeset 1097

Timestamp:

04/27/09 22:48:28 (15 years ago)

Author:

Moe

Message:

DL Manager 1.1 :

• added pages list on the top of the files list
• removed icon/* URL, replaced by files in the plugin's directory
• updated template file

Location:

plugins/dlManager/trunk

Files:

• _define.php (modified) (1 diff)
• _prepend.php (modified) (1 diff)
• _public.php (modified) (4 diffs)
• default-templates/media.html (modified) (2 diffs)
• images (modified) (1 prop)
• locales/fr/main.mo (deleted)

plugins/dlManager/trunk/_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.1',
+     /* Version */                   '1.1',
      /* Permissions */               'admin'
 );

plugins/dlManager/trunk/_prepend.php

@@ -34 +34 @@
 $core->url->register('viewfile','viewfile',
           '^viewfile/(.+)$',array('dlManagerPageDocument','viewfile'));
-$core->url->register('icon','icon',
-          '^icon/(.+)$',array('dlManagerPageDocument','icon'));
 
 require_once(dirname(__FILE__).'/_widget.php');

plugins/dlManager/trunk/_public.php

@@ -320 +320 @@
                     exit;
                }
+               else
+               {
+                    self::p404();
+               }
           }
           catch (Exception $e)
@@ -404 +408 @@
           }
      }
-     
-     /**
-     serve icon files 
-     @param    args <b>string</b>  Argument
-     */
-     public static function icon($args)
-     {
-          global $core;
-
-          if (empty($args) || (!$core->blog->settings->dlmanager_active)
-               || (!preg_match('/^[a-z]+$/',$args)))
-          {
-               self::p404();
-          }
-          
-          try
-          {
-               $icon_path = path::real(DC_ROOT.'/admin/images/media/'.$args.'.png');
-               
-               if (is_readable($icon_path))
-               {
-                    # from /dotclear/inc/load_plugin_file.php
-                    http::$cache_max_age = 36000;
-                    http::cache(array_merge(array($icon_path),get_included_files()));
-                    header('Content-type: '.files::getMimeType($icon_path));
-                    header('Content-Length: '.filesize($icon_path));
-                    readfile($icon_path);
-                    exit;
-                    # /from /dotclear/inc/load_plugin_file.php
-               }
-          }
-          catch (Exception $e)
-          {
-               $core->error->add($e->getMessage());
-          }
-     }
 }
 
@@ -472 +440 @@
 $core->tpl->addValue('DLMItemDirPath',array('dlManagerPageTpl','itemDirPath'));
 
-$core->tpl->addValue('DLMItemIconPath',array('dlManagerPageTpl','itemIconPath'));
 $core->tpl->addValue('DLMItemTitle',array('dlManagerPageTpl','itemTitle'));
 $core->tpl->addValue('DLMItemSize',array('dlManagerPageTpl','itemSize'));
@@ -754 +721 @@
      
      /**
-     Item icon path
-     @param    attr <b>array</b>   Attribute
-     @param    content   <b>string</b>  Content
-     @return   <b>string</b> PHP block
-     */
-     public static function itemIconPath($attr)
-     {         
-          return('<?php echo $core->blog->url.$core->url->getBase(\'icon\').'.
-               '\'/\'.$_ctx->items->media_type; ?>');
-     }
-     
-     /**
      Item title
      @param    attr <b>array</b>   Attribute

plugins/dlManager/trunk/default-templates/media.html

@@ -136 +136 @@
                          </form>
                     </tpl:DLMIfSortIsEnabled>
+                    
+                    <tpl:DLMIfPages>
+                         <p>{{tpl:lang Page(s):}} {{tpl:DLMPageLinks}}</p>
+                    </tpl:DLMIfPages>
+                    
                     <table rules="rows" id="dlmanager-files">
                          <thead>
@@ -157 +162 @@
                </tpl:LoopPosition>
                <tr class="{{tpl:DLMItemMediaType}}">
-                    <td><img src="{{tpl:DLMItemIconPath}}" width="48" height="48" title="{{tpl:DLMItemMediaType}}" alt="{{tpl:DLMItemMediaType}}" /></td>
+                    <td><img src="{{tpl:BlogQmarkURL}}pf=dlManager/images/media/{{tpl:DLMItemMediaType}}.png"
+                         width="48" height="48" title="{{tpl:DLMItemMediaType}}" alt="{{tpl:DLMItemMediaType}}" /></td>
                     <td>
                          <a href="{{tpl:DLMItemDlURL}}" title="{{tpl:DLMItemBasename}}">