Improved file editing using another filename:

[devedit.git] / modules / Tool.pm

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 47b73e660dcf5069cc2de8b1b1c2f0431970d402..18d437c49499369770e5ecabe642afd958a9e7f4 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,17 +6,19 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 09-22-2003
+# Last modified: 2004-07-30

 #
 
 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,7 +27,10 @@ use base qw(Exporter);
 
 @EXPORT = qw(check_path
              clean_path
 
 @EXPORT = qw(check_path
              clean_path

-             filemode
+             devedit_reload
+             equal_url
+             file_name
+             mode_string

              upper_path);
 
 # check_path()
              upper_path);
 
 # check_path()


@@ -56,17 +61,11 @@ sub check_path($$)
   # The path points to a file
   # We have to extract the directory name and create the absolute path
 
   # The path points to a file
   # We have to extract the directory name and create the absolute path
 

-  my @pathinfo = fileparse($path);
+  my $dir  = upper_path($path);
+  my $file = file_name($path);

 
 

-  # This is only to avoid errors
-
-  my $basename = $pathinfo[0] || '';
-  my $dir      = $pathinfo[1] || '';
-  my $ext      = $pathinfo[2] || '';
-
-  $dir = abs_path($dir);
-
-  $path = $dir."/".$basename.$ext;
+  $dir  = abs_path($dir);
+  $path = $dir."/".$file;

  }
  else
  {
  }
  else
  {


@@ -83,7 +82,7 @@ sub check_path($$)
 
  my $short_path = substr($path,length($root));
  $short_path =~ tr!\\!\/!;
 
  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);
  $short_path = $short_path."/" if($short_path !~ m!/$! && -d $path);
 
  return ($path,$short_path);


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

-# filemode()
+# 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;
+
+ # 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 = '?'.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()

 #
 #

-# Creates a readable string of a UNIX filemode number
-# (copied from Tool.pm of Dev-Editor 0.1.4)
+# Create URL equal to a file or directory

 #
 #

-# Params: Filemode as number
+# Params: 1. HTTP root
+#         2. Relative path

 #
 #

-# Return: Filemode as readable string
+# Return: Formatted link (String)

 
 

-sub filemode($)
+sub equal_url($$)

 {
 {

-    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 ($root,$path) = @_;
+ my $url;
+
+ $root =~ s!/$!!;
+ $path =~ s!^/!!;
+ $url  =  $root."/".$path;
+
+ return $url;

 }
 
 }
 

-# upper_path()
+# file_name()
+#
+# Return the last part of a path

 #
 #

-# Truncate a path in one of the following ways:
+# Params: Path
+#
+# Return: Last part of the path
+
+sub file_name($)
+{
+ my $path =  shift;
+ $path    =~ tr!\\!/!;
+
+ unless($path eq "/")
+ {
+  $path = substr($path,0,-1) if($path =~ m!/$!);
+  $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: Humand 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.
+# Cut away the last part of a path

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


@@ -156,8 +256,7 @@ sub upper_path($)
  unless($path eq "/")
  {
   $path = substr($path,0,-1) if($path =~ m!/$!);
  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;
  }
 
  return $path;