- The abort() routine from the Output module is now also able to display a link

  at the bottom of the error message. It is a direct wrapper to the error()
  routine.
  Thus, the following error messages now contain a link at the bottom:
  - File not found
  - Accessing above the virtual root directory
  - Creating an object above the virtual root directory
  - Directory where Dev-Editor should create an object does not exist
- It was possible to access the directory containing the virtual root directory.
  Well, it was only read-access.

diff --git a/devedit.pl b/devedit.pl
index eccebd0d985880c0db262910e1e143b3904471ff..aa7a3caf61e965a8dc82de2f89c578961296bd59 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -6,7 +6,7 @@
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-11-07
+# Last modified: 2004-11-13

 #
 
 use strict;
 #
 
 use strict;


@@ -72,14 +72,14 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  unless(-d clean_path($config->{'fileroot'}."/".$dir))
  {
 
  unless(-d clean_path($config->{'fileroot'}."/".$dir))
  {

-  abort($config->{'errors'}->{'dir_not_exist'});
+  abort($config->{'errors'}->{'dir_not_exist'},"/");

  }
 
  # ... and check if the path is above the root directory
 
  unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir))
  {
  }
 
  # ... and check if the path is above the root directory
 
  unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir))
  {

-  abort($config->{'errors'}->{'create_ar'});
+  abort($config->{'errors'}->{'create_ar'},"/");

  }
 
  # Create the physical and the virtual path
  }
 
  # Create the physical and the virtual path


@@ -100,7 +100,7 @@ if(-e clean_path($config->{'fileroot'}."/".$file))
                                   lockfile => $config->{'lock_file'},
                                   timeout  => $config->{'lock_timeout'});
 
                                   lockfile => $config->{'lock_file'},
                                   timeout  => $config->{'lock_timeout'});
 

-  $uselist->lock or abort($config->{'errors'}->{'lock_failed'},{USELIST => $config->{'uselist_file'}, LOCK_FILE => $config->{'lock_file'}});
+  $uselist->lock or abort($config->{'errors'}->{'lock_failed'},undef,{USELIST => $config->{'uselist_file'}, LOCK_FILE => $config->{'lock_file'}});

   $uselist->load;
 
   # Create a hash with data submitted by user
   $uselist->load;
 
   # Create a hash with data submitted by user


@@ -122,12 +122,12 @@ if(-e clean_path($config->{'fileroot'}."/".$file))
  }
  else
  {
  }
  else
  {

-  abort($config->{'errors'}->{'above_root'});
+  abort($config->{'errors'}->{'above_root'},"/");

  }
 }
 else
 {
  }
 }
 else
 {

- abort($config->{'errors'}->{'not_exist'});
+ abort($config->{'errors'}->{'not_exist'},"/");

 }
 
 #
 }
 
 #

diff --git a/modules/Output.pm b/modules/Output.pm
index eff7459661f11adb6d0540b8159e063968ad065e..5fd22bf55bb6991b21f18d168742899b91d8cb22 100644 (file)
--- a/modules/Output.pm
+++ b/modules/Output.pm
@@ -6,7 +6,7 @@ package Output;
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # HTML generating routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-03-12
+# Last modified: 2004-11-13

 #
 
 use strict;
 #
 
 use strict;


@@ -46,7 +46,7 @@ sub error_template($)
 # Format an error message
 #
 # Params: 1. Error message
 # Format an error message
 #
 # Params: 1. Error message

-#         2. Virtual path to which a link should be displayed (optional)
+#         2. Display a link to this path at the bottom of the page (optional)

 #         3. Hash reference: Template variables (optional)
 #
 # Return: Formatted message (Scalar Reference)
 #         3. Hash reference: Template variables (optional)
 #
 # Return: Formatted message (Scalar Reference)


@@ -84,11 +84,12 @@ sub error($;$$)
 # ^^^^^
 #
 # Params: 1. Error message
 # ^^^^^
 #
 # Params: 1. Error message

-#         2. Hash reference: Template variables (optional)
+#         2. Display a link to this path at the bottom of the page (optional)
+#         3. Hash reference: Template variables (optional)

 
 

-sub abort($;$)
+sub abort($;$$)

 {
 {

- my $output = error(shift,undef,shift);
+ my $output = error(shift,shift,shift);

  print $$output;
  exit;
 }
  print $$output;
  exit;
 }

diff --git a/modules/Tool.pm b/modules/Tool.pm
index 8d578efb55547b0a04e12fb00fe88436e4c67a2a..2d044e0de257baad669c5789ac9704083e367a92 100644 (file)
--- a/modules/Tool.pm
+++ b/modules/Tool.pm
@@ -6,7 +6,7 @@ package Tool;
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Some shared sub routines
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-11-04
+# Last modified: 2004-11-13

 #
 
 use strict;
 #
 
 use strict;


@@ -64,11 +64,13 @@ sub check_path($$)
  $first = abs_path($first);
  $path  = $first."/".$last;
 
  $first = abs_path($first);
  $path  = $first."/".$last;
 

- $path = File::Spec->canonpath($path);
+ $first = File::Spec->canonpath($first);
+ $path  = File::Spec->canonpath($path);

 
  # Check if the path is above the root directory
 
  return if(index($path,$root) == -1);
 
  # Check if the path is above the root directory
 
  return if(index($path,$root) == -1);

+ return if($first eq $root && $last =~ m!^(/|\\)?\.\.(/|\\)?$!);

 
  # Create short path name
 
 
  # Create short path name