- Began to change the behaviour of Dev-Editor's editing function:

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 47b73e660dcf5069cc2de8b1b1c2f0431970d402..23770a14bc8ab1ddcbd6ca9fd107f08e879df2a4 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -5,18 +5,20 @@ package Tool;
 #
 # Some shared sub routines
 #
 #
 # Some shared sub routines
 #

-# Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 09-22-2003
+# Author:        Patrick Canterino <patrick@patshaping.de>
+# Last modified: 2005-02-13

 #
 
 use strict;
 
 use vars qw(@EXPORT);
 
 #
 
 use strict;
 
 use vars qw(@EXPORT);
 

-use Carp qw(croak);
+use CGI qw(redirect
+           escape
+           virtual_host
+           https);

 
 use Cwd qw(abs_path);
 
 use Cwd qw(abs_path);

-use File::Basename;

 use File::Spec;
 
 ### Export ###
 use File::Spec;
 
 ### Export ###


@@ -25,12 +27,16 @@ use base qw(Exporter);
 
 @EXPORT = qw(check_path
              clean_path
 
 @EXPORT = qw(check_path
              clean_path

-             filemode
+             devedit_reload
+             dos_wildcard_match
+             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


@@ -48,43 +54,36 @@ 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;

 
 

- unless(-d $path)
- {
-  # The path points to a file
-  # We have to extract the directory name and create the absolute path
-
-  my @pathinfo = fileparse($path);
-
-  # This is only to avoid errors
+ # We extract the last part of the path and create the absolute path

 
 

-  my $basename = $pathinfo[0] || '';
-  my $dir      = $pathinfo[1] || '';
-  my $ext      = $pathinfo[2] || '';
+ my $first = upper_path($path);
+ $first    = abs_path($first);

 
 

-  $dir = abs_path($dir);
+ my $last  = file_name($path);
+ $last     = '' if($last eq '.');

 
 

-  $path = $dir."/".$basename.$ext;
- }
- else
+ if($last eq '..' || ($^O eq 'MSWin32' && $last =~ m!^\.\.\.+$!))

  {
  {

-  $path = abs_path($path);
+  $first = abs_path($first.'/'.$last);
+  $last  = '';

  }
 
  }
 

- $path = File::Spec->canonpath($path);
+ $path = File::Spec->canonpath($first.'/'.$last);

 
  # 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);

 
  # 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 = "/".$short_path unless($short_path =~ m!^/!);
- $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path);
+ $short_path =~ tr!\\!/!;
+ $short_path = '/'.$short_path if($short_path !~ m!^/!);
+ $short_path = $short_path.'/' if($short_path !~ m!/$! && -d $path && not -l $path);

 
  return ($path,$short_path);
 }
 
  return ($path,$short_path);
 }


@@ -107,42 +106,174 @@ sub clean_path($)
  return $path;
 }
 
  return $path;
 }
 

-# filemode()
+# devedit_reload()

 #
 #

-# Creates a readable string of a UNIX filemode number
-# (copied from Tool.pm of Dev-Editor 0.1.4)
+# Create a HTTP redirection header to load Dev-Editor
+# with some other parameters

 #
 #

-# Params: Filemode as number
+# Params: Hash Reference (will be merged to a query string)
+#         (optional)

 #
 #

-# Return: Filemode as readable string
+# Return: HTTP redirection header (Scalar Reference)

 
 

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

 {
 {

-    my ($modestring, $ur, $uw, $ux, $gr, $gw, $gx, $or, $ow, $ox);
-    my $mode = shift;
-
-    $ur = ($mode & 0400) ? "r" : "-";       # User Read
-    $uw = ($mode & 0200) ? "w" : "-";       # User Write
-    $ux = ($mode & 0100) ? "x" : "-";       # User eXecute
-    $gr = ($mode & 0040) ? "r" : "-";       # Group Read
-    $gw = ($mode & 0020) ? "w" : "-";       # Group Write
-    $gx = ($mode & 0010) ? "x" : "-";       # Group eXecute
-    $or = ($mode & 0004) ? "r" : "-";       # Other Read
-    $ow = ($mode & 0002) ? "w" : "-";       # Other Write
-    $ox = ($mode & 0001) ? "x" : "-";       # Other eXecute
-
-    # build a readable mode string (rwxrwxrwx)
-    return $ur . $uw . $ux . $gr . $gw . $gx . $or . $ow . $ox;
+ my $params = shift;
+
+ # Detect the protocol (simple HTTP or SSL encrypted HTTP)
+ # and check if the server listens on the default port
+
+ my $protocol = '';
+ my $port     = '';
+
+ if(https)
+ {
+  # SSL encrypted HTTP (HTTPS)
+
+  $protocol = 'https';
+  $port     = ':'.$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 443);
+ }
+ else
+ {
+  # Simple HTTP
+
+  $protocol = 'http';
+  $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
+
+ 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
+
+ my $header = redirect($protocol.'://'.virtual_host.$port.$ENV{'SCRIPT_NAME'}.$query);
+
+ return \$header;

 }
 
 }
 

-# upper_path()
+# 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

 #
 #

-# Truncate a path in one of the following ways:
+# Params: 1. HTTP root
+#         2. Relative path
+#
+# Return: Formatted link (String)
+
+sub equal_url($$)
+{
+ my ($root,$path) = @_;
+ my $url;
+
+ $root =~ s!/+$!!;
+ $path =~ s!^/+!!;
+ $url  =  $root.'/'.$path;
+
+ return $url;
+}
+
+# file_name()
+#
+# Return the last part of a path
+#
+# Params: Path
+#
+# Return: Last part of the path
+
+sub file_name($)
+{
+ my $path =  shift;
+ $path    =~ tr!\\!/!;
+
+ unless($path =~ m!^/+$! || ($^O eq 'MSWin32' && $path =~ m!^[a-z]:/+$!i))
+ {
+  $path =~ s!/+$!!;
+  $path =  substr($path,rindex($path,'/')+1);
+ }
+
+ 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()

 #
 #

-# - If the path points to a directory, the upper directory
-#   will be returned.
-# - If the path points to a file, the directory containing
-#   the file will be returned.
+# Remove the last part of a path
+# (the resulting path contains a trailing slash)

 #
 # Params: Path
 #
 #
 # Params: Path
 #


@@ -153,11 +284,10 @@ sub upper_path($)
  my $path =  shift;
  $path    =~ tr!\\!/!;
 
  my $path =  shift;
  $path    =~ tr!\\!/!;
 

- unless($path eq "/")
+ unless($path =~ m!^/+$! || ($^O eq 'MSWin32' && $path =~ m!^[a-z]:/+$!i))

  {
  {

-  $path = substr($path,0,-1) if($path =~ m!/$!);
-  $path = substr($path,0,rindex($path,"/"));
-  $path = $path."/";
+  $path =~ s!/+$!!;
+  $path =  substr($path,0,rindex($path,'/')+1);

  }
 
  return $path;
  }
 
  return $path;