Changed version number to 3.1

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index c4e7f120d94d60827d3e6c7583b2875c8e206aca..cc996ca233c27a5fcf04999034b2aa7c5292ce6c 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: 2005-05-11
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
 # Copyright (C) 2003-2009 Patrick Canterino
@@ -935,12 +935,21 @@ sub exec_remove_multi($$)
 
    if(scalar(@success) > 0)
    {
-    $tpl->parse_if_block('success',1);
-
-    foreach my $file_success(@success)
+    if(scalar(@success) == scalar(@new_files) && scalar(@failed) == 0)
+    {
+     return devedit_reload({command => 'show', file => $virtual});
+    }
+    else
     {
-     $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success),
-                                    FILE_PATH => encode_html(clean_path($virtual.'/'.$file_success))});
+     $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
@@ -957,6 +966,8 @@ 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
    {
@@ -964,10 +975,8 @@ sub exec_remove_multi($$)
    }
 
 
-   $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;
@@ -985,12 +994,12 @@ sub exec_remove_multi($$)
                                  FILE_PATH => encode_html(clean_path($virtual.'/'.$file))});
    }
 
-   $tpl->set_var('COUNT',scalar(@new_files));
+   $tpl->parse_loop('FILES');
 
-   $tpl->set_var('DIR',encode_html($virtual));
-   $tpl->set_var('SCRIPT',$script);
+   $tpl->fillin('COUNT',scalar(@new_files));
 
-   $tpl->parse;
+   $tpl->fillin('DIR',encode_html($virtual));
+   $tpl->fillin('SCRIPT',$script);
 
    my $output = header(-type => 'text/html');
    $output   .= $tpl->get_template;