X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/7416fb4edc504143cf5888717f30ed78d57511a7..aeaff6f362f8e376c592469db74f9da3434ecacc:/modules/Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 75b9f31..3a43ffc 100644
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,14 +6,18 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 2003-10-27
+# Last modified: 2004-07-28
 #
 
 use strict;
 
 use vars qw(@EXPORT);
 
-use CGI qw(redirect);
+use CGI qw(redirect
+           escape
+           virtual_host
+           https);
+
 use Cwd qw(abs_path);
 use File::Spec;
 
@@ -24,7 +28,9 @@ use base qw(Exporter);
 @EXPORT = qw(check_path
              clean_path
              devedit_reload
+             equal_url
              file_name
+             mode_string
              upper_path);
 
 # check_path()
@@ -76,7 +82,7 @@ sub check_path($$)
 
  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!^/!);
  $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path);
 
  return ($path,$short_path);
@@ -112,22 +118,71 @@ sub clean_path($)
 sub devedit_reload($)
 {
  my $params = shift;
- my @list;
 
- while(my ($param,$value) = each(%$params))
+ # 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
  {
-  push(@list,$param."=".$value);
+  # Simple HTTP
+
+  $protocol = "http";
+  $port     = ":".$ENV{'SERVER_PORT'} if($ENV{'SERVER_PORT'} != 80);
  }
 
- my $query  = join("&",@list);
- my $header = redirect("http://$ENV{'HTTP_HOST'}$ENV{'SCRIPT_NAME'}?$query");
+ # 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 ('&' =>
+   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;
 }
 
+# equal_url()
+#
+# Create URL equal to a file or directory
+#
+# 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()
 #
-# Returns the last path of a path
+# Return the last part of a path
 #
 # Params: Path
 #
@@ -147,14 +202,51 @@ sub file_name($)
  return $path;
 }
 
-# upper_path()
+# mode_string()
 #
-# Truncate a path in one of the following ways:
+# Convert a binary file mode string into a human
+# readable string (rwxr-x-r-x)
+#
+# Params: Binary file mode string
+#
+# Return: Humand readable mode string
+
+sub mode_string($)
+{
+ my $mode = shift;
+
+ my $string = "";
+
+  # Owner
+  $string .= (($mode & 0x0100) ? 'r' : '-') .
+         (($mode & 0x0080) ? 'w' : '-') .
+         (($mode & 0x0040) ?
+           (($mode & 0x0800) ? 's' : 'x' ) :
+           (($mode & 0x0800) ? 'S' : '-')
+         );
+
+  # Group
+  $string .= (($mode & 0x0020) ? 'r' : '-') .
+         (($mode & 0x0010) ? 'w' : '-') .
+         (($mode & 0x0008) ?
+           (($mode & 0x0400) ? 's' : 'x') :
+           (($mode & 0x0400) ? 'S' : '-')
+         );
+
+  # World
+  $string .= (($mode & 0x0004) ? 'r' : '-') .
+         (($mode & 0x0002) ? 'w' : '-') .
+         (($mode & 0x0001) ?
+           (($mode & 0x0200) ? 't' : 'x' ) :
+           (($mode & 0x0200) ? '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.
+# Cut away the last part of a path
 #
 # Params: Path
 #