X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/99160ca341366b244e9319bcbe33f6d0c26712e3..6531dbde01e67ba7cb7afc14eeeaf2d15ac56d74:/modules/Command.pm?ds=sidebyside

diff --git a/modules/Command.pm b/modules/Command.pm
index 0ae3416..591c8b1 100644
--- 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>
-# Last modified: 2004-07-20
+# Last modified: 2004-10-05
 #
 
 use strict;
@@ -26,6 +26,7 @@ use Output;
 use Template;
 
 my $script = $ENV{'SCRIPT_NAME'};
+my $users  = eval("getpwuid(0)") && eval("getgrgid(0)");
 
 my %dispatch = ('show'       => \&exec_show,
                 'beginedit'  => \&exec_beginedit,
@@ -37,6 +38,7 @@ my %dispatch = ('show'       => \&exec_show,
                 'copy'       => \&exec_copy,
                 'rename'     => \&exec_rename,
                 'remove'     => \&exec_remove,
+                'chprop'     => \&exec_chprop,
                 'unlock'     => \&exec_unlock,
                 'about'      => \&exec_about
                );
@@ -61,10 +63,16 @@ sub exec_command($$$)
 {
  my ($command,$data,$config) = @_;
 
- return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => $command}) unless($dispatch{$command});
+ foreach(keys(%dispatch))
+ {
+  if(lc($_) eq lc($command))
+  {
+   my $output = &{$dispatch{$_}}($data,$config);
+   return $output;
+  }
+ }
 
- my $output = &{$dispatch{$command}}($data,$config);
- return $output;
+ return error($config->{'errors'}->{'cmd_unknown'},'/',{COMMAND => $command});
 }
 
 # exec_show()
@@ -128,6 +136,8 @@ sub exec_show($$)
    $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
    $dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
 
+   $dtpl->parse_if_block("users",$users && -o $physical."/".$dir);
+
    $dirlist .= $dtpl->get_template;
   }
 
@@ -163,6 +173,8 @@ sub exec_show($$)
 
    $ftpl->parse_if_block("too_large",$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
 
+   $ftpl->parse_if_block("users",$users && -o $phys_path);
+
    $dirlist .= $ftpl->get_template;
   }
 
@@ -330,7 +342,7 @@ sub exec_endedit($$)
   $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
 
@@ -342,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'}->{'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))
  {
@@ -464,7 +477,7 @@ sub exec_upload($$)
   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');
@@ -516,7 +529,8 @@ sub exec_copy($$)
  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)
  {
@@ -530,7 +544,7 @@ sub exec_copy($$)
 
    if(-d $new_physical)
    {
-    return error($config->{'errors'}->{'dircopy'});
+    return error($config->{'errors'}->{'dir_replace'},$dir);
    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {
@@ -590,6 +604,7 @@ sub exec_rename($$)
  my $virtual        = $data->{'virtual'};
  my $new_physical   = $data->{'new_physical'};
 
+ return error($config->{'errors'}->{'rename_root'},"/") if($virtual eq "/");
  return error($config->{'errors'}->{'in_use'},upper_path($virtual),{FILE => $virtual}) if($data->{'uselist'}->in_use($virtual));
 
  if($new_physical)
@@ -604,7 +619,7 @@ sub exec_rename($$)
 
    if(-d $new_physical)
    {
-    return error($config->{'errors'}->{'dircopy'});
+    return error($config->{'errors'}->{'dir_replace'},$dir);
    }
    elsif(not $data->{'cgi'}->param('confirmed'))
    {
@@ -663,6 +678,8 @@ sub exec_remove($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 
+ return error($config->{'errors'}->{'remove_root'},"/") if($virtual eq "/");
+
  if(-d $physical)
  {
   # Remove a directory
@@ -717,6 +734,83 @@ sub exec_remove($$)
  }
 }
 
+# exec_chprop()
+#
+# Change the mode and the group of a file or a directory
+#
+# Params: 1. Reference to user input hash
+#         2. Reference to config hash
+#
+# Return: Output of the command (Scalar Reference)
+
+sub exec_chprop($$)
+{
+ my ($data,$config) = @_;
+ my $physical       = $data->{'physical'};
+ my $virtual        = $data->{'virtual'};
+ my $dir            = upper_path($virtual);
+ my $cgi            = $data->{'cgi'};
+ my $mode           = $cgi->param('mode');
+ my $group          = $cgi->param('group');
+
+ if($users)
+ {
+  if(-o $physical)
+  {
+   if($mode || $group)
+   {
+    if($mode)
+    {
+     my $oct_mode = $mode;
+     $oct_mode    = "0".$oct_mode if(length($oct_mode) == 3);
+     $oct_mode    = oct($oct_mode);
+
+     chmod($oct_mode,$physical);
+    }
+
+    chgrp($group,$physical) if($group);
+
+    return devedit_reload({command => 'show', file => $dir});
+   }
+   else
+   {
+    my @stat     = stat($physical);
+
+    my $mode     = $stat[2];
+    my $mode_oct = substr(sprintf("%04o",$mode),-4);
+    my $gid      = $stat[5];
+    my $group    = getgrgid($gid);
+
+    my $tpl = new Template;
+    $tpl->read_file($config->{'templates'}->{'chprop'});
+
+    $tpl->fillin("MODE_OCTAL",$mode_oct);
+    $tpl->fillin("MODE_STRING",mode_string($mode));
+    $tpl->fillin("GID",$gid);
+    $tpl->fillin("GROUP",$group);
+
+    $tpl->fillin("FILE",$virtual);
+    $tpl->fillin("DIR",$dir);
+    $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
+    $tpl->fillin("SCRIPT",$script);
+
+    my $output = header(-type => "text/html");
+    $output   .= $tpl->get_template;
+
+    return \$output;
+   }
+  }
+  else
+  {
+   return error($config->{'errors'}->{'not_owner'},$dir,{FILE => $virtual});
+  }
+ }
+ else
+ {
+  return error($config->{'errors'}->{'no_users'},$dir,{FILE => $virtual});
+ }
+}
+
 # exec_unlock()
 #
 # Remove a file from the list of used files and
@@ -731,10 +825,13 @@ sub exec_unlock($$)
 {
  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'))
  {
-  file_unlock($data->{'uselist'},$virtual);
+  file_unlock($uselist,$virtual);
   return devedit_reload({command => 'show', file => upper_path($virtual)});
  }
  else
@@ -800,7 +897,7 @@ sub exec_about($$)
 
  # Check if the functions getpwuid() and getgrgid() are available
 
- if(eval("getpwuid(0)") && eval("getgrgid(0)"))
+ if($users)
  {
   # Dev-Editor is running on a system which allows users and groups
   # So we display the user and the group of our process