X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/f0cd6d2f27ac9fcf1b121b9c2f7f8eb40b7a222c..0705361ceafdfaec2a911e7d34878156bfad1cca:/modules/Command.pm diff --git a/modules/Command.pm b/modules/Command.pm index 635d43d..6c02aa1 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -5,8 +5,8 @@ package Command; # # Execute Dev-Editor's commands # -# Author: Patrick Canterino -# Last modified: 2003-12-02 +# Author: Patrick Canterino +# Last modified: 2004-12-21 # use strict; @@ -17,26 +17,30 @@ use File::Access; use File::Copy; use File::Path; -use HTML::Entities; -use Output; use POSIX qw(strftime); use Tool; -my $script = $ENV{'SCRIPT_NAME'}; - -my %dispatch = ('show' => \&exec_show, - 'beginedit' => \&exec_beginedit, - 'canceledit' => \&exec_unlock, - 'endedit' => \&exec_endedit, - 'mkdir' => \&exec_mkdir, - 'mkfile' => \&exec_mkfile, - 'workwithfile' => \&exec_workwithfile, - 'workwithdir' => \&exec_workwithdir, - 'copy' => \&exec_copy, - 'rename' => \&exec_rename, - 'remove' => \&exec_remove, - 'rmdir' => \&exec_rmdir, - 'unlock' => \&exec_unlock +use CGI qw(header); +use HTML::Entities; +use Output; +use Template; + +my $script = encode_entities($ENV{'SCRIPT_NAME'}); +my $users = eval("getpwuid(0)") && eval("getgrgid(0)"); + +my %dispatch = ('show' => \&exec_show, + 'beginedit' => \&exec_beginedit, + 'canceledit' => \&exec_canceledit, + 'endedit' => \&exec_endedit, + 'mkdir' => \&exec_mkdir, + 'mkfile' => \&exec_mkfile, + 'upload' => \&exec_upload, + 'copy' => \&exec_copy, + 'rename' => \&exec_rename, + 'remove' => \&exec_remove, + 'chprop' => \&exec_chprop, + 'unlock' => \&exec_unlock, + 'about' => \&exec_about ); ### Export ### @@ -59,10 +63,16 @@ sub exec_command($$$) { my ($command,$data,$config) = @_; - return error("Unknown command: $command") unless($dispatch{$command}); + foreach(keys(%dispatch)) + { + if(lc($_) eq lc($command)) + { + my $output = &{$dispatch{$_}}($data,$config); + return $output; + } + } - my $output = &{$dispatch{$command}}($data,$config); - return $output; + return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => encode_entities($command)}); } # exec_show() @@ -79,60 +89,64 @@ sub exec_show($$) my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; - my $output; + my $upper_path = encode_entities(upper_path($virtual)); + my $uselist = $data->{'uselist'}; + + my $tpl = new Template; if(-d $physical) { # Create directory listing + return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical); + my $direntries = dir_read($physical); - return error("Reading of directory $virtual failed.",upper_path($virtual)) unless($direntries); + return error($config->{'dir_read_fail'},$upper_path,{DIR => encode_entities($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 $dir_writeable = -w $physical;
+
+  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->{'templates'}->{'dirlist_up'});
 
-  my $max_name_len = 0;
+   $udtpl->fillin("UPPER_DIR",$upper_path);
+   $udtpl->fillin("DATE",encode_entities(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 $phys_path = $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)."/";
-   $output .= " " x ($max_name_len - length($dir) - 1)."\t  (";
-   $output .= "Work with directory)\n";
+   my @stat      = stat($phys_path);
+
+   my $dtpl = new Template;
+   $dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
+
+   $dtpl->fillin("DIR",$virt_path);
+   $dtpl->fillin("DIR_NAME",encode_entities($dir));
+   $dtpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
+   $dtpl->fillin("URL",equal_url(encode_entities($config->{'httproot'}),$virt_path));
+
+   $dtpl->parse_if_block("readable",-r $phys_path && -x $phys_path);
+   $dtpl->parse_if_block("users",$users && -o $phys_path);
+
+   $dirlist .= $dtpl->get_template;
   }
 
   # Files
@@ -143,91 +157,49 @@ sub exec_show($$)
    my $virt_path = encode_entities($virtual.$file);
 
    my @stat      = stat($phys_path);
