Another bug in the same line!

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index b933cf1953c188813371cac2f5e1c808dd84d368..eccebd0d985880c0db262910e1e143b3904471ff 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,17 +1,18 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #

-# Dev-Editor 1.2
+# Dev-Editor 2.1a

 #
 # 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-02-20
+# Last modified: 2004-11-07

 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 
 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 

+use vars qw($VERSION);

 use lib 'modules';
 
 use CGI;
 use lib 'modules';
 
 use CGI;


@@ -22,12 +23,25 @@ use Command;
 use Output;
 use Tool;
 
 use Output;
 use Tool;
 

+$VERSION = '2.1a';
+
+# Path to configuration file
+# Change if necessary!
+

 use constant CONFIGFILE => 'devedit.dat';
 
 # Read the configuration file
 
 my $config = read_config(CONFIGFILE);
 use constant CONFIGFILE => 'devedit.dat';
 
 # Read the configuration file
 
 my $config = read_config(CONFIGFILE);

-error_template($config->{'tpl_error'}); # Yes, I'm lazy...
+error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy...
+
+# Check if the root directory exists
+
+abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'});
+
+# Check if we are able to access the root directory
+
+abort($config->{'errors'}->{'no_root_access'}) unless(-r $config->{'fileroot'} && -x $config->{'fileroot'});

 
 # Read the most important form data
 
 
 # Read the most important form data
 


@@ -44,7 +58,7 @@ my $newfile = $cgi->param('newfile') || '';
 my $new_physical = '';
 my $new_virtual  = '';
 
 my $new_physical = '';
 my $new_virtual  = '';
 

-if($newfile ne '')
+if($newfile ne '' && $newfile !~ /^\s+$/)

 {
  $curdir  = upper_path($file) if($curdir eq '');
  my $path = clean_path($curdir.$newfile);
 {
  $curdir  = upper_path($file) if($curdir eq '');
  my $path = clean_path($curdir.$newfile);


@@ -58,14 +72,14 @@ if($newfile ne '')
 
  unless(-d clean_path($config->{'fileroot'}."/".$dir))
  {
 
  unless(-d clean_path($config->{'fileroot'}."/".$dir))
  {

-  abort("The directory where you want to create this file or directory doesn't 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->{'err_create_ar'});
+  abort($config->{'errors'}->{'create_ar'});

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


@@ -74,7 +88,7 @@ if($newfile ne '')
  $new_virtual .= $file;
 }
 
  $new_virtual .= $file;
 }
 

-# This check has to be performed first, or abs_path() will be confused
+# This check has to be performed first or abs_path() will be confused

 
 if(-e clean_path($config->{'fileroot'}."/".$file))
 {
 
 if(-e clean_path($config->{'fileroot'}."/".$file))
 {


@@ -86,32 +100,34 @@ 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("Locking of $config->{'uselist_file'} failed. Try it again in a moment. If the problem persists, ask someone to recreate the lock file ($config->{'lock_file'}).");
+  $uselist->lock or abort($config->{'errors'}->{'lock_failed'},{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

-  # (the CGI and the File::UseList object will also be included)
+  # (some other necessary information will also be included)

 
   my %data = (physical     => $physical,
               virtual      => $virtual,
               new_physical => $new_physical,
               new_virtual  => $new_virtual,
               uselist      => $uselist,
 
   my %data = (physical     => $physical,
               virtual      => $virtual,
               new_physical => $new_physical,
               new_virtual  => $new_virtual,
               uselist      => $uselist,

-              cgi          => $cgi);
+              cgi          => $cgi,
+              version      => $VERSION,
+              configfile   => CONFIGFILE);

 
   my $output = exec_command($command,\%data,$config); # Execute the command...
 
   $uselist->unlock; # ... unlock the list with files in use...
 
   my $output = exec_command($command,\%data,$config); # Execute the command...
 
   $uselist->unlock; # ... unlock the list with files in use...

-  print $$output;   # ... and print the output of the command
+  print $$output;   # ... and show the output of the command

  }
  else
  {
  }
  else
  {

-  abort($config->{'err_above_root'});
+  abort($config->{'errors'}->{'above_root'});

  }
 }
 else
 {
  }
 }
 else
 {

- abort("File/directory does not exist.");
+ abort($config->{'errors'}->{'not_exist'});

 }
 
 #
 }
 
 #