- The commands are now dispatched in Command.pm. Only the method exec_command() is...

[devedit.git] / devedit.pl

diff --git a/devedit.pl b/devedit.pl
index 42e1d40f03122eef2536ca48e4efd789217835d1..2c46f85f1884ee55e4f3f6541fae3ab7bb4534b5 100644 (file)
--- a/devedit.pl
+++ b/devedit.pl
@@ -1,17 +1,19 @@
 #!C:/Programme/Perl/bin/perl.exe -w
 
 #
-# Dev-Editor
+# Dev-Editor 1.1
 #
 # Dev-Editor's main program
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
-# Last modified: 09-22-2003
+# Last modified: 2003-12-02
 #
 
 use strict;
 use CGI::Carp qw(fatalsToBrowser);
 
+use vars qw(%config);
+
 use lib 'modules';
 
 use CGI;
@@ -20,17 +22,16 @@ use File::UseList;
 use Output;
 use Tool;
 
-our $VERSION = '0.7';
-
 ### Settings ###
 
-our %config = (
-               fileroot     => 'D:/Server/WWW/Root',
-               httproot     => '/',
-               uselist_file => 'uselist',
-               lock_file    => 'uselist.lock',
-               lock_timeout => '10'
-              );
+%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'
+          );
 
 ### End Settings ###
 
@@ -40,6 +41,44 @@ my $cgi = new CGI;
 
 my $command = $cgi->param('command') || 'show';
 my $file    = $cgi->param('file')    || '/';
+my $curdir  = $cgi->param('curdir')  || '';
+my $newfile = $cgi->param('newfile') || '';
+
+# Create physical and virtual path for the new file
+# This section has to be optimized - ugh!
+
+my $new_physical = '';
+my $new_virtual  = '';
+
+if($newfile ne '')
+{
+ $curdir  = upper_path($file) if($curdir eq '');
+ my $path = clean_path($curdir.$newfile);
+
+ # Extract file and directory name...
+
+ my $file = file_name($path);
+ my $dir  = upper_path($path);
+
+ # ... check if the directory exists ...
+
+ unless(-d clean_path($config{'fileroot'}."/".$dir))
+ {
+  abort("The directory where you want to create this file or directory doesn't exist.");
+ }
+
+ # ... and check if the path is above the root directory
+
+ 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.");
+ }
+
+ # Create the physical and the virtual path
+
+ $new_physical = File::Spec->canonpath($new_physical."/".$file);
+ $new_virtual .= $file;
+}
 
 # This check has to be performed first, or abs_path() will be confused
 
@@ -47,49 +86,28 @@ if(-e clean_path($config{'fileroot'}."/".$file))
 {
  if(my ($physical,$virtual) = check_path($config{'fileroot'},$file))
  {
-  # Copied from old Dev-Editor (great idea)
-
-  my %dispatch = ('show'         => \&exec_show,
-                  'beginedit'    => \&exec_beginedit,
-                  'canceledit'   => \&exec_unlock,
-                  'endedit'      => \&exec_endedit,
-                  # 'mkdir'        => \&exec_mkdir,
-                  # 'mkfile'       => \&exec_mkfile,
-                  'workwithfile' => \&exec_workwithfile,
-                  # 'copy'         => \&exec_copy,
-                  # 'rename'       => \&exec_rename,
-                  'remove'       => \&exec_remove,
-                  'unlock'       => \&exec_unlock
-                 );
-
   # 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("Locking failed. Try it again in a moment. If the problem persists, ask someone to recreate the lockfile ($config{'lock_file'}).");
+  $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->load;
 
   # Create a hash with data submitted by user
-  # (the CGI and the File::UseList objects will also be included)
+  # (the CGI and the File::UseList object will also be included)
 
   my %data = (physical     => $physical,
               virtual      => $virtual,
-              new_physical => '',
-              new_virtual  => '',
+              new_physical => $new_physical,
+              new_virtual  => $new_virtual,
               uselist      => $uselist,
               cgi          => $cgi);
 
-  unless($dispatch{$command})
-  {
-   $uselist->unlock;
-   abort("Unknown command: $command");
-  }
-
-  my $output = &{$dispatch{$command}}(\%data,\%config); # Execute the command...
+  my $output = exec_command($command,\%data,\%config); # Execute the command...
 
-  $uselist->unlock; # ... unlock the list with used files...
+  $uselist->unlock; # ... unlock the list with files in use...
   print $$output;   # ... and print the output of the command
  }
  else