-   my $in_use    = $data->{'uselist'}->in_use($virtual.$file);
+   my $in_use    = $uselist->in_use($virtual.$file);
+   my $too_large = $config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'};
 
-   $output .= " " x (10 - length($stat[7]));
-   $output .= $stat[7];
-   $output .= "  ";
-   $output .= strftime($config->{'timeformat'},localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= encode_entities($file);
-   $output .= " " x ($max_name_len - length($file))."\t  (";
+   my $ftpl = new Template;
+   $ftpl->read_file($config->{'templates'}->{'dirlist_file'});
 
-   # Link "View"
+   $ftpl->fillin("FILE",$virt_path);
+   $ftpl->fillin("FILE_NAME",encode_entities($file));
+   $ftpl->fillin("SIZE",$stat[7]);
+   $ftpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
+   $ftpl->fillin("URL",equal_url(encode_entities($config->{'httproot'}),$virt_path));
 
-   if(-r $phys_path && -T $phys_path)
-   {
-    $output .= "View";
-   }
-   else
-   {
-    $output .= 'parse_if_block("binary",-B $phys_path);
+   $ftpl->parse_if_block("readonly",not -w $phys_path);
 
-    $output .= (not -r $phys_path) ? "Not readable" :
-               (-B     $phys_path) ? "Binary file"  : "";
+   $ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path && not $too_large);
+   $ftpl->parse_if_block("editable",(-r $phys_path && -w $phys_path && -T $phys_path && not $too_large) && not $in_use);
 
-    $output .= '">View';
-   }
+   $ftpl->parse_if_block("in_use",$in_use);
+   $ftpl->parse_if_block("unused",not $in_use);
 
-   $output .= " | ";
+   $ftpl->parse_if_block("too_large",$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
 
-   # Link "Edit"
+   $ftpl->parse_if_block("users",$users && -o $phys_path);
 
-   if(-w $phys_path && -r $phys_path && -T $phys_path && not $in_use)
-   {
-    $output .= "Edit";
-   }
-   else
-   {
-    $output .= 'get_template;
+  }
 
-   # Link "Do other stuff"
+  $tpl->read_file($config->{'templates'}->{'dirlist'});
 
-   $output .= " | Work with file)\n";
-  }
+  $tpl->fillin("DIRLIST",$dirlist);
+  $tpl->fillin("DIR",encode_entities($virtual));
+  $tpl->fillin("SCRIPT",$script);
+  $tpl->fillin("URL",encode_entities(equal_url($config->{'httproot'},$virtual)));
 
-  $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->parse_if_block("dir_writeable",$dir_writeable); } else { # View a file - return error("You have not enough permissions to view this file.",upper_path($virtual)) unless(-r $physical); + return error($config->{'errors'}->{'no_view'},$upper_path) unless(-r $physical); # Check on binary files # We have to do it in this way, or empty files @@ -237,25 +209,38 @@ END { # Binary file - return error("This editor is not able to view/edit binary files.",upper_path($virtual)); + return error($config->{'errors'}->{'binary'},$upper_path); } else { # Text file - $output = htmlhead("Contents of file ".encode_entities($virtual)); - $output .= equal_url($config->{'httproot'},$virtual); - $output .= dir_link($virtual); + if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'}) + { + return error($config->{'errors'}->{'file_too_large'},$upper_path,{SIZE => $config->{'max_file_size'}}) + } + else + { + my $content = file_read($physical); + $$content =~ s/\015\012|\012|\015/\n/g; + + $tpl->read_file($config->{'templates'}->{'viewfile'}); - $output .= '
'."\n"; - $output .= '
'."\n";
-   $output .= encode_entities(${file_read($physical)});
-   $output .= "\n
\n
"; + $tpl->fillin("FILE",encode_entities($virtual)); + $tpl->fillin("DIR",$upper_path); + $tpl->fillin("URL",encode_entities(equal_url($config->{'httproot'},$virtual))); + $tpl->fillin("SCRIPT",$script); - $output .= htmlfoot; + $tpl->parse_if_block("editable",-w $physical && $uselist->unused($virtual)); + + $tpl->fillin("CONTENT",encode_entities($$content)); + } } } + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + return \$output; } @@ -273,11 +258,12 @@ sub exec_beginedit($$) my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + my $dir = upper_path($virtual); my $uselist = $data->{'uselist'}; - return error("You cannot edit directories.",upper_path($virtual)) if(-d $physical); - return error_in_use($virtual) if($uselist->in_use($virtual)); - return error("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical); + return error($config->{'errors'}->{'editdir'},$dir) if(-d $physical); + return error($config->{'errors'}->{'in_use'}, $dir,{FILE => $virtual}) if($uselist->in_use($virtual)); + return error($config->{'errors'}->{'no_edit'},$dir) unless(-r $physical && -w $physical); # Check on binary files @@ -285,58 +271,57 @@ sub exec_beginedit($$) { # Binary file - return error("This editor is not able to view/edit binary files.",upper_path($virtual)); + return error($config->{'errors'}->{'binary'},$dir); } else { - # Text file - - $uselist->add_file($virtual); - $uselist->save; - - my $dir = upper_path($virtual); - my $content = encode_entities(${file_read($physical)}); + if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'}) + { + return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}}) + } + else + { + # Text file - my $equal_url = equal_url($config->{'httproot'},$virtual); + $uselist->add_file($virtual); + $uselist->save; - $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->{'templates'}->{'editfile'}); -
- - -

