X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/258ec0b29f3b69680b6de4ddc9704c3710a50178..a1cc5ce8035db2ac85e3a4ae675c504ff595d3b6:/modules/Tool.pm diff --git a/modules/Tool.pm b/modules/Tool.pm index 9e89e43..fc1b3b4 100644 --- a/modules/Tool.pm +++ b/modules/Tool.pm @@ -6,13 +6,14 @@ package Tool; # Some shared sub routines # # Author: Patrick Canterino -# Last modified: 2003-10-03 +# Last modified: 2003-12-02 # use strict; use vars qw(@EXPORT); +use CGI qw(redirect); use Cwd qw(abs_path); use File::Spec; @@ -22,6 +23,7 @@ use base qw(Exporter); @EXPORT = qw(check_path clean_path + devedit_reload file_name upper_path); @@ -74,7 +76,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); @@ -98,9 +100,34 @@ sub clean_path($) return $path; } +# devedit_reload() +# +# Create a HTTP redirection header to load Dev-Editor +# with some other parameters +# +# Params: Hash Reference (will be merged to a query string) +# +# Return: HTTP redirection header (Scalar Reference) + +sub devedit_reload($) +{ + my $params = shift; + my @list; + + while(my ($param,$value) = each(%$params)) + { + push(@list,$param."=".$value); + } + + my $query = join("&",@list); + my $header = redirect("http://$ENV{'HTTP_HOST'}$ENV{'SCRIPT_NAME'}?$query"); + + return \$header; +} + # file_name() # -# Returns the last path of a filename +# Returns the last path of a path # # Params: Path # @@ -122,12 +149,7 @@ sub file_name($) # upper_path() # -# Truncate a path in one of the following ways: -# -# - 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 the last part of a path away # # Params: Path # @@ -141,8 +163,7 @@ sub upper_path($) unless($path eq "/") { $path = substr($path,0,-1) if($path =~ m!/$!); - $path = substr($path,0,rindex($path,"/")); - $path = $path."/"; + $path = substr($path,0,rindex($path,"/")+1); } return $path;