Heavily improved devedit_reload():

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index fc1b3b47034a3c38ed616fbd7f4322bc10a1f793..1bc020d2b3fcdb0dc53a9888ff4259b245f8ef9f 100644 (file)
--- 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-12-02
+# Last modified: 2004-07-12
 #
 
 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
+             query_string
              upper_path);
 
 # check_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)
  {
-  push(@list,$param."=".$value);
+  # SSL encrypted HTTP (HTTPS)
+
+  $protocol = "https";
+  $port     = ($ENV{'SERVER_PORT'} == 443) ? "" : ":".$ENV{'SERVER_PORT'};
  }
+ else
+ {
+  # Simple HTTP
+
+  $protocol = "http";
+  $port     = ($ENV{'SERVER_PORT'} == 80)  ? "" : ":".$ENV{'SERVER_PORT'};
+ }
+
+ # 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 $query  = join("&",@list);
- my $header = redirect("http://$ENV{'HTTP_HOST'}$ENV{'SCRIPT_NAME'}?$query");
+ 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
 #
@@ -149,7 +204,7 @@ sub file_name($)
 
 # upper_path()
 #
-# Cut the last part of a path away
+# Cut away the last part of a path
 #
 # Params: Path
 #