Fixed typo

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 2f9c9184cf9a17cc1198103c60a57c95235dec02..3fd8641090a462d049fd5b0d715968905e49cbe7 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,12 +1,12 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #

-# Dev-Editor 2.3.1
+# Dev-Editor 3.0 (CVS)

 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2005-02-13
+# Last modified: 2005-04-22

 #
 
 use strict;
 #
 
 use strict;


@@ -17,18 +17,17 @@ use lib 'modules';
 
 use CGI;
 use Config::DevEdit;
 
 use CGI;
 use Config::DevEdit;

-use File::UseList;

 
 use Command;
 use Output;
 use Tool;
 
 
 use Command;
 use Output;
 use Tool;
 

-$VERSION = '2.3.1';
+$VERSION = '3.0 (CVS)';

 
 # Path to configuration file
 # Change if necessary!
 
 
 # Path to configuration file
 # Change if necessary!
 

-use constant CONFIGFILE => 'devedit.dat';
+use constant CONFIGFILE => 'devedit.conf';

 
 # Read the configuration file
 
 
 # Read the configuration file
 


@@ -37,7 +36,7 @@ error_template($config->{'templates'}->{'error'}); # Yes, I'm lazy...
 
 # Check if the root directory exists
 
 
 # Check if the root directory exists
 

-abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'});
+abort($config->{'errors'}->{'no_root_dir'}) unless(-d $config->{'fileroot'} && not -l $config->{'fileroot'});

 
 # Check if we are able to access the root directory
 
 
 # Check if we are able to access the root directory
 


@@ -69,14 +68,9 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  # ... check if the directory exists ...
 
 
  # ... check if the directory exists ...
 

- unless(-d clean_path($config->{'fileroot'}.'/'.$dir))
- {
-  abort($config->{'errors'}->{'dir_not_exist'},'/');
- }
-
- # (don't know, why this test has to be done separately)
+ my $temp_path = clean_path($config->{'fileroot'}.'/'.$dir);

 
 

- if(-l clean_path($config->{'fileroot'}.'/'.$dir))
+ unless(-d $temp_path && not -l $temp_path)

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


@@ -85,7 +79,7 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir))
  {
 
  unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir))
  {

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

  }
 
  # Check if we have enough permissions to create a file
  }
 
  # Check if we have enough permissions to create a file


@@ -93,7 +87,7 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
  unless(-r $new_physical && -w $new_physical && -x $new_physical)
  {
 
  unless(-r $new_physical && -w $new_physical && -x $new_physical)
  {

-  abort($config->{'errors'}->{'dir_no_create'},'/',{DIR => $new_virtual});
+  abort($config->{'errors'}->{'dir_no_create'},'/',{DIR => encode_html($new_virtual)});

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


@@ -104,19 +98,12 @@ if($newfile ne '' && $newfile !~ /^\s+$/)
 
 # 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) || -l clean_path($config->{'fileroot'}.'/'.$file))
+my $temp_path = clean_path($config->{'fileroot'}.'/'.$file);
+
+if(-e $temp_path || -l $temp_path)

 {
  if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
  {
 {
  if(my ($physical,$virtual) = check_path($config->{'fileroot'},$file))
  {

-  # Create a File::UseList object and load the list
-
-  my $uselist = new File::UseList(listfile => $config->{'uselist_file'},
-                                  lockfile => $config->{'lock_file'},
-                                  timeout  => $config->{'lock_timeout'});
-
-  $uselist->lock or abort($config->{'errors'}->{'lock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}});
-  $uselist->load;
-

   # Create a hash containing data submitted by the user
   # (some other necessary information are also included)
 
   # Create a hash containing data submitted by the user
   # (some other necessary information are also included)
 


@@ -124,7 +111,6 @@ if(-e clean_path($config->{'fileroot'}.'/'.$file) || -l clean_path($config->{'fi
               virtual      => $virtual,
               new_physical => $new_physical,
               new_virtual  => $new_virtual,
               virtual      => $virtual,
               new_physical => $new_physical,
               new_virtual  => $new_virtual,

-              uselist      => $uselist,

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


@@ -133,9 +119,8 @@ if(-e clean_path($config->{'fileroot'}.'/'.$file) || -l clean_path($config->{'fi
 
   my $output = exec_command($command,\%data,$config);
 
 
   my $output = exec_command($command,\%data,$config);
 

-  # ... unlock the list with files in use and show the output of the command
+  # ... and show its output

 
 

-  $uselist->unlock or abort($config->{'errors'}->{'unlock_failed'},undef,{USELIST => $uselist->{'listfile'}, LOCK_FILE => $uselist->{'lockfile'}});

   print $$output;
  }
  else
   print $$output;
  }
  else


@@ -145,7 +130,7 @@ if(-e clean_path($config->{'fileroot'}.'/'.$file) || -l clean_path($config->{'fi
 }
 else
 {
 }
 else
 {

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

 }
 
 #
 }
 
 #