X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/4a462593152058517e51c12b94106396cf68a32e..aeaff6f362f8e376c592469db74f9da3434ecacc:/modules/Tool.pm?ds=sidebyside

diff --git a/modules/Tool.pm b/modules/Tool.pm
index a5170a3..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: 2004-02-24
+# 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;
 
@@ -26,6 +30,7 @@ use base qw(Exporter);
              devedit_reload
              equal_url
              file_name
+             mode_string
              upper_path);
 
 # check_path()
@@ -113,15 +118,43 @@ 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)
  {
-  push(@list,$param."=".$value);
+  # 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  = join("&",@list);
- my $header = redirect("http://$ENV{'HTTP_HOST'}$ENV{'SCRIPT_NAME'}?$query");
+ 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;
 }
@@ -169,6 +202,48 @@ sub file_name($)
  return $path;
 }
 
+# mode_string()
+#
+# 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()
 #
 # Cut away the last part of a path