Cleaned exec_show() and exec_beginedit()

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 785a02e787b715c5b0508d1ff743574fdd551794..e261f3e0de97ee0de179004d9aaafc2fba66f9bb 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-07-12
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2004-12-25

 #
 
 use strict;
 #
 
 use strict;


@@ -28,13 +28,15 @@ 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
              equal_url
              file_name

+             mode_string

              upper_path);
 
 # check_path()
 #
              upper_path);
 
 # 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
 # (currently no check if the path exists - check otherwise!)
 #
 # Params: 1. Virtual root directory


@@ -55,27 +57,21 @@ sub check_path($$)
  $path =~ s!^/{1}!!;
  $path = $root."/".$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
 
 
  # 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
 
 
  # Create short path name
 


@@ -111,10 +107,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;
 


@@ -129,27 +126,32 @@ sub devedit_reload($)
   # SSL encrypted HTTP (HTTPS)
 
   $protocol = "https";
   # SSL encrypted HTTP (HTTPS)
 
   $protocol = "https";

-  $port     = ($ENV{'SERVER_PORT'} == 443) ? "" : ":".$ENV{'SERVER_PORT'};
+  $port     = ":".$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 443);

  }
  else
  {
   # Simple HTTP
 
   $protocol = "http";
  }
  else
  {
   # Simple HTTP
 
   $protocol = "http";

-  $port     = ($ENV{'SERVER_PORT'} == 80)  ? "" : ":".$ENV{'SERVER_PORT'};
+  $port     = ":".$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 80);

  }
 
  # The following code is grabbed from Template::_query of
  # Andre Malo's selfforum (http://sourceforge.net/projects/selfforum/)
  # and modified by Patrick Canterino
 
  }
 
  # The following code is grabbed from Template::_query of
  # Andre Malo's selfforum (http://sourceforge.net/projects/selfforum/)
  # and modified by Patrick Canterino
 

- my $query = '?'.join ('&' =>
+ my $query = "";
+
+ if(ref($params) eq "HASH")
+ {
+  $query = '?'.join ('&' =>

     map {
       (ref)
       ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}}
       : escape ($_).'='.escape ($params -> {$_})
     } keys %$params
   );
     map {
       (ref)
       ? map{escape ($_).'='.escape ($params -> {$_})} @{$params -> {$_}}
       : escape ($_).'='.escape ($params -> {$_})
     } keys %$params
   );

+ }

 
  # Create the redirection header
 
 
  # Create the redirection header
 


@@ -158,6 +160,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


@@ -201,6 +227,44 @@ sub file_name($)
  return $path;
 }
 
  return $path;
 }
 

+# mode_string()
+#
+# Convert a file mode number into a human readable string (rwxr-x-r-x)
+# (also supports SetUID, SetGID and Sticky Bit)
+#
+# Params: File mode number
+#
+# Return: Human readable mode string
+
+sub mode_string($)
+{
+ my $mode   = shift;
+ my $string = "";
+
+ # User
+
+ $string  = ($mode & 00400) ? "r" : "-";
+ $string .= ($mode & 00200) ? "w" : "-";
+ $string .= ($mode & 00100) ? (($mode & 04000) ? "s" : "x") :
+                               ($mode & 04000) ? "S" : "-";
+
+ # Group
+
+ $string .= ($mode & 00040) ? "r" : "-";
+ $string .= ($mode & 00020) ? "w" : "-";
+ $string .= ($mode & 00010) ? (($mode & 02000) ? "s" : "x") :
+                               ($mode & 02000) ? "S" : "-";
+
+ # Other
+
+ $string .= ($mode & 00004) ? "r" : "-";
+ $string .= ($mode & 00002) ? "w" : "-";
+ $string .= ($mode & 00001) ? (($mode & 01000) ? "t" : "x") :
+                               ($mode & 01000) ? "T" : "-";
+
+ return $string;
+}
+

 # upper_path()
 #
 # Cut away the last part of a path
 # upper_path()
 #
 # Cut away the last part of a path