- Tool.pm: Be consistent (lc instead of uc)

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 506e0c0d13dced6c4317fa3c309aeeac21bd8312..431eb4dea6bc8ba22964cb6dc2762be0e99250c1 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2009-05-04
+# Last modified: 2010-05-24
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino
@@ -42,6 +42,7 @@ my $users  = eval('getpwuid(0)') && eval('getgrgid(0)');
 my %dispatch = ('show'         => \&exec_show,
                 'beginedit'    => \&exec_beginedit,
                 'endedit'      => \&exec_endedit,
+                'download'     => \&exec_download,
                 'mkdir'        => \&exec_mkdir,
                 'mkfile'       => \&exec_mkfile,
                 'upload'       => \&exec_upload,
@@ -444,6 +445,32 @@ sub exec_endedit($$)
  return devedit_reload({command => 'beginedit', file => $virtual});
 }
 
+# exec_download()
+#
+# Execute a HTTP download of a file
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_download($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $dir            = upper_path($virtual);
+
+ return return error($config->{'errors'}->{'no_download'},$dir,{FILE => $virtual}) if(-d $physical || -l $physical);
+
+ my $filename = file_name($virtual);
+
+ my $output = header(-type => 'application/octet-stream', -attachment => $filename);
+ $output   .= ${ file_read($physical,1) };
+
+ return \$output;
+}
+
 # exec_mkfile()
 #
 # Create a file and return to directory view
@@ -466,7 +493,15 @@ sub exec_mkfile($$)
   return error($config->{'errors'}->{'file_exists'},$dir,{FILE => $new_virtual}) if(-e $new_physical);
 
   file_create($new_physical) or return error($config->{'errors'}->{'mkfile_failed'},$dir,{FILE => $new_virtual});
-  return devedit_reload({command => 'show', file => $dir});
+  
+  if($data->{'cgi'}->param('edit'))
+  {
+   return devedit_reload({command => 'beginedit', file => $new_virtual});
+  }
+  else
+  {
+   return devedit_reload({command => 'show', file => $dir});
+  }
  }
  else
  {
@@ -864,10 +899,10 @@ sub exec_remove_multi($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
- 
- my @files = $cgi->param('files');
- my $x = 0; 
- 
+
+ my @files = $cgi->param('files');#
+ my @new_files;
+
  if(@files)
  {
   foreach my $file(@files)
@@ -875,34 +910,32 @@ sub exec_remove_multi($$)
    # Filter out some "bad" files (e.g. files going up in the
    # directory hierarchy or files containing slashes (it's too
    # dangerous...)
-  
-   splice(@files,$x,1) if($file =~ m!^\.+$!);
-   splice(@files,$x,1) if($file =~ m!/!);
-   splice(@files,$x,1) if($file =~ m!\\!);
-   
-   $x++;
+
+   next if($file =~ m!^\.+$!);
+   next if($file =~ m!/!);
+   next if($file =~ m!\\!);
+
+   push(@new_files,$file);
   }
  }
- 
- if(@files)
+
+ if(@new_files)
  {
   if($cgi->param('confirmed'))
   {
-   #die 'Noch nicht!';
-   
    my @success;
    my @failed;
-   
-   foreach my $file(@files)
+
+   foreach my $file(@new_files)
    {
     my $file_path = clean_path($physical.'/'.$file);
-    
+
     if(-e $file_path)
     {
      if(-d $file_path && not -l $file_path)
      {
       # Remove a directory
-      
+
       if(rmtree($file_path))
       {
        push(@success,clean_path($file));
@@ -915,7 +948,7 @@ sub exec_remove_multi($$)
      else
      {
       # Remove a file
-      
+
       if(unlink($file_path))
       {
        push(@success,clean_path($file));
@@ -931,25 +964,34 @@ sub exec_remove_multi($$)
      push(@failed,clean_path($file));
     }
    }
-   
+
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'rmmulti'});
 
    if(scalar(@success) > 0)
    {
-    $tpl->parse_if_block('success',1);
-   
-    foreach my $file_success(@success)
+    if(scalar(@success) == scalar(@new_files) && scalar(@failed) == 0)
     {
-     $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success),
-                                    FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))});
+     return devedit_reload({command => 'show', file => $virtual});
+    }
+    else
+    {
+     $tpl->parse_if_block('success',1);
+
+     foreach my $file_success(@success)
+     {
+      $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success),
+                                     FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))});
+     }
+
+     $tpl->parse_loop('SUCCESS');
     }
    }
    else
    {
     $tpl->parse_if_block('success',0);
    }
-   
+
    if(scalar(@failed) > 0)
    {
     $tpl->parse_if_block('failed',1);
@@ -959,17 +1001,17 @@ sub exec_remove_multi($$)
      $tpl->add_loop_data('FAILED',{FILE => encode_html($file_failed),
                                    FILE_PATH => encode_html(clean_path($virtual.'/'.$file_failed))});
     }
+
+    $tpl->parse_loop('FAILED');
    }
    else
    {
     $tpl->parse_if_block('failed',0);
    }
-   
-   
-   $tpl->set_var('DIR',encode_html($virtual));
-   $tpl->set_var('SCRIPT',$script);
-   
-   $tpl->parse;
+
+
+   $tpl->fillin('DIR',encode_html($virtual));
+   $tpl->fillin('SCRIPT',$script);
 
    my $output = header(-type => 'text/html');
    $output   .= $tpl->get_template;
@@ -981,18 +1023,18 @@ sub exec_remove_multi($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmmulti'});
 
-   foreach my $file(@files)
+   foreach my $file(@new_files)
    {
     $tpl->add_loop_data('FILES',{FILE => encode_html($file),
                                  FILE_PATH => encode_html(clean_path($virtual.'/'.$file))});
    }
-   
-   $tpl->set_var('COUNT',encode_html($x));
-   
-   $tpl->set_var('DIR',encode_html($virtual));
-   $tpl->set_var('SCRIPT',$script);
-   
-   $tpl->parse;
+
+   $tpl->parse_loop('FILES');
+
+   $tpl->fillin('COUNT',scalar(@new_files));
+
+   $tpl->fillin('DIR',encode_html($virtual));
+   $tpl->fillin('SCRIPT',$script);
 
    my $output = header(-type => 'text/html');
    $output   .= $tpl->get_template;