Dev-Editor 2.1

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 8e4716365ea22c0c082755da4f0fc7bb8b205db5..591c8b12a1d6c7a222a8ef0fd58bf3d4e6edfba0 100644 (file)
--- a/modules/Command.pm
+++ b/modules/Command.pm
@@ -6,7 +6,7 @@ package Command;
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>
 # Execute Dev-Editor's commands
 #
 # Author:        Patrick Canterino <patshaping@gmx.net>

-# Last modified: 2004-07-28
+# Last modified: 2004-10-05

 #
 
 use strict;
 #
 
 use strict;


@@ -342,7 +342,7 @@ sub exec_endedit($$)
   $content = encode_entities($content,"\200-\377");
  }
 
   $content = encode_entities($content,"\200-\377");
  }
 

- if($data->{'cgi'}->param('saveas'))
+ if($data->{'cgi'}->param('saveas') && $data->{'new_physical'} ne '' && $data->{'new_virtual'} ne '')

  {
   # Create the new filename
 
  {
   # Create the new filename
 


@@ -354,8 +354,9 @@ sub exec_endedit($$)
   return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual));
  }
 
   return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($uselist->in_use($virtual));
  }
 

- return error($config->{'errors'}->{'editdir'},upper_path($virtual)) if(-d $physical);
- return error($config->{'errors'}->{'noedit'}, upper_path($virtual)) unless(-r $physical && -w $physical);
+ return error($config->{'errors'}->{'text_to_binary'},upper_path($virtual)) unless(-T $physical);
+ return error($config->{'errors'}->{'editdir'},upper_path($virtual))        if(-d $physical);
+ return error($config->{'errors'}->{'noedit'}, upper_path($virtual))        if(-e $physical && !(-r $physical && -w $physical));

 
  if(file_save($physical,\$content))
  {
 
  if(file_save($physical,\$content))
  {


@@ -476,7 +477,7 @@ sub exec_upload($$)
   my $file_phys = $physical."/".$filename;
   my $file_virt = $virtual."".$filename;
 
   my $file_phys = $physical."/".$filename;
   my $file_virt = $virtual."".$filename;
 

-  return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys);
+  return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite'));

 
   my $ascii     = $cgi->param('ascii');
   my $handle    = $cgi->upload('uploaded_file');
 
   my $ascii     = $cgi->param('ascii');
   my $handle    = $cgi->upload('uploaded_file');


@@ -528,7 +529,8 @@ sub exec_copy($$)
  my $virtual        = encode_entities($data->{'virtual'});
  my $new_physical   = $data->{'new_physical'};
 
  my $virtual        = encode_entities($data->{'virtual'});
  my $new_physical   = $data->{'new_physical'};
 

- return error($config->{'errors'}->{'nocopy'}) unless(-r $physical);
+ return error($config->{'errors'}->{'dircopy'}) if(-d $physical);
+ return error($config->{'errors'}->{'nocopy'})  unless(-r $physical);

 
  if($new_physical)
  {
 
  if($new_physical)
  {


@@ -542,7 +544,7 @@ sub exec_copy($$)
 
    if(-d $new_physical)
    {
 
    if(-d $new_physical)
    {

-    return error($config->{'errors'}->{'dircopy'});
+    return error($config->{'errors'}->{'dir_replace'},$dir);

    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {
    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {


@@ -617,7 +619,7 @@ sub exec_rename($$)
 
    if(-d $new_physical)
    {
 
    if(-d $new_physical)
    {

-    return error($config->{'errors'}->{'dircopy'});
+    return error($config->{'errors'}->{'dir_replace'},$dir);

    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {
    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {


@@ -772,7 +774,7 @@ sub exec_chprop($$)
    }
    else
    {
    }
    else
    {

-    my @stat     = lstat($physical);
+    my @stat     = stat($physical);

 
     my $mode     = $stat[2];
     my $mode_oct = substr(sprintf("%04o",$mode),-4);
 
     my $mode     = $stat[2];
     my $mode_oct = substr(sprintf("%04o",$mode),-4);


@@ -823,10 +825,13 @@ sub exec_unlock($$)
 {
  my ($data,$config) = @_;
  my $virtual        = $data->{'virtual'};
 {
  my ($data,$config) = @_;
  my $virtual        = $data->{'virtual'};

+ my $uselist        = $data->{'uselist'};
+
+ return devedit_reload({command => 'show', file => upper_path($virtual)}) if($uselist->unused($virtual));

 
  if($data->{'cgi'}->param('confirmed'))
  {
 
  if($data->{'cgi'}->param('confirmed'))
  {

-  file_unlock($data->{'uselist'},$virtual);
+  file_unlock($uselist,$virtual);

   return devedit_reload({command => 'show', file => upper_path($virtual)});
  }
  else
   return devedit_reload({command => 'show', file => upper_path($virtual)});
  }
  else