Again: Forgot to encode HTML in some more strings...

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 96370c1e466bc6d09b535d431a6fe4f1c40571c9..d9a20f7ea72bccea4401552fe4872def65c0e823 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,7 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-04-22
+# Last modified: 2005-06-10

 #
 
 use strict;
 #
 
 use strict;


@@ -32,12 +32,11 @@ use base qw(Exporter);
              encode_html
              equal_url
              file_name
              encode_html
              equal_url
              file_name

+             is_forbidden_file

              mode_string
              multi_string
              upper_path);
 
              mode_string
              multi_string
              upper_path);
 

-use Carp qw(croak);
-

 # check_path()
 #
 # Check if a virtual path is above a virtual root directory
 # check_path()
 #
 # Check if a virtual path is above a virtual root directory


@@ -69,9 +68,8 @@ sub check_path($$)
  $first    = abs_path($first);
 
  my $last  = file_name($path);
  $first    = abs_path($first);
 
  my $last  = file_name($path);

- $last     = '' if($last eq '.');

 
 

- if($last eq '..' || ($^O eq 'MSWin32' && $last =~ m!^\.\.\.+$!))
+ if(-d $first.'/'.$last && not -l $first.'/'.$last)

  {
   $first = abs_path($first.'/'.$last);
   $last  = '';
  {
   $first = abs_path($first.'/'.$last);
   $last  = '';


@@ -257,6 +255,29 @@ sub file_name($)
  return $path;
 }
 
  return $path;
 }
 

+# is_forbidden_file()
+#
+# Check if a file is in the list of forbidden files
+#
+# Params: 1. Array Reference containing the list
+#         2. Filename to check
+#
+# Return: Status code (Boolean)
+
+sub is_forbidden_file($$)
+{
+ my ($list,$file) = @_;
+ $file =~ s!/+$!!g;
+
+ foreach my $entry(@$list)
+ {
+  return 1 if($file eq $entry);
+  return 1 if(index($file,$entry.'/') == 0);
+ }
+
+ return;
+}
+

 # mode_string()
 #
 # Convert a file mode number into a human readable string (rwxr-x-r-x)
 # mode_string()
 #
 # Convert a file mode number into a human readable string (rwxr-x-r-x)