-
+ $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",$dir); + $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() @@ -353,10 +338,16 @@ sub exec_endedit($$) my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + my $dir = upper_path($virtual); my $content = $data->{'cgi'}->param('filecontent'); + my $uselist = $data->{'uselist'}; + + # We already unlock the file at the beginning of the subroutine, + # because if we have to abort this routine, the file keeps locked. + # No other user of Dev-Editor will access the file during this + # routine because of the concept of File::UseList. - return error("You cannot edit directories.") if(-d $physical); - return error("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical); + file_unlock($uselist,$virtual); # Normalize newlines @@ -369,23 +360,31 @@ sub exec_endedit($$) $content = encode_entities($content,"\200-\377"); } - if($data->{'cgi'}->param('saveas')) + if($data->{'cgi'}->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '') { # Create the new filename $physical = $data->{'new_physical'}; $virtual = $data->{'new_virtual'}; + + # Check if someone else is editing the new file + + return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($uselist->in_use($virtual)); } + return error($config->{'errors'}->{'editdir'},$dir) if(-d $physical); + return error($config->{'errors'}->{'no_edit'},$dir) if(-e $physical && !(-r $physical && -w $physical)); + return error($config->{'errors'}->{'text_to_binary'},$dir) unless(-T $physical); + if(file_save($physical,\$content)) { - # Saving of the file was successful - so unlock it! + # Saving of the file was successful! - return exec_unlock($data,$config); + return devedit_reload({command => 'show', file => $dir}); } else { - return error("Saving of file '".encode_entities($virtual)."' failed'.",upper_path($virtual)); + return error($config->{'errors'}->{'edit_failed'},$dir,{FILE => $virtual}); } } @@ -406,10 +405,26 @@ sub exec_mkfile($$) my $dir = upper_path($new_virtual); $new_virtual = encode_entities($new_virtual); - return error("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical); + if($new_physical) + { + return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); - file_create($new_physical) or return error("Could not create file '$new_virtual'.",$dir); - return devedit_reload({command => 'show', file => $dir}); + file_create($new_physical) or return error($config->{'errors'}->{'mkfile_failed'},$dir,{FILE => $new_virtual}); + return devedit_reload({command => 'show', file => $dir}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'mkfile'}); + + $tpl->fillin("DIR","/"); + $tpl->fillin("SCRIPT",$script); + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } } # exec_mkdir() @@ -429,163 +444,89 @@ sub exec_mkdir($$) my $dir = upper_path($new_virtual); $new_virtual = encode_entities($new_virtual); - return error("A file or directory called '$new_virtual' already exists.",$dir) if(-e $new_physical); - - mkdir($new_physical,0777) or return error("Could not create directory '$new_virtual'.",$dir); - return devedit_reload({command => 'show', file => $dir}); -} - -# exec_workwithfile() -# -# Display a form for renaming/copying/deleting/unlocking a file -# -# Params: 1. Reference to user input hash -# 2. Reference to config hash -# -# Return: Output of the command (Scalar Reference) - -sub exec_workwithfile($$) -{ - 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); + return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); - $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); - - $output .= "
\n\n"; - - # Copying of the file is always allowed - but we need read access - - if(-r $physical) + if($new_physical) { - $output .= <Copy - -
- - -

