X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/59507c0a5e5507868ebf6db407219da3f17c8ed9..1fa7943caa4368a8031e1d7bf470b385ff7cad50:/modules/Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 34a2541..431eb4d 100644
--- 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-10
+# 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,17 +493,23 @@ 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
  {
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'mkfile'});
 
-  $tpl->set_var('DIR','/');
-  $tpl->set_var('SCRIPT',$script);
-
-  $tpl->parse;
+  $tpl->fillin('DIR','/');
+  $tpl->fillin('SCRIPT',$script);
 
   my $output = header(-type => 'text/html');
   $output   .= $tpl->get_template;
@@ -514,10 +547,8 @@ sub exec_mkdir($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'mkdir'});
 
-  $tpl->set_var('DIR','/');
-  $tpl->set_var('SCRIPT',$script);
-
-  $tpl->parse;
+  $tpl->fillin('DIR','/');
+  $tpl->fillin('SCRIPT',$script);
 
   my $output = header(-type => 'text/html');
   $output   .= $tpl->get_template;
@@ -587,12 +618,10 @@ sub exec_upload($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'upload'});
 
-  $tpl->set_var('DIR',encode_html($virtual));
-  $tpl->set_var('DIR_URL',escape($virtual));
-  $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('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+  $tpl->fillin('SCRIPT',$script);
 
   my $output = header(-type => 'text/html');
   $output   .= $tpl->get_template;
@@ -648,18 +677,16 @@ sub exec_copy($$)
      my $tpl = new Template;
      $tpl->read_file($config->{'templates'}->{'confirm_replace'});
 
-     $tpl->set_var('FILE',encode_html($virtual));
-     $tpl->set_var('NEW_FILE',$new_virtual->{'html'});
-     $tpl->set_var('NEW_FILENAME',file_name($new_virtual->{'html'}));
-     $tpl->set_var('NEW_DIR',encode_html($new_dir));
-     $tpl->set_var('DIR',encode_html($dir));
-     $tpl->set_var('DIR_URL',escape($dir));
-
-     $tpl->set_var('COMMAND','copy');
-     $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
-     $tpl->set_var('SCRIPT',$script);
+     $tpl->fillin('FILE',encode_html($virtual));
+     $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
+     $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
+     $tpl->fillin('NEW_DIR',encode_html($new_dir));
+     $tpl->fillin('DIR',encode_html($dir));
+     $tpl->fillin('DIR_URL',escape($dir));
 
-     $tpl->parse;
+     $tpl->fillin('COMMAND','copy');
+     $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+     $tpl->fillin('SCRIPT',$script);
 
      my $output = header(-type => 'text/html');
      $output   .= $tpl->get_template;
@@ -679,13 +706,11 @@ sub exec_copy($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'copydir'});
 
-   $tpl->set_var('FILE',encode_html($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('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;
@@ -697,13 +722,11 @@ sub exec_copy($$)
    my $tpl = new Template;
    $tpl->read_file($config->{'templates'}->{'copyfile'});
 
-   $tpl->set_var('FILE',encode_html($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('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;
@@ -748,17 +771,15 @@ sub exec_rename($$)
     my $tpl = new Template;
     $tpl->read_file($config->{'templates'}->{'confirm_replace'});
 
-    $tpl->set_var('FILE',encode_html($virtual));
-    $tpl->set_var('NEW_FILE',$new_virtual->{'html'});
-    $tpl->set_var('NEW_FILENAME',file_name($new_virtual->{'html'}));
-    $tpl->set_var('NEW_DIR',encode_html($new_dir));
-    $tpl->set_var('DIR',encode_html($dir));
+    $tpl->fillin('FILE',encode_html($virtual));
+    $tpl->fillin('NEW_FILE',$new_virtual->{'html'});
+    $tpl->fillin('NEW_FILENAME',file_name($new_virtual->{'html'}));
+    $tpl->fillin('NEW_DIR',encode_html($new_dir));
+    $tpl->fillin('DIR',encode_html($dir));
 
-    $tpl->set_var('COMMAND','rename');
-    $tpl->set_var('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
-    $tpl->set_var('SCRIPT',$script);
-
-    $tpl->parse;
+    $tpl->fillin('COMMAND','rename');
+    $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
+    $tpl->fillin('SCRIPT',$script);
 
     my $output = header(-type => 'text/html');
     $output   .= $tpl->get_template;
@@ -775,13 +796,11 @@ sub exec_rename($$)
   my $tpl = new Template;
   $tpl->read_file($config->{'templates'}->{'renamefile'});
 
-  $tpl->set_var('FILE',encode_html($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('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;
@@ -823,14 +842,12 @@ sub exec_remove($$)
    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;
@@ -852,14 +869,12 @@ sub exec_remove($$)
    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;
@@ -885,7 +900,7 @@ sub exec_remove_multi($$)
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
 
- my @files = $cgi->param('files');
+ my @files = $cgi->param('files');#
  my @new_files;
 
  if(@files)
@@ -968,6 +983,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->parse_loop('SUCCESS');
     }
    }
    else
@@ -984,6 +1001,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
    {
@@ -991,10 +1010,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;
@@ -1012,12 +1029,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;
@@ -1089,13 +1106,13 @@ sub exec_chprop($$)
 
   # 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))
   {
-   $tpl->set_var('GROUP',encode_html($group));
+   $tpl->fillin('GROUP',encode_html($group));
    $tpl->parse_if_block('group_detected',1);
   }
   else
@@ -1105,14 +1122,12 @@ sub exec_chprop($$)
 
   # 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;
@@ -1137,35 +1152,35 @@ sub exec_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
 
- $tpl->set_var('VERSION',$data->{'version'});
+ $tpl->fillin('VERSION',$data->{'version'});
 
  # 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
 
- $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
 
- $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->set_var('PID',$$);
+ $tpl->fillin('PID',$$);
 
  # The following information is only available on systems supporting
  # users and groups
@@ -1182,14 +1197,14 @@ sub exec_about($$)
 
   # 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))
   {
-   $tpl->set_var('USER',encode_html($user));
+   $tpl->fillin('USER',encode_html($user));
    $tpl->parse_if_block('user_detected',1);
   }
   else
@@ -1199,7 +1214,7 @@ sub exec_about($$)
 
   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
@@ -1209,15 +1224,13 @@ sub exec_about($$)
 
   # Process umask
 
-  $tpl->set_var('UMASK',sprintf('%04o',umask));
+  $tpl->fillin('UMASK',sprintf('%04o',umask));
  }
  else
  {
   $tpl->parse_if_block('users',0);
  }
 
- $tpl->parse;
-
  my $output = header(-type => 'text/html');
  $output   .= $tpl->get_template;