Included 3.1 release date

[devedit.git] / modules / Command.pm

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

-# Last modified: 2009-05-09
+# Last modified: 2005-05-11

 #
 # 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,14 +807,12 @@ 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->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;
+   $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);

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


@@ -836,14 +834,12 @@ 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->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;
+   $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);

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


@@ -869,7 +865,7 @@ sub exec_remove_multi($$)
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
 
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
 

- my @files = $cgi->param('files');
+ my @files = $cgi->param('files');#

  my @new_files;
 
  if(@files)
  my @new_files;
 
  if(@files)


@@ -952,6 +948,8 @@ sub exec_remove_multi($$)
       $tpl->add_loop_data('SUCCESS',{FILE => encode_html($file_success),
                                      FILE_PATH => encode_html(clean_path($virtual.'/'.$file_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
     }
    }
    else


@@ -968,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->add_loop_data('FAILED',{FILE => encode_html($file_failed),
                                    FILE_PATH => encode_html(clean_path($virtual.'/'.$file_failed))});
     }

+
+    $tpl->parse_loop('FAILED');

    }
    else
    {
    }
    else
    {


@@ -975,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;
 
    my $output = header(-type => 'text/html');
    $output   .= $tpl->get_template;


@@ -996,12 +994,12 @@ sub exec_remove_multi($$)
                                  FILE_PATH => encode_html(clean_path($virtual.'/'.$file))});
    }
 
                                  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;
 
    my $output = header(-type => 'text/html');
    $output   .= $tpl->get_template;


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

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

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

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

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


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

-  $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;
+  $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);

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


@@ -1121,35 +1117,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->set_var('SCRIPT',$script);
+ $tpl->fillin('SCRIPT',$script);

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

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

 
  # Some path information
 
 
  # Some path information
 

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

 
  # Perl
 
 
  # Perl
 

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

 
  # Information about the server
 
 
  # Information about the server
 

- $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->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->parse_if_block('gmt',$config->{'use_gmt'});
 
  # Process information
 
 
  $tpl->parse_if_block('gmt',$config->{'use_gmt'});
 
  # Process information
 

- $tpl->set_var('PID',$$);
+ $tpl->fillin('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


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

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

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

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

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


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

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

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


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

-  $tpl->set_var('UMASK',sprintf('%04o',umask));
+  $tpl->fillin('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;