- Added new if blocks to the templates about.htm and chprop.htm: The blocks are

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index d39c4773a9d6cc7fdb922c627cb82df40fddd6b7..2b734238a300769b83ab9e63007b0ee14664d82a 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,7 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-07-30
+# Last modified: 2004-11-13
 #
 
 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
 
@@ -204,13 +198,12 @@ sub file_name($)
 
 # mode_string()
 #
-# Convert a binary file mode string into a human
-# readable string (rwxr-x-r-x)
-# (also supports SetUID, SetGID and Sticky Bits)
+# Convert a file mode number into a human readable string (rwxr-x-r-x)
+# (also supports SetUID, SetGID and Sticky Bit)
 #
-# Params: Binary file mode string
+# Params: File mode number
 #
-# Return: Humand readable mode string
+# Return: Human readable mode string
 
 sub mode_string($)
 {