There is no need to export error_in_use() any more, because I removed this function.

[devedit.git] / devedit.pl

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

-# Last modified: 2003-12-02
+# Last modified: 2004-02-23

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

-use vars qw(%config);
-

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

-use Command;
+use Config::DevEdit;

 use File::UseList;
 use File::UseList;

+
+use Command;

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

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

 
 

-%config = (
-           fileroot     => 'D:/Server/WWW/dokumente/devedit-test',
-           httproot     => '/devedit-test/',
-           timeformat   => '%d.%m.%Y %H:%M',
-           uselist_file => 'uselist',
-           lock_file    => 'uselist.lock',
-           lock_timeout => '10'
-          );
+# Read the configuration file

 
 

-### End Settings ###
+my $config = read_config(CONFIGFILE);
+error_template($config->{'tpl_error'}); # Yes, I'm lazy...

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


@@ -62,16 +56,16 @@ if($newfile ne '')
 
  # ... check if the directory exists ...
 
 
  # ... check if the directory exists ...
 

- 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->{'err_dir_not_exist'});

  }
 
  # ... and check if the path is above the root directory
 
  }
 
  # ... and check if the path is above the root directory
 

- unless(($new_physical,$new_virtual) = check_path($config{'fileroot'},$dir))
+ unless(($new_physical,$new_virtual) = check_path($config->{'fileroot'},$dir))

  {
  {

-  abort("You aren't allowed to create files and directories above the virtual root directory.");
+  abort($config->{'err_create_ar'});

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


@@ -82,17 +76,17 @@ if($newfile ne '')
 
 # 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))

 {
 {

- 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
 
  {
   # 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'});
+  my $uselist = new File::UseList(listfile => $config->{'uselist_file'},
+                                  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->{'err_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


@@ -105,19 +99,19 @@ if(-e clean_path($config{'fileroot'}."/".$file))
               uselist      => $uselist,
               cgi          => $cgi);
 
               uselist      => $uselist,
               cgi          => $cgi);
 

-  my $output = exec_command($command,\%data,\%config); # Execute the command...
+  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
  }
  else
  {
 
   $uselist->unlock; # ... unlock the list with files in use...
   print $$output;   # ... and print the output of the command
  }
  else
  {

-  abort("Accessing files and directories above the virtual root directory is forbidden.");
+  abort($config->{'err_above_root'});

  }
 }
 else
 {
  }
 }
 else
 {

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

 }
 
 #
 }
 
 #