Changeset 1503

Timestamp:

09/24/09 21:40:53 (14 years ago)

Author:

Moe

Message:

DL Manager 1.1.1 :

• moved PHP class in inc/ directory
• getting ready for 2.1.6

Location:

plugins/dlManager/trunk

Files:

• _define.php (modified) (1 diff)
• _prepend.php (modified) (1 diff)
• _public.php (modified) (12 diffs)
• inc (added)
• inc/lib.dlManager.php (moved) (moved from plugins/dlManager/trunk/lib.dlManager.php)

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.1',
+     /* Version */                   '1.1.1',
      /* Permissions */               'admin'
 );

plugins/dlManager/trunk/_prepend.php

@@ -24 +24 @@
 if (!defined('DC_RC_PATH')) {return;}
 
-$__autoload['dlManager'] = dirname(__FILE__).'/lib.dlManager.php';
+$__autoload['dlManager'] = dirname(__FILE__).'/inc/lib.dlManager.php';
 
 $core->url->register('media','media',

plugins/dlManager/trunk/_public.php

@@ -36 +36 @@
           
           # if the plugin is disabled
-          if (!$core->blog->settings->dlmanager_active) {self::p404();}
+          if (!$core->blog->settings->dlmanager_active)
+          {
+               self::p404();
+               return;
+          }
           
           # exit if the public_path (and Media root) doesn't exist
-          if (!is_dir($core->blog->public_path)) {self::p404();}
+          if (!is_dir($core->blog->public_path))
+          {
+               self::p404();
+               return;
+          }
      }
      
@@ -114 +122 @@
                # exit if the directory doesn't exist
                $dir_full_path = $core->media->root.'/'.$page_dir;
-               if (!is_dir($dir_full_path)) {self::p404();}
+               if (!is_dir($dir_full_path))
+               {
+                    self::p404();
+                    return;
+               }
                
                # used to remove link to root directory
@@ -217 +229 @@
                {
                     self::p404();
+                    return;
                }
                
@@ -239 +252 @@
                if ($page_root_len > 0) {$page_root_len += 1;}
                
-               if (!dlManager::inJail($file->relname)) {self::p404();}
+               if (!dlManager::inJail($file->relname))
+               {
+                    self::p404();
+                    return;
+               }
             
             $file->relname =
@@ -281 +298 @@
           self::check();
           
-          if (!preg_match('/^[0-9]+$/',$args)) {self::p404();}
+          if (!preg_match('/^[0-9]+$/',$args))
+          {
+               self::p404();
+               return;
+          }
           
           try
@@ -290 +311 @@
                {
                     self::p404();
-               }
-               
-               if (!dlManager::inJail($file->relname)) {self::p404();}
+                    return;
+               }
+               
+               if (!dlManager::inJail($file->relname))
+               {
+                    self::p404();
+                    return;
+               }
             
                if (is_readable($file->file))
@@ -323 +349 @@
                {
                     self::p404();
+                    return;
                }
           }
@@ -343 +370 @@
           {
                self::p404();
+               return;
           }
           
@@ -357 +385 @@
                     {
                          self::p404();
+                         return;
                     }
                     
@@ -375 +404 @@
                     {
                          self::p404();
+                         return;
                     }
                     
@@ -389 +419 @@
                {
                     self::p404();
+                    return;
                }
                
@@ -394 +425 @@
                {
                     self::p404();
+                    return;
                }