In some parts of file "Command.pm", make use of new methods defined by the

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 506e0c0d13dced6c4317fa3c309aeeac21bd8312..8acd1d7ccebc86b0e41a738b9a3678c29db9ec28 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


@@ -807,12 +807,14 @@ sub exec_remove($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
 
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmdir'});
 

-   $tpl->fillin('DIR',encode_html($virtual));
-   $tpl->fillin('DIR_URL',escape($virtual));
-   $tpl->fillin('UPPER_DIR',encode_html($dir));
-   $tpl->fillin('UPPER_DIR_URL',escape($dir));
-   $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
-   $tpl->fillin('SCRIPT',$script);
+   $tpl->set_var('DIR',encode_html($virtual));
+   $tpl->set_var('DIR_URL',escape($virtual));
+   $tpl->set_var('UPPER_DIR',encode_html($dir));
+   $tpl->set_var('UPPER_DIR_URL',escape($dir));
+   $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+   $tpl->set_var('SCRIPT',$script);
+
+   $tpl->parse;

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


@@ -834,12 +836,14 @@ sub exec_remove($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
 
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'confirm_rmfile'});
 

-   $tpl->fillin('FILE',encode_html($virtual));
-   $tpl->fillin('FILE_URL',escape($virtual));
-   $tpl->fillin('DIR',encode_html($dir));
-   $tpl->fillin('DIR_URL',escape($dir));
-   $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
-   $tpl->fillin('SCRIPT',$script);
+   $tpl->set_var('FILE',encode_html($virtual));
+   $tpl->set_var('FILE_URL',escape($virtual));
+   $tpl->set_var('DIR',encode_html($dir));
+   $tpl->set_var('DIR_URL',escape($dir));
+   $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+   $tpl->set_var('SCRIPT',$script);
+
+   $tpl->parse;

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


@@ -864,10 +868,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 @files = $cgi->param('files');

- my $x = 0; 
- 
+ my @new_files;
+

  if(@files)
  {
   foreach my $file(@files)
  if(@files)
  {
   foreach my $file(@files)


@@ -875,34 +879,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 +917,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,25 +933,32 @@ 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)
+    {
+     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))});
+     }

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


@@ -964,11 +973,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 +990,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');


@@ -1064,13 +1073,13 @@ sub exec_chprop($$)
 
   # Insert file properties into the template
 
 
   # Insert file properties into the template
 

-  $tpl->fillin('MODE_OCTAL',substr(sprintf('%04o',$mode),-4));
-  $tpl->fillin('MODE_STRING',mode_string($mode));
-  $tpl->fillin('GID',$gid);
+  $tpl->set_var('MODE_OCTAL',substr(sprintf('%04o',$mode),-4));
+  $tpl->set_var('MODE_STRING',mode_string($mode));
+  $tpl->set_var('GID',$gid);

 
   if(my $group = getgrgid($gid))
   {
 
   if(my $group = getgrgid($gid))
   {

-   $tpl->fillin('GROUP',encode_html($group));
+   $tpl->set_var('GROUP',encode_html($group));

    $tpl->parse_if_block('group_detected',1);
   }
   else
    $tpl->parse_if_block('group_detected',1);
   }
   else


@@ -1080,12 +1089,14 @@ sub exec_chprop($$)
 
   # Insert other information
 
 
   # Insert other information
 

-  $tpl->fillin('FILE',encode_html($virtual));
-  $tpl->fillin('FILE_URL',escape($virtual));
-  $tpl->fillin('DIR',encode_html($dir));
-  $tpl->fillin('DIR_URL',escape($dir));
-  $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
-  $tpl->fillin('SCRIPT',$script);
+  $tpl->set_var('FILE',encode_html($virtual));
+  $tpl->set_var('FILE_URL',escape($virtual));
+  $tpl->set_var('DIR',encode_html($dir));
+  $tpl->set_var('DIR_URL',escape($dir));
+  $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+  $tpl->set_var('SCRIPT',$script);
+
+  $tpl->parse;

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


@@ -1110,35 +1121,35 @@ sub exec_about($$)
  my $tpl = new Template;
  $tpl->read_file($config->{'templates'}->{'about'});
 
  my $tpl = new Template;
  $tpl->read_file($config->{'templates'}->{'about'});
 

- $tpl->fillin('SCRIPT',$script);
+ $tpl->set_var('SCRIPT',$script);

 
  # Dev-Editor's version number
 
 
  # Dev-Editor's version number
 

- $tpl->fillin('VERSION',$data->{'version'});
+ $tpl->set_var('VERSION',$data->{'version'});

 
  # Some path information
 
 
  # Some path information
 

- $tpl->fillin('SCRIPT_PHYS',encode_html($ENV{'SCRIPT_FILENAME'}));
- $tpl->fillin('CONFIG_PATH',encode_html($data->{'configfile'}));
- $tpl->fillin('FILE_ROOT',  encode_html($config->{'fileroot'}));
- $tpl->fillin('HTTP_ROOT',  encode_html($config->{'httproot'}));
+ $tpl->set_var('SCRIPT_PHYS',encode_html($ENV{'SCRIPT_FILENAME'}));
+ $tpl->set_var('CONFIG_PATH',encode_html($data->{'configfile'}));
+ $tpl->set_var('FILE_ROOT',  encode_html($config->{'fileroot'}));
+ $tpl->set_var('HTTP_ROOT',  encode_html($config->{'httproot'}));

 
  # Perl
 
 
  # Perl
 

- $tpl->fillin('PERL_PROG',encode_html($^X));
- $tpl->fillin('PERL_VER', sprintf('%vd',$^V));
+ $tpl->set_var('PERL_PROG',encode_html($^X));
+ $tpl->set_var('PERL_VER', sprintf('%vd',$^V));

 
  # Information about the server
 
 
  # Information about the server
 

- $tpl->fillin('HTTPD',encode_html($ENV{'SERVER_SOFTWARE'}));
- $tpl->fillin('OS',   encode_html($^O));
- $tpl->fillin('TIME', encode_html(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime : localtime)));
+ $tpl->set_var('HTTPD',encode_html($ENV{'SERVER_SOFTWARE'}));
+ $tpl->set_var('OS',   encode_html($^O));
+ $tpl->set_var('TIME', encode_html(strftime($config->{'timeformat'},($config->{'use_gmt'}) ? gmtime : localtime)));

 
  $tpl->parse_if_block('gmt',$config->{'use_gmt'});
 
  # Process information
 
 
  $tpl->parse_if_block('gmt',$config->{'use_gmt'});
 
  # Process information
 

- $tpl->fillin('PID',$$);
+ $tpl->set_var('PID',$$);

 
  # The following information is only available on systems supporting
  # users and groups
 
  # The following information is only available on systems supporting
  # users and groups


@@ -1155,14 +1166,14 @@ sub exec_about($$)
 
   # IDs of user and group
 
 
   # IDs of user and group
 

-  $tpl->fillin('UID',$uid);
-  $tpl->fillin('GID',$gid);
+  $tpl->set_var('UID',$uid);
+  $tpl->set_var('GID',$gid);

 
   # Names of user and group
 
   if(my $user = getpwuid($uid))
   {
 
   # Names of user and group
 
   if(my $user = getpwuid($uid))
   {

-   $tpl->fillin('USER',encode_html($user));
+   $tpl->set_var('USER',encode_html($user));

    $tpl->parse_if_block('user_detected',1);
   }
   else
    $tpl->parse_if_block('user_detected',1);
   }
   else


@@ -1172,7 +1183,7 @@ sub exec_about($$)
 
   if(my $group = getgrgid($gid))
   {
 
   if(my $group = getgrgid($gid))
   {

-   $tpl->fillin('GROUP',encode_html($group));
+   $tpl->set_var('GROUP',encode_html($group));

    $tpl->parse_if_block('group_detected',1);
   }
   else
    $tpl->parse_if_block('group_detected',1);
   }
   else


@@ -1182,13 +1193,15 @@ sub exec_about($$)
 
   # Process umask
 
 
   # Process umask
 

-  $tpl->fillin('UMASK',sprintf('%04o',umask));
+  $tpl->set_var('UMASK',sprintf('%04o',umask));

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

+ $tpl->parse;
+

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