X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/8ad672c3c8828a367013ff2f84b89a82cb7533b5..192be0abe5fb17e24b17342407893bb2c7607d78:/modules/Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 0880c8c..12f876c 100644
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,14 +6,14 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patrick@patshaping.de>
-# Last modified: 2010-10-26
+# Last modified: 2011-02-11
 #
 # Copyright (C) 1999-2000 Roland Bluethgen, Frank Schoenmann
-# Copyright (C) 2003-2009 Patrick Canterino
+# Copyright (C) 2003-2011 Patrick Canterino
 # All Rights Reserved.
 #
 # This file can be distributed and/or modified under the terms of
-# of the Artistic License 1.0 (see also the LICENSE file found at
+# of the Artistic License 2.0 (see also the LICENSE file found at
 # the top level of the Dev-Editor distribution).
 #
 
@@ -614,6 +614,15 @@ sub exec_upload($$)
   $data =~ s/\015\012|\012|\015/\n/g if($ascii); # Replace line separators if transferring in ASCII mode
   file_save($file_phys,\$data,not $ascii) or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
 
+  if($cgi->param('unpack') && $File::Access::has_archive_extract)
+  {
+   return error($config->{'errors'}->{'no_archive'},$virtual,{FILE => encode_html($file_virt)}) unless(is_archive($file_phys));
+
+   my $return_unpack = archive_unpack($file_phys,$physical);
+
+   return error($config->{'errors'}->{'unpack_failed'},$virtual,{FILE => encode_html($file_virt), AE_ERROR => ''}) unless($return_unpack);
+  }
+
   return devedit_reload({command => 'show', file => $virtual});
  }
  else
@@ -626,6 +635,8 @@ sub exec_upload($$)
   $tpl->fillin('URL',encode_html(equal_url($config->{'httproot'},$virtual)));
   $tpl->fillin('SCRIPT',$script);
 
+  $tpl->parse_if_block('PERL_ARCHIVE_EXTRACT',$File::Access::has_archive_extract);
+
   my $output = header(-type => 'text/html');
   $output   .= $tpl->get_template;
 
@@ -652,9 +663,17 @@ sub exec_unpack($$)
  my $new_virtual    = $data->{'new_virtual'};
  my $cgi            = $data->{'cgi'};
 
+ return error($config->{'errors'}->{'no_ae'},$dir) unless($File::Access::has_archive_extract);
+ return error($config->{'errors'}->{'no_archive'},$dir,{FILE => encode_html($virtual)}) unless(is_archive($physical));
+
  if($new_physical)
  {
-  archive_unpack($physical,$new_physical);
+  return error($config->{'errors'}->{'unpack_no_dir'},$dir,{FILE => encode_html($virtual), NEW_FILE => encode_html($new_virtual)}) if(-l $new_physical || not -d $new_physical);
+
+  my $return_unpack = archive_unpack($physical,$new_physical);
+
+  return error($config->{'errors'}->{'unpack_failed'},$dir,{FILE => encode_html($virtual), AE_ERROR => encode_html($File::Access::archive_extract_error)}) unless($return_unpack);
+
   return devedit_reload({command => 'show', file => $new_virtual});
  }
  else
@@ -1215,6 +1234,8 @@ sub exec_about($$)
  $tpl->fillin('PERL_PROG',encode_html($^X));
  $tpl->fillin('PERL_VER', sprintf('%vd',$^V));
 
+ $tpl->parse_if_block('PERL_ARCHIVE_EXTRACT',$File::Access::has_archive_extract);
+
  # Information about the server
 
  $tpl->fillin('HTTPD',encode_html($ENV{'SERVER_SOFTWARE'}));