- In the virtual directory string, check_path() converts backslashes to slashes

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 2b734238a300769b83ab9e63007b0ee14664d82a..a05b459c72787d18dfc949818326a944bd13bfd8 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -5,8 +5,8 @@ package Tool;
 #
 # Some shared sub routines
 #
 #
 # Some shared sub routines
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2004-11-13
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2005-01-04

 #
 
 use strict;
 #
 
 use strict;


@@ -28,6 +28,7 @@ use base qw(Exporter);
 @EXPORT = qw(check_path
              clean_path
              devedit_reload
 @EXPORT = qw(check_path
              clean_path
              devedit_reload

+             dos_wildcard_match

              equal_url
              file_name
              mode_string
              equal_url
              file_name
              mode_string


@@ -53,8 +54,9 @@ sub check_path($$)
  $root = abs_path($root);
  $root = File::Spec->canonpath($root);
 
  $root = abs_path($root);
  $root = File::Spec->canonpath($root);
 

- $path =~ s!^/{1}!!;
- $path = $root."/".$path;
+ $path =~ tr!\\!/!;
+ $path =~ s!^/+!!;
+ $path =  $root."/".$path;

 
  # We extract the last part of the path and create the absolute path
 
 
  # We extract the last part of the path and create the absolute path
 


@@ -75,7 +77,7 @@ sub check_path($$)
  # Create short path name
 
  my $short_path = substr($path,length($root));
  # Create short path name
 
  my $short_path = substr($path,length($root));

- $short_path =~ tr!\\!\/!;
+ $short_path =~ tr!\\!/!;

  $short_path = "/".$short_path if($short_path !~ m!^/!);
  $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path);
 
  $short_path = "/".$short_path if($short_path !~ m!^/!);
  $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path);
 


@@ -106,10 +108,11 @@ sub clean_path($)
 # with some other parameters
 #
 # Params: Hash Reference (will be merged to a query string)
 # with some other parameters
 #
 # Params: Hash Reference (will be merged to a query string)

+#         (optional)

 #
 # Return: HTTP redirection header (Scalar Reference)
 
 #
 # Return: HTTP redirection header (Scalar Reference)
 

-sub devedit_reload($)
+sub devedit_reload(;$)

 {
  my $params = shift;
 
 {
  my $params = shift;
 


@@ -138,13 +141,18 @@ sub devedit_reload($)
  # Andre Malo's selfforum (http://sourceforge.net/projects/selfforum/)
  # and modified by Patrick Canterino
 
  # 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
 
 
  # Create the redirection header
 


@@ -153,6 +161,30 @@ sub devedit_reload($)
  return \$header;
 }
 
  return \$header;
 }
 

+# dos_wildcard_match()
+#
+# Check if a string matches against a DOS-style wildcard
+#
+# Params: 1. Pattern
+#         2. String
+#
+# Return: Status code (Boolean)
+
+sub dos_wildcard_match($$)
+{
+ my ($pattern,$string) = @_;
+
+ # The following part is stolen from File::DosGlob
+
+ # escape regex metachars but not glob chars
+ $pattern =~ s:([].+^\-\${}[|]):\\$1:g;
+ # and convert DOS-style wildcards to regex
+ $pattern =~ s/\*/.*/g;
+ $pattern =~ s/\?/.?/g;
+
+ return ($string =~ m|^$pattern$|is);
+}
+

 # equal_url()
 #
 # Create URL equal to a file or directory
 # equal_url()
 #
 # Create URL equal to a file or directory


@@ -167,8 +199,8 @@ sub equal_url($$)
  my ($root,$path) = @_;
  my $url;
 
  my ($root,$path) = @_;
  my $url;
 

- $root =~ s!/$!!;
- $path =~ s!^/!!;
+ $root =~ s!/+$!!;
+ $path =~ s!^/+!!;

  $url  =  $root."/".$path;
 
  return $url;
  $url  =  $root."/".$path;
 
  return $url;