X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/0d3fcf0e34902845852297696024204919ffc164..48d438eaa383ac5bd0fc396208132ca76f9c0e30:/modules/Command.pm?ds=sidebyside diff --git a/modules/Command.pm b/modules/Command.pm index 1718982..f9de6fc 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,7 +6,7 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 2003-12-18 +# Last modified: 2004-03-01 # use strict; @@ -17,26 +17,27 @@ use File::Access; use File::Copy; use File::Path; -use HTML::Entities; -use Output; use POSIX qw(strftime); use Tool; +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_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 +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, + 'unlock' => \&exec_unlock ); ### Export ### @@ -59,7 +60,7 @@ sub exec_command($$$) { my ($command,$data,$config) = @_; - return error("Unknown command: $command") unless($dispatch{$command}); + return error($config->{'err_cmd_unknown'},'/',{COMMAND => $command}) unless($dispatch{$command}); my $output = &{$dispatch{$command}}($data,$config); return $output; @@ -79,44 +80,35 @@ 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.",upper_path($virtual)) 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);
+   my @stat  = stat($physical."/..");
 
-   $output .= "  [SUBDIR]  ";
-   $output .= strftime("%d.%m.%Y %H:%M",localtime($stat[9]));
-   $output .= " " x 10;
-   $output .= "../\n";
-  }
-
-  # 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
@@ -126,13 +118,14 @@ sub exec_show($$)
    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)."/";
-   $output .= " " x ($max_name_len - length($dir) - 1)."\t  (";
-   $output .= "Work with directory)\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
@@ -145,89 +138,39 @@ sub exec_show($$)
    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 .= " " x 10;
-   $output .= encode_entities($file);
-   $output .= " " x ($max_name_len - length($file))."\t  (";
-
-   # Link "View"
+   my $ftpl = new Template;
+   $ftpl->read_file($config->{'tpl_dirlist_file'});
 
-   if(-r $phys_path && -T $phys_path)
-   {
-    $output .= "View";
-   }
-   else
-   {
-    $output .= 'Edit";
-   }
-   else
-   {
-    $output .= 'fillin("FILE_NAME",$file);
+   $ftpl->fillin("SIZE",$stat[7]);
+   $ftpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
 
-    $output .= (not -r $phys_path) ? "Not readable" :
-               (not -w $phys_path) ? "Read only"    :
-               (-B     $phys_path) ? "Binary file"  :
-               ($in_use)           ? "In use"       : "";
+   $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 .= '">Edit';
-   }
+   $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);
 
-   # Link "Do other stuff"
+   $ftpl->parse_if_block("in_use",$in_use);
+   $ftpl->parse_if_block("unused",not $in_use);
 
-   $output .= " | Work with file)\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("You have not enough permissions to view this file.",upper_path($virtual)) unless(-r $physical); + 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 @@ -237,25 +180,28 @@ END { # Binary file - return error("This editor is not able to view/edit binary files.",upper_path($virtual)); + 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; } @@ -275,9 +221,9 @@ sub exec_beginedit($$) my $virtual = $data->{'virtual'}; my $uselist = $data->{'uselist'}; - return error("You cannot edit directories.",upper_path($virtual)) 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("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical); + return error($config->{'err_noedit'},upper_path($virtual)) unless(-r $physical && -w $physical); # Check on binary files @@ -285,7 +231,7 @@ sub exec_beginedit($$) { # Binary file - return error("This editor is not able to view/edit binary files.",upper_path($virtual)); + return error($config->{'err_binary'},upper_path($virtual)); } else { @@ -294,49 +240,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() @@ -354,9 +292,7 @@ sub exec_endedit($$) my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; my $content = $data->{'cgi'}->param('filecontent'); - - 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); + my $uselist = $data->{'uselist'}; # Normalize newlines @@ -375,17 +311,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'. The file could be damaged, please check it's integrity.",upper_path($virtual)); + return error($config->{'err_edit_failed'},upper_path($virtual),{FILE => $virtual}); } } @@ -406,9 +354,9 @@ 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); + return error($config->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); - file_create($new_physical) or return error("Could not create file '$new_virtual'.",$dir); + file_create($new_physical) or return error($config->{'err_mkfile_failed'},$dir,{FILE => $new_virtual}); return devedit_reload({command => 'show', file => $dir}); } @@ -429,163 +377,72 @@ 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); + return error($config->{'err_file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical); - mkdir($new_physical,0777) or return error("Could not create directory '$new_virtual'.",$dir); + 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_upload() # -# Display a form for renaming/copying/removing/unlocking a file +# Upload a file # # Params: 1. Reference to user input hash # 2. Reference to config hash # # Return: Output of the command (Scalar Reference) -sub exec_workwithfile($$) +sub exec_upload($$) { 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); - - $output .= "
\n\n"; - - # Copying of the file is always allowed - but we need read access + my $cgi = $data->{'cgi'}; - if(-r $physical) + if(my $uploaded_file = $cgi->param('uploaded_file')) { - $output .= <Copy + # Process file upload -
- - -

Copy file '$virtual' to:
$dir

-
+ my $filename = file_name($uploaded_file); + my $file_phys = $physical."/".$filename; + my $file_virt = $virtual."".$filename; -
+ return error($config->{'err_file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys); -END - } - - if($unused) - { - # File is not locked - # Allow renaming and deleting the file + my $ascii = $cgi->param('ascii'); + my $handle = $cgi->upload('uploaded_file'); - $output .= <Move/rename + local *FILE; -
- - -

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

-
+ open(FILE,">$file_phys") or return error($config->{'err_mkfile_failed'},$virtual,{FILE => $file_virt}); + binmode(FILE) unless($ascii); -
+ my $data; -

Remove

+ while(read($handle,$data,1024)) + { + $data =~ s/\015\012|\012|\015/\n/g if($ascii); + print FILE $data; + } -

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

+ close(FILE); -
- - -

-
-END + return devedit_reload({command => "show", file => $virtual}); } else { - # File is locked - # Just display a button for unlocking it + my $tpl = new Template; + $tpl->read_file($config->{'tpl_upload'}); - $output .= <Unlock file + $tpl->fillin("DIR",$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 + return \$output; } - - $output .= "\n
"; - $output .= htmlfoot; - - return \$output; -} - -# exec_workwithdir() -# -# Display a form for renaming/removing a directory -# -# Params: 1. Reference to user input hash -# 2. Reference to config hash -# -# Return: Output of the command (Scalar Reference) - -sub exec_workwithdir($$) -{ - my ($data,$config) = @_; - my $physical = $data->{'physical'}; - my $virtual = $data->{'virtual'}; - - my $dir = encode_entities(upper_path($virtual)); - - my $output = htmlhead("Work with directory ".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 .= "
\n\n"; - - $output .= <Move/rename - -
- - -

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

-
- -
- -

Remove

- -

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

- -
- - -

-
-END - - $output .= "\n
"; - $output .= htmlfoot; - - return \$output; } # exec_copy() @@ -603,57 +460,62 @@ sub exec_copy($$) 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); - return error("You have not enough permissions to copy this file.") unless(-r $physical); + return error($config->{'err_nocopy'}) unless(-r $physical); - if(-e $new_physical) + if($new_physical) { - if(-d $new_physical) - { - return error("A directory called '$new_virtual' already exists. You cannot replace a directory by a file!",$dir); - } - elsif(not $data->{'cgi'}->param('confirmed')) - { - $dir = encode_entities($dir); - - my $output = htmlhead("Replace existing file"); - $output .= <<"END"; -

A file called '$new_virtual' already exists. Do you want to replace it?

- -
- - - - + 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","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 + { + my $tpl = new Template; + $tpl->read_file($config->{'tpl_copyfile'}); - $output .= htmlfoot; + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); - return \$output; - } - } + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; - if($data->{'uselist'}->in_use($data->{'new_virtual'})) - { - return error("The target file '$new_virtual' already exists and it is edited by someone else.",$dir); + return \$output; } - - copy($physical,$new_physical) or return error("Could not copy '$virtual' to '$new_virtual'",upper_path($virtual)); - return devedit_reload({command => 'show', file => $dir}); } # exec_rename() @@ -671,24 +533,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' 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 $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'.",upper_path($virtual)); - return devedit_reload({command => 'show', file => $dir}); + $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_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 @@ -701,69 +606,57 @@ sub exec_remove($$) my $physical = $data->{'physical'}; my $virtual = $data->{'virtual'}; - return exec_rmdir($data,$config) if(-d $physical); - return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual)); - - 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 -# exec_rmdir() -# -# Remove a directory and return to directory view -# -# Params: 1. Reference to user input hash -# 2. Reference to config hash -# -# Return: Output of the command (Scalar Reference) + 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'}); -sub exec_rmdir($$) -{ - my ($data,$config) = @_; - my $physical = $data->{'physical'}; - my $virtual = $data->{'virtual'}; + $tpl->fillin("DIR",$virtual); + $tpl->fillin("UPPER_DIR",upper_path($virtual)); + $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); + $tpl->fillin("SCRIPT",$script); - return exec_remove($data,$config) if(not -d $physical); + my $output = header(-type => "text/html"); + $output .= $tpl->get_template; - if($data->{'cgi'}->param('confirmed')) - { - rmtree($physical); - return devedit_reload({command => 'show', file => upper_path($virtual)}); + return \$output; + } } else { - my $dir = encode_entities(upper_path($virtual)); - my $output; - - $output = htmlhead("Remove directory $virtual"); - $output .= equal_url($config->{'httproot'},$virtual); + # Remove a file - $virtual = encode_entities($virtual); + return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual)); - $output .= dir_link($virtual); - - $output .= <<"END"; -

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

- -
- - - - -

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

-
-END + $tpl->fillin("FILE",$virtual); + $tpl->fillin("DIR",upper_path($virtual)); + $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; + return \$output; + } } } @@ -781,12 +674,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'}); - return devedit_reload({command => 'show', file => upper_path($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 = header(-type => "text/html"); + $output .= $tpl->get_template; + + return \$output; + } } # it's true, baby ;-)