X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/89269f652fc46e65006b9aead5eb1ae61ebc311e..863abbbee47daf6df718856079cb50833e3552c2:/modules/Command.pm?ds=inline diff --git a/modules/Command.pm b/modules/Command.pm index 363cffe..cddb5ca 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,40 +6,64 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 10-04-2003 +# Last modified: 2004-02-23 # use strict; -use vars qw(@EXPORT - $script); - -use CGI qw(redirect); +use vars qw(@EXPORT); use File::Access; use File::Copy; +use File::Path; -use HTML::Entities; -use Output; use POSIX qw(strftime); use Tool; -$script = $ENV{'SCRIPT_NAME'}; +use CGI qw(header); +use HTML::Entities; +use Output; +use Template; + +my $script = $ENV{'SCRIPT_NAME'}; + +my %dispatch = ('show' => \&exec_show, + 'beginedit' => \&exec_beginedit, + 'canceledit' => \&exec_canceledit, + 'endedit' => \&exec_endedit, + 'mkdir' => \&exec_mkdir, + 'mkfile' => \&exec_mkfile, + 'copy' => \&exec_copy, + 'rename' => \&exec_rename, + 'remove' => \&exec_remove, + 'unlock' => \&exec_unlock + ); ### Export ### use base qw(Exporter); -@EXPORT = qw(exec_show - exec_beginedit - exec_endedit - exec_mkfile - exec_mkdir - exec_workwithfile - exec_copy - exec_rename - exec_remove - exec_unlock); +@EXPORT = qw(exec_command); + +# exec_command() +# +# Execute the specified command +# +# Params: 1. Command to execute +# 2. Reference to user input hash +# 3. Reference to config hash +# +# Return: Output of the command (Scalar Reference) + +sub exec_command($$$) +{ + my ($command,$data,$config) = @_; + + return error($config->{'err_cmd_unknown'},'/',{COMMAND => $command}) unless($dispatch{$command}); + + my $output = &{$dispatch{$command}}($data,$config); + return $output; +} # exec_show() # @@ -50,128 +74,103 @@ use base qw(Exporter); # # Return: Output of the command (Scalar Reference) -sub exec_show($$$) +sub exec_show($$) { my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; - my $output; + + my $tpl = new Template; if(-d $physical) { # Create directory listing my $direntries = dir_read($physical); - return error("Reading of directory $virtual failed") unless($direntries); + return error($config->{'dir_read_failed'},upper_path($virtual),{DIR => '$virtual'}) unless($direntries); my $files = $direntries->{'files'}; my $dirs = $direntries->{'dirs'}; - $output .= htmlhead("Directory listing of $virtual"); - $output .= equal_url($config->{'httproot'},$virtual); - $output .= "
\n\n
\n";
+  my $dirlist = "";
 
   # Create the link to the upper directory
   # (only if we are not in the root directory)
 
   unless($virtual eq "/")
   {
-   my $upper = $physical."/..";
-   my @stat  = stat($upper);
-
-   $output .= "  [SUBDIR]  ";
-   $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= "../\n";
-  }
+   my @stat  = stat($physical."/..");
 
-  # Get the length of the longest file/directory name
+   my $udtpl = new Template;
+   $udtpl->read_file($config->{'tpl_dirlist_up'});
 
-  my $max_name_len = 0;
+   $udtpl->fillin("UPPER_DIR",encode_entities(upper_path($virtual)));
+   $udtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
 
-  foreach(@$dirs,@$files)
-  {
-   my $length    = length($_);
-   $max_name_len = $length if($length > $max_name_len);
+   $dirlist .= $udtpl->get_template;
   }
 
   # Directories
 
   foreach my $dir(@$dirs)
   {
-   my @stat = stat($physical."/".$dir);
+   my @stat      = stat($physical."/".$dir);
+   my $virt_path = encode_entities($virtual.$dir."/");
 
-   $output .= "  ";
-   $output .= "[SUBDIR]  ";
-   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= "".encode_entities($dir)."/\n";
+   my $dtpl = new Template;
+   $dtpl->read_file($config->{'tpl_dirlist_dir'});
+
+   $dtpl->fillin("DIR",$virt_path);
+   $dtpl->fillin("DIR_NAME",$dir);
+   $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
+
+   $dirlist .= $dtpl->get_template;
   }
 
   # Files
 
   foreach my $file(@$files)
   {
-   my $phys_path = $physical."/".$file; # Not exactly...
+   my $phys_path = $physical."/".$file;
    my $virt_path = encode_entities($virtual.$file);
 
    my @stat      = stat($phys_path);
    my $in_use    = $data->{'uselist'}->in_use($virtual.$file);
 
-   $output .= " " x (10 - length($stat[7]));
-   $output .= $stat[7];
-   $output .= "  ";
-   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
-   $output .= ($in_use) ? " (IN USE) " : (not -T $phys_path) ? " (BINARY) " : " " x 10;
-   $output .= encode_entities($file);
-   $output .= " " x ($max_name_len - length($file))."\t  (";
+   my $ftpl = new Template;
+   $ftpl->read_file($config->{'tpl_dirlist_file'});
+
+   $ftpl->fillin("FILE",$virt_path);
+   $ftpl->fillin("FILE_NAME",$file);
+   $ftpl->fillin("SIZE",$stat[7]);
+   $ftpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
 
-   $output .= (-T $phys_path)
-              ? "View"
-              : 'View';
+   $ftpl->parse_if_block("not_readable",not -r $phys_path);
+   $ftpl->parse_if_block("binary",-B $phys_path);
+   $ftpl->parse_if_block("readonly",not -w $phys_path);
 
-   $output .= " | ";
+   $ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path);
+   $ftpl->parse_if_block("editable",-w $phys_path && -r $phys_path && -T $phys_path && not $in_use);
 
-   $output .= ($in_use || not -T $phys_path)
-              ? 'Edit'
-              : "Edit";
+   $ftpl->parse_if_block("in_use",$in_use);
+   $ftpl->parse_if_block("unused",not $in_use);
 
-   $output .= " | Do other stuff)\n";
+   $dirlist .= $ftpl->get_template;
   }
 
-  $output .= "
\n\n
\n\n"; - - # Bottom of directory listing - # (Fields for creating files and directories) - - $output .= < - -
- - -Create new directory: -$virtual -
- - -Create new file: -
- - -$virtual -
- - - -
-END - $output .= htmlfoot; + $tpl->read_file($config->{'tpl_dirlist'}); + + $tpl->fillin("DIRLIST",$dirlist); + $tpl->fillin("DIR",$virtual); + $tpl->fillin("SCRIPT",$script); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); } else { # View a file + return error($config->{'err_noview'},upper_path($virtual)) unless(-r $physical); + # Check on binary files # We have to do it in this way, or empty files # will be recognized as binary files @@ -180,25 +179,28 @@ END { # Binary file - return error("This editor is not able to view/edit binary files."); + return error($config->{'err_binary'},upper_path($virtual)); } else { # Text file - $output = htmlhead("Contents of file ".encode_entities($virtual)); - $output .= equal_url($config->{'httproot'},$virtual); - $output .= dir_link($virtual); + my $content = file_read($physical); + $$content =~ s/\015\012|\012|\015/\n/g; - $output .= '
'."\n"; - $output .= '
'."\n";
-   $output .= encode_entities(${file_read($physical)});
-   $output .= "\n
\n
"; + $tpl->read_file($config->{'tpl_viewfile'}); - $output .= htmlfoot; + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + $tpl->fillin("CONTENT",encode_entities($$content)); } } + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + return \$output; } @@ -218,8 +220,9 @@ sub exec_beginedit($$) my $virtual = $data->{'virtual'}; my $uselist = $data->{'uselist'}; - return error("You cannot edit directories.") if(-d $physical); + return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical); return error_in_use($virtual) if($uselist->in_use($virtual)); + return error($config->{'err_noedit'},upper_path($virtual)) unless(-r $physical && -w $physical); # Check on binary files @@ -227,7 +230,7 @@ sub exec_beginedit($$) { # Binary file - return error("This editor is not able to view/edit binary files."); + return error($config->{'err_binary'},upper_path($virtual)); } else { @@ -236,49 +239,41 @@ sub exec_beginedit($$) $uselist->add_file($virtual); $uselist->save; - my $dir = upper_path($virtual); - my $content = encode_entities(${file_read($physical)}); - - my $equal_url = equal_url($config->{'httproot'},$virtual); - - $virtual = encode_entities($virtual); + my $content = file_read($physical); + $$content =~ s/\015\012|\012|\015/\n/g; - my $output = htmlhead("Edit file $virtual"); - $output .= $equal_url; - $output .= <Caution! This file is locked for other users while you are editing it. To unlock it, click Save and exit or Exit WITHOUT saving. Please don't click the Reload button in your browser! This will confuse the editor.

+ my $tpl = new Template; + $tpl->read_file($config->{'tpl_editfile'}); -
- - -

-
+ $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + $tpl->fillin("CONTENT",encode_entities($$content)); -
- - + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; - - - - - - - - - -
- - Save as new file: $dir Encode ISO-8859-1 special chars
+ return \$output; + } +} - -
-END +# exec_canceledit() +# +# Abort file editing +# +# Params: 1. Reference to user input hash +# 2. Reference to config hash +# +# Return: Output of the command (Scalar Reference) - $output .= htmlfoot; +sub exec_canceledit($$) +{ + my ($data,$config) = @_; + my $virtual = $data->{'virtual'}; - return \$output; - } + file_unlock($data->{'uselist'},$virtual); + return devedit_reload({command => 'show', file => upper_path($virtual)}); } # exec_endedit() @@ -296,8 +291,11 @@ sub exec_endedit($$) my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; my $content = $data->{'cgi'}->param('filecontent'); + my $uselist = $data->{'uselist'}; + + # Normalize newlines - return error("You cannot edit directories.") if(-d $physical); + $content =~ s/\015\012|\012|\015/\n/g; if($data->{'cgi'}->param('encode_iso')) { @@ -312,17 +310,29 @@ sub exec_endedit($$) $physical = $data->{'new_physical'}; $virtual = $data->{'new_virtual'}; + + # Check if someone else is editing the new file + + return error_in_use($virtual) if($uselist->in_use($virtual)); } + return error($config->{'err_editdir'},upper_path($virtual)) if(-d $physical); + return error($config->{'err_noedit'}, upper_path($virtual)) unless(-r $physical && -w $physical); + if(file_save($physical,\$content)) { # Saving of the file was successful - so unlock it! - return exec_unlock($data,$config); + file_unlock($uselist,$data->{'virtual'}); + # ^^^^^^^^^^^^^^^^^^ + # Maybe the user saved the file using another filename... + # But we have to unlock the original file! + + return devedit_reload({command => 'show', file => upper_path($virtual)}); } else { - return error("Saving of file '".encode_entities($virtual)."' failed'."); + return error($config->{'err_edit_failed'},upper_path($virtual),{FILE => $virtual}); } } @@ -343,12 +353,10 @@ sub exec_mkfile($$) my $dir = upper_path($new_virtual); $new_virtual = encode_entities($new_virtual); - return error("A file or directory called '$new_virtual' does already exist.") if(-e $new_physical); - - file_create($new_physical) or return error("Could not create file '$new_virtual'."); + return error($config->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); - my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir"); - return \$output; + file_create($new_physical) or return error($config->{'err_mkfile_failed'},$dir,{FILE => $new_virtual}); + return devedit_reload({command => 'show', file => $dir}); } # exec_mkdir() @@ -368,138 +376,83 @@ sub exec_mkdir($$) my $dir = upper_path($new_virtual); $new_virtual = encode_entities($new_virtual); - return error("A file or directory called '$new_virtual' does already exist.") if(-e $new_physical); - - mkdir($new_physical) or return error("Could not create directory '$new_virtual'."); + return error($config->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); - my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir"); - return \$output; + mkdir($new_physical,0777) or return error($config->{'err_mkdir_failed'},$dir,{DIR => $new_virtual}); + return devedit_reload({command => 'show', file => $dir}); } -# exec_workwithfile() +# exec_copy() # -# Display a form for renaming/copying/deleting/unlocking a file +# Copy a file and return to directory view # # Params: 1. Reference to user input hash # 2. Reference to config hash # # Return: Output of the command (Scalar Reference) -sub exec_workwithfile($$) +sub exec_copy($$) { my ($data,$config) = @_; my $physical = $data->{'physical'}; - my $virtual = $data->{'virtual'}; - my $unused = $data->{'uselist'}->unused($virtual); - - my $dir = encode_entities(upper_path($virtual)); - - my $output = htmlhead("Work with file ".encode_entities($virtual)); - $output .= equal_url($config->{'httproot'},$virtual); - - $virtual = encode_entities($virtual); - - $output .= dir_link($virtual); - $output .= "

Note: On UNIX systems, filenames are case-sensitive!

\n\n"; - - $output .= "

Someone else is currently editing this file. So not all features are available.

\n\n" unless($unused); - - # Copying of the file as always allowed - - $output .= < - -

Copy

- -
- - -

Copy file '$virtual' to: $dir

-
- -
+ my $virtual = encode_entities($data->{'virtual'}); + my $new_physical = $data->{'new_physical'}; -END + return error($config->{'err_nocopy'}) unless(-r $physical); - if($unused) + if($new_physical) { - # File is not locked - # Allow renaming and deleting the file + my $new_virtual = $data->{'new_virtual'}; + my $dir = upper_path($new_virtual); + $new_virtual = encode_entities($new_virtual); - $output .= <Move/rename - -
- - -

Move/Rename file '$virtual' to: $dir

-
- -
- -

Delete

+ if(-e $new_physical) + { + return error($config->{'err_exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); + + if(-d $new_physical) + { + return error($config->{'err_dircopy'}); + } + elsif(not $data->{'cgi'}->param('confirmed')) + { + my $tpl = new Template; + $tpl->read_file($config->{'tpl_confirm_replace'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("NEW_FILE",$new_virtual); + $tpl->fillin("NEW_FILENAME",file_name($new_virtual)); + $tpl->fillin("NEW_DIR",$dir); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("COMMAND","copy"); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } + } -
- - -

-
-END + copy($physical,$new_physical) or return error($config->{'err_copy_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual}); + return devedit_reload({command => 'show', file => $dir}); } else { - # File is locked - # Just display a button for unlocking it + my $tpl = new Template; + $tpl->read_file($config->{'tpl_copyfile'}); - $output .= <Unlock file + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); -

Someone else is currently editing this file. At least, the file is marked so. Maybe, someone who was editing the file has forgotten to unlock it. In this case (and only in this case) you can unlock the file using this button:

+ my $output = header(-type => "text/html"); + $output .= $tpl->get_template; -
- - -

-
-END - } - - $output .= "\n
"; - $output .= htmlfoot; - - return \$output; -} - -# exec_copy() -# -# Copy a file and return to directory view -# -# Params: 1. Reference to user input hash -# 2. Reference to config hash -# -# Return: Output of the command (Scalar Reference) - -sub exec_copy($$) -{ - my ($data,$config) = @_; - my $physical = $data->{'physical'}; - my $virtual = encode_entities($data->{'virtual'}); - my $new_physical = $data->{'new_physical'}; - my $new_virtual = $data->{'new_virtual'}; - my $dir = upper_path($new_virtual); - $new_virtual = encode_entities($new_virtual); - - return error("This editor is not able to copy directories.") if(-d $physical); - - if(-e $new_physical) - { - return error("A file or directory called '$new_virtual' does already exists and this editor is currently not able to ask to overwrite the existing file or directory."); + return \$output; } - - copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'"); - - my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir"); - return \$output; } # exec_rename() @@ -517,26 +470,67 @@ sub exec_rename($$) my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; my $new_physical = $data->{'new_physical'}; - my $new_virtual = $data->{'new_virtual'}; - my $dir = upper_path($new_virtual); - $new_virtual = encode_entities($new_virtual); return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual)); - if(-e $new_physical) + if($new_physical) { - return error("A file or directory called '$new_virtual' does already exists and this editor is currently not able to ask to overwrite the existing file or directory."); + my $new_virtual = $data->{'new_virtual'}; + my $dir = upper_path($new_virtual); + $new_virtual = encode_entities($new_virtual); + + if(-e $new_physical) + { + return error($config->{'err_exist_edited'},$dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); + + if(-d $new_physical) + { + return error($config->{'err_dircopy'}); + } + elsif(not $data->{'cgi'}->param('confirmed')) + { + my $tpl = new Template; + $tpl->read_file($config->{'tpl_confirm_replace'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("NEW_FILE",$new_virtual); + $tpl->fillin("NEW_FILENAME",file_name($new_virtual)); + $tpl->fillin("NEW_DIR",$dir); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("COMMAND","rename"); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } + } + + rename($physical,$new_physical) or return error($config->{'err_rename_failed'},upper_path($virtual),{FILE => $virtual, NEW_FILE => $new_virtual}); + return devedit_reload({command => 'show', file => $dir}); } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'tpl_renamefile'}); - rename($physical,$new_physical) or return error("Could not move/rename '".encode_entities($virtual)."' to '$new_virtual'."); + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); - my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=$dir"); - return \$output; + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } } # exec_remove() # -# Remove a file and return to directory view +# Remove a file or a directory and return to directory view # # Params: 1. Reference to user input hash # 2. Reference to config hash @@ -549,13 +543,58 @@ sub exec_remove($$) my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; - return error("Deleting directories is currently unsupported") if(-d $physical); - return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual)); + if(-d $physical) + { + # Remove a directory - unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'."); + if($data->{'cgi'}->param('confirmed')) + { + rmtree($physical); + return devedit_reload({command => 'show', file => upper_path($virtual)}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'tpl_confirm_rmdir'}); - my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=".upper_path($virtual)); - return \$output; + $tpl->fillin("DIR",$virtual); + $tpl->fillin("UPPER_DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } + } + else + { + # Remove a file + + return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual)); + + if($data->{'cgi'}->param('confirmed')) + { + unlink($physical) or return error($config->{'err_delete_failed'},upper_path($virtual),{FILE => $virtual}); + return devedit_reload({command => 'show', file => upper_path($virtual)}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'tpl_confirm_rmfile'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } + } } # exec_unlock() @@ -572,13 +611,27 @@ sub exec_unlock($$) { my ($data,$config) = @_; my $virtual = $data->{'virtual'}; - my $uselist = $data->{'uselist'}; - $uselist->remove_file($virtual); - $uselist->save; + if($data->{'cgi'}->param('confirmed')) + { + file_unlock($data->{'uselist'},$virtual); + return devedit_reload({command => 'show', file => upper_path($virtual)}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'tpl_confirm_unlock'}); - my $output = redirect("http://$ENV{'HTTP_HOST'}$script?command=show&file=".upper_path($virtual)); - return \$output; + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } } # it's true, baby ;-)