Updated change log

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 506e0c0d13dced6c4317fa3c309aeeac21bd8312..f14a038ac1f76578b43f8bae3a1c99ebab04b488 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>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>

-# Last modified: 2009-05-04
+# Last modified: 2009-05-09

 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino


@@ -864,10 +864,10 @@ sub exec_remove_multi($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
  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)
  if(@files)
  {
   foreach my $file(@files)


@@ -875,34 +875,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...)
    # 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'))
   {
  {
   if($cgi->param('confirmed'))
   {

-   #die 'Noch nicht!';
-   

    my @success;
    my @failed;
    my @success;
    my @failed;

-   
-   foreach my $file(@files)
+
+   foreach my $file(@new_files)

    {
     my $file_path = clean_path($physical.'/'.$file);
    {
     my $file_path = clean_path($physical.'/'.$file);

-    
+

     if(-e $file_path)
     {
      if(-d $file_path && not -l $file_path)
      {
       # Remove a directory
     if(-e $file_path)
     {
      if(-d $file_path && not -l $file_path)
      {
       # Remove a directory

-      
+

       if(rmtree($file_path))
       {
        push(@success,clean_path($file));
       if(rmtree($file_path))
       {
        push(@success,clean_path($file));


@@ -915,7 +913,7 @@ sub exec_remove_multi($$)
      else
      {
       # Remove a file
      else
      {
       # Remove a file

-      
+

       if(unlink($file_path))
       {
        push(@success,clean_path($file));
       if(unlink($file_path))
       {
        push(@success,clean_path($file));


@@ -931,29 +929,36 @@ sub exec_remove_multi($$)
      push(@failed,clean_path($file));
     }
    }
      push(@failed,clean_path($file));
     }
    }

-   
+

    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'rmmulti'});
 
    if(scalar(@success) > 0)
    {
    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))});
+     }

     }
    }
    else
    {
     $tpl->parse_if_block('success',0);
    }
     }
    }
    else
    {
     $tpl->parse_if_block('success',0);
    }

-   
+

    if(scalar(@failed) > 0)
    {
     $tpl->parse_if_block('failed',1);
    if(scalar(@failed) > 0)
    {
     $tpl->parse_if_block('failed',1);

-
+ 

     foreach my $file_failed(@failed)
     {
      $tpl->add_loop_data('FAILED',{FILE => encode_html($file_failed),
     foreach my $file_failed(@failed)
     {
      $tpl->add_loop_data('FAILED',{FILE => encode_html($file_failed),


@@ -964,11 +969,11 @@ sub exec_remove_multi($$)
    {
     $tpl->parse_if_block('failed',0);
    }
    {
     $tpl->parse_if_block('failed',0);
    }

-   
-   
+
+

    $tpl->set_var('DIR',encode_html($virtual));
    $tpl->set_var('SCRIPT',$script);
    $tpl->set_var('DIR',encode_html($virtual));
    $tpl->set_var('SCRIPT',$script);

-   
+

    $tpl->parse;
 
    my $output = header(-type => 'text/html');
    $tpl->parse;
 
    my $output = header(-type => 'text/html');


@@ -981,17 +986,17 @@ sub exec_remove_multi($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmmulti'});
 
    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->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('COUNT',scalar(@new_files));
+

    $tpl->set_var('DIR',encode_html($virtual));
    $tpl->set_var('SCRIPT',$script);
    $tpl->set_var('DIR',encode_html($virtual));
    $tpl->set_var('SCRIPT',$script);

-   
+

    $tpl->parse;
 
    my $output = header(-type => 'text/html');
    $tpl->parse;
 
    my $output = header(-type => 'text/html');