Copy file '$virtual' to:
$dir

-
- -
- -END - } - - if($unused) - { - # File is not locked - # Allow renaming and deleting the file - - $output .= <Move/rename - -
- - -

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

-
- -
- -

Delete

- -

Click on the button below to remove the file '$virtual'.

- -
- - -

-
-END + mkdir($new_physical,0777) or return error($config->{'errors'}->{'mkdir_failed'},$dir,{DIR => $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->{'templates'}->{'mkdir'}); - $output .= <Unlock file + $tpl->fillin("DIR","/"); + $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 + return \$output; } - - $output .= "\n
"; - $output .= htmlfoot; - - return \$output; } -# exec_workwithdir() +# exec_upload() # -# Display a form for renaming/deleting a directory +# Upload a file # # Params: 1. Reference to user input hash # 2. Reference to config hash # # Return: Output of the command (Scalar Reference) -sub exec_workwithdir($$) +sub exec_upload($$) { my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + my $cgi = $data->{'cgi'}; - my $dir = encode_entities(upper_path($virtual)); + return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => $virtual}) unless(-d $physical); + return error($config->{'errors'}->{'dir_no_create'},$virtual,{DIR => $virtual}) unless(-w $physical); - my $output = htmlhead("Work with directory ".encode_entities($virtual)); - $output .= equal_url($config->{'httproot'},$virtual); + if(my $uploaded_file = $cgi->param('uploaded_file')) + { + # Process file upload - $virtual = encode_entities($virtual); + my $filename = file_name($uploaded_file); + my $file_phys = $physical."/".$filename; + my $file_virt = $virtual.$filename; - $output .= dir_link($virtual); - $output .= "

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

\n\n"; - $output .= "
\n\n"; + return error($config->{'errors'}->{'in_use'},$virtual,{FILE => $file_virt}) if($data->{'uselist'}->in_use($file_virt)); - $output .= <Move/rename + if(-e $file_phys) + { + return error($config->{'errors'}->{'dir_replace'},$virtual) if(-d $file_phys); + return error($config->{'errors'}->{'exist_no_write'},$virtual,{FILE => $file_virt}) unless(-w $file_phys); + return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) unless($cgi->param('overwrite')); + } -
- - -

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

-
+ my $ascii = $cgi->param('ascii'); + my $handle = $cgi->upload('uploaded_file'); -
+ # Read transferred file and write it to disk -

Delete

+ read($handle, my $data, -s $handle); + $data =~ s/\015\012|\012|\015/\n/g if($ascii); # Replace line separators if transferring in ASCII mode + file_save($file_phys,\$data,not $ascii) or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt}); -

Click on the button below to completely remove the directory '$virtual' and oll of it's files and sub directories.

+ return devedit_reload({command => "show", file => $virtual}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'upload'}); -
- - -

-
-END + $tpl->fillin("DIR",$virtual); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); - $output .= "\n
"; - $output .= htmlfoot; + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; - return \$output; + return \$output; + } } # exec_copy() @@ -602,21 +543,64 @@ sub exec_copy($$) my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = encode_entities($data->{'virtual'}); + my $dir = upper_path($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); - return error("You have not enough permissions to copy this file.") unless(-r $physical); + return error($config->{'errors'}->{'dircopy'},$dir) if(-d $physical); + return error($config->{'errors'}->{'no_copy'},$dir) unless(-r $physical); - if(-e $new_physical) + if($new_physical) { - return error("A file or directory called '$new_virtual' already exists and this editor is currently not able to ask to overwrite the existing file or directory.",upper_path($virtual)); + my $new_virtual = $data->{'new_virtual'}; + my $new_dir = upper_path($new_virtual); + $new_virtual = encode_entities($new_virtual); + + if(-e $new_physical) + { + return error($config->{'errors'}->{'exist_edited'},$new_dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); + return error($config->{'errors'}->{'dir_replace'},$new_dir) if(-d $new_physical); + return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual}) unless(-w $new_physical); + + if(not $data->{'cgi'}->param('confirmed')) + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'confirm_replace'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("NEW_FILE",$new_virtual); + $tpl->fillin("NEW_FILENAME",file_name($new_virtual)); + $tpl->fillin("NEW_DIR",$new_dir); + $tpl->fillin("DIR",$dir); + + $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; + } + } + + copy($physical,$new_physical) or return error($config->{'errors'}->{'copy_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual}); + return devedit_reload({command => 'show', file => $new_dir}); } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'copyfile'}); - copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual)); - return devedit_reload({command => 'show', file => $dir}); + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",$dir); + $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_rename() @@ -633,25 +617,70 @@ sub exec_rename($$) my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + my $dir = upper_path($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)); + return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/"); + return error($config->{'errors'}->{'no_rename'},$dir) unless(-w upper_path($physical)); + return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual)); - if(-e $new_physical) + if($new_physical) { - return error("A file or directory called '$new_virtual' already exists and this editor is currently not able to ask to overwrite the existing file or directory.",upper_path($virtual)); + my $new_virtual = $data->{'new_virtual'}; + my $new_dir = upper_path($new_virtual); + $new_virtual = encode_entities($new_virtual); + + if(-e $new_physical) + { + return error($config->{'errors'}->{'exist_edited'},$new_dir,{FILE => $new_virtual}) if($data->{'uselist'}->in_use($data->{'new_virtual'})); + return error($config->{'errors'}->{'dir_replace'},$new_dir) if(-d $new_physical); + return error($config->{'errors'}->{'exist_no_write'},$new_dir,{FILE => $new_virtual}) unless(-w $new_physical); + + if(not $data->{'cgi'}->param('confirmed')) + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'confirm_replace'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("NEW_FILE",$new_virtual); + $tpl->fillin("NEW_FILENAME",file_name($new_virtual)); + $tpl->fillin("NEW_DIR",$new_dir); + $tpl->fillin("DIR",$dir); + + $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->{'errors'}->{'rename_failed'},$dir,{FILE => $virtual, NEW_FILE => $new_virtual}); + return devedit_reload({command => 'show', file => $new_dir}); } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'renamefile'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",$dir); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); - rename($physical,$new_physical) or return error("Could not move/rename '".encode_entities($virtual)."' to '$new_virtual'.",upper_path($virtual)); - return devedit_reload({command => 'show', file => $dir}); + 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 @@ -663,66 +692,145 @@ sub exec_remove($$) my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + my $dir = upper_path($virtual); - return exec_rmdir($data,$config) if(-d $physical); - return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual)); + return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/"); + return error($config->{'errors'}->{'no_delete'},$dir) unless(-w upper_path($physical)); - unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'.",upper_path($virtual)); - return devedit_reload({command => 'show', file => upper_path($virtual)}); + if(-d $physical) + { + # Remove a directory + + if($data->{'cgi'}->param('confirmed')) + { + rmtree($physical); + return devedit_reload({command => 'show', file => $dir}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'confirm_rmdir'}); + + $tpl->fillin("DIR",$virtual); + $tpl->fillin("UPPER_DIR",$dir); + $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($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual)); + + if($data->{'cgi'}->param('confirmed')) + { + unlink($physical) or return error($config->{'errors'}->{'delete_failed'},$dir,{FILE => $virtual}); + return devedit_reload({command => 'show', file => $dir}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'confirm_rmfile'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",$dir); + $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_rmdir() +# exec_chprop() # -# Remove a directory and return to directory view +# Change the mode and the group of a file or a directory # # Params: 1. Reference to user input hash # 2. Reference to config hash # # Return: Output of the command (Scalar Reference) -sub exec_rmdir($$) +sub exec_chprop($$) { my ($data,$config) = @_; my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; + my $dir = upper_path($virtual); - if($data->{'cgi'}->param('confirmed')) + return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual}) unless($users); + return error($config->{'errors'}->{'chprop_root'},"/") if($virtual eq "/"); + return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual}) unless(-o $physical); + return error($config->{'errors'}->{'in_use'},$dir,{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual)); + + my $cgi = $data->{'cgi'}; + my $mode = $cgi->param('mode'); + my $group = $cgi->param('group'); + + if($mode || $group) { - rmtree($physical); - return devedit_reload({command => 'show', file => upper_path($virtual)}); + if($mode) + { + # Change the mode + + chmod(oct($mode),$physical); + } + + if($group) + { + # Change the group using the `chgrp` system command + + return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => encode_entities($group)}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i); + system("chgrp",$group,$physical); + } + + return devedit_reload({command => 'show', file => $dir}); } else { - my $dir = encode_entities(upper_path($virtual)); - my $output; + # Display the form - $output = htmlhead("Remove directory $virtual"); - $output .= equal_url($config->{'httproot'},$virtual); + my @stat = stat($physical); + my $mode = $stat[2]; + my $gid = $stat[5]; - $virtual = encode_entities($virtual); + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'chprop'}); - $output .= dir_link($virtual); + # Insert file properties into the template - $output .= <<"END"; -

Do you really want to remove the directory '$virtual' and all of it's files and sub directories?

+ $tpl->fillin("MODE_OCTAL",substr(sprintf("%04o",$mode),-4)); + $tpl->fillin("MODE_STRING",mode_string($mode)); + $tpl->fillin("GID",$gid); -
- - - - - -
+ if(my $group = getgrgid($gid)) + { + $tpl->fillin("GROUP",encode_entities($group)); + $tpl->parse_if_block("group_detected",1); + } + else + { + $tpl->parse_if_block("group_detected",0); + } -
- - + # Insert other information - -
-END + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",$dir); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); - $output .= htmlfoot; + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; return \$output; } @@ -743,11 +851,128 @@ sub exec_unlock($$) my ($data,$config) = @_; my $virtual = $data->{'virtual'}; my $uselist = $data->{'uselist'}; + my $dir = upper_path($virtual); - $uselist->remove_file($virtual); - $uselist->save; + return devedit_reload({command => 'show', file => $dir}) if($uselist->unused($virtual)); - return devedit_reload({command => 'show', file => upper_path($virtual)}); + if($data->{'cgi'}->param('confirmed')) + { + file_unlock($uselist,$virtual); + return devedit_reload({command => 'show', file => $dir}); + } + else + { + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'confirm_unlock'}); + + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",$dir); + $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_about() +# +# Display some information about Dev-Editor +# +# Params: 1. Reference to user input hash +# 2. Reference to config hash +# +# Return: Output of the command (Scalar Reference) + +sub exec_about($$) +{ + my ($data,$config) = @_; + + my $tpl = new Template; + $tpl->read_file($config->{'templates'}->{'about'}); + + $tpl->fillin("SCRIPT",$script); + + # Dev-Editor's version number + + $tpl->fillin("VERSION",$data->{'version'}); + + # Some path information + + $tpl->fillin("SCRIPT_PHYS",encode_entities($ENV{'SCRIPT_FILENAME'})); + $tpl->fillin("CONFIG_PATH",encode_entities($data->{'configfile'})); + $tpl->fillin("FILE_ROOT", encode_entities($config->{'fileroot'})); + $tpl->fillin("HTTP_ROOT", encode_entities($config->{'httproot'})); + + # Perl + + $tpl->fillin("PERL_PROG",encode_entities($^X)); + $tpl->fillin("PERL_VER", sprintf("%vd",$^V)); + + # Information about the server + + $tpl->fillin("HTTPD",encode_entities($ENV{'SERVER_SOFTWARE'})); + $tpl->fillin("OS", encode_entities($^O)); + $tpl->fillin("TIME", encode_entities(strftime($config->{'timeformat'},localtime))); + + # Process information + + $tpl->fillin("PID",$$); + + # Check if the functions getpwuid() and getgrgid() are available + + if($users) + { + # Dev-Editor is running on a system which allows users and groups + # So we display the user and the group of our process + + my $uid = POSIX::getuid; + my $gid = POSIX::getgid; + + $tpl->parse_if_block("users",1); + + # ID's of user and group + + $tpl->fillin("UID",$uid); + $tpl->fillin("GID",$gid); + + # Names of user and group + + if(my $user = getpwuid($uid)) + { + $tpl->fillin("USER",encode_entities($user)); + $tpl->parse_if_block("user_detected",1); + } + else + { + $tpl->parse_if_block("user_detected",0); + } + + if(my $group = getgrgid($gid)) + { + $tpl->fillin("GROUP",encode_entities($group)); + $tpl->parse_if_block("group_detected",1); + } + else + { + $tpl->parse_if_block("group_detected",0); + } + + # Process umask + + $tpl->fillin("UMASK",sprintf("%04o",umask)); + } + else + { + $tpl->parse_if_block("users",0); + } + + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; } # it's true, baby ;-)