X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/7c201ab8e15b5000a1bd3f445e6c769aca4129b1..95df6a6a2bb9185cceb1fcf205b4f9f07690ca27:/modules/Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 6fbf8e0..6a615da 100644
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -5,8 +5,8 @@ package Tool;
 #
 # Some shared sub routines
 #
-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-07-30
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-12-16
 #
 
 use strict;
@@ -35,7 +35,7 @@ use base qw(Exporter);
 
 # check_path()
 #
-# Check, if a virtual path is above a virtual root directory
+# Check if a virtual path is above a virtual root directory
 # (currently no check if the path exists - check otherwise!)
 #
 # Params: 1. Virtual root directory
@@ -56,27 +56,21 @@ sub check_path($$)
  $path =~ s!^/{1}!!;
  $path = $root."/".$path;
 
- unless(-d $path)
- {
-  # The path points to a file
-  # We have to extract the directory name and create the absolute path
+ # We extract the last part of the path and create the absolute path
 
-  my $dir  = upper_path($path);
-  my $file = file_name($path);
+ my $first = upper_path($path);
+ my $last  = file_name($path);
 
-  $dir  = abs_path($dir);
-  $path = $dir."/".$file;
- }
- else
- {
-  $path = abs_path($path);
- }
+ $first = abs_path($first);
+ $path  = $first."/".$last;
 
- $path = File::Spec->canonpath($path);
+ $first = File::Spec->canonpath($first);
+ $path  = File::Spec->canonpath($path);
 
  # Check if the path is above the root directory
 
- return if(index($path,$root) == -1);
+ return if(index($path,$root) != 0);
+ return if($first eq $root && $last =~ m!^(/|\\)?\.\.(/|\\)?$!);
 
  # Create short path name
 
@@ -112,10 +106,11 @@ sub clean_path($)
 # with some other parameters
 #
 # Params: Hash Reference (will be merged to a query string)
+#         (optional)
 #
 # Return: HTTP redirection header (Scalar Reference)
 
-sub devedit_reload($)
+sub devedit_reload(;$)
 {
  my $params = shift;
 
@@ -144,13 +139,18 @@ sub devedit_reload($)
  # Andre Malo's selfforum (http://sourceforge.net/projects/selfforum/)
  # and modified by Patrick Canterino
 
- my $query = '?'.join ('&' =>
-   map {
-     (ref)
-     ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}}
-     : escape ($_).'='.escape ($params -> {$_})
-   } keys %$params
- );
+ my $query = "";
+
+ if(ref($params) eq "HASH")
+ {
+  $query = '?'.join ('&' =>
+    map {
+      (ref)
+      ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}}
+      : escape ($_).'='.escape ($params -> {$_})
+    } keys %$params
+  );
+ }
 
  # Create the redirection header