Stupid bug

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 17f94709872e53531f78deb6f350fd6c77948af9..abff136a112148aee637168242050a11a5b997e6 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-27
+# Last modified: 2004-11-09

 #
 
 use strict;
 #
 
 use strict;


@@ -26,6 +26,7 @@ use Output;
 use Template;
 
 my $script = $ENV{'SCRIPT_NAME'};
 use Template;
 
 my $script = $ENV{'SCRIPT_NAME'};

+my $users  = eval("getpwuid(0)") && eval("getgrgid(0)");

 
 my %dispatch = ('show'       => \&exec_show,
                 'beginedit'  => \&exec_beginedit,
 
 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,
                 'copy'       => \&exec_copy,
                 'rename'     => \&exec_rename,
                 'remove'     => \&exec_remove,

+                'chprop'     => \&exec_chprop,

                 'unlock'     => \&exec_unlock,
                 'about'      => \&exec_about
                );
                 'unlock'     => \&exec_unlock,
                 'about'      => \&exec_about
                );


@@ -95,8 +97,10 @@ sub exec_show($$)
  {
   # Create directory listing
 
  {
   # Create directory listing
 

+  return error($config->{'errors'}->{'no_dir_access'},upper_path($virtual)) unless(-r $physical && -x $physical);
+

   my $direntries = dir_read($physical);
   my $direntries = dir_read($physical);

-  return error($config->{'dir_read_failed'},upper_path($virtual),{DIR => '$virtual'}) unless($direntries);
+  return error($config->{'dir_read_failed'},upper_path($virtual),{DIR => $virtual}) unless($direntries);

 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};


@@ -123,9 +127,11 @@ sub exec_show($$)
 
   foreach my $dir(@$dirs)
   {
 
   foreach my $dir(@$dirs)
   {

-   my @stat      = stat($physical."/".$dir);
+   my $phys_path = $physical."/".$dir;

    my $virt_path = encode_entities($virtual.$dir."/");
 
    my $virt_path = encode_entities($virtual.$dir."/");
 

+   my @stat      = stat($phys_path);
+

    my $dtpl = new Template;
    $dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
 
    my $dtpl = new Template;
    $dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
 


@@ -134,6 +140,9 @@ sub exec_show($$)
    $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
    $dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
 
    $dtpl->fillin("DATE",strftime($config->{'timeformat'},localtime($stat[9])));
    $dtpl->fillin("URL",equal_url($config->{'httproot'},$virt_path));
 

+   $dtpl->parse_if_block("readable",-r $phys_path && -x $phys_path);
+   $dtpl->parse_if_block("users",$users && -o $phys_path);
+

    $dirlist .= $dtpl->get_template;
   }
 
    $dirlist .= $dtpl->get_template;
   }
 


@@ -169,6 +178,8 @@ sub exec_show($$)
 
    $ftpl->parse_if_block("too_large",$config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'});
 
 
    $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;
   }
 
    $dirlist .= $ftpl->get_template;
   }
 


@@ -216,9 +227,10 @@ sub exec_show($$)
     $tpl->fillin("DIR",upper_path($virtual));
     $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
     $tpl->fillin("SCRIPT",$script);
     $tpl->fillin("DIR",upper_path($virtual));
     $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
     $tpl->fillin("SCRIPT",$script);

-    $tpl->fillin("CONTENT",encode_entities($$content));

 
     $tpl->parse_if_block("editable",-r $physical && -w $physical && -T $physical && not ($config->{'max_file_size'} && $size > $config->{'max_file_size'}) && $uselist->unused($virtual));
 
     $tpl->parse_if_block("editable",-r $physical && -w $physical && -T $physical && not ($config->{'max_file_size'} && $size > $config->{'max_file_size'}) && $uselist->unused($virtual));

+
+    $tpl->fillin("CONTENT",encode_entities($$content));

    }
   }
  }
    }
   }
  }


@@ -264,7 +276,7 @@ sub exec_beginedit($$)
    return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
   }
   else
    return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
   }
   else

-   {
+  {

    # Text file
 
    $uselist->add_file($virtual);
    # Text file
 
    $uselist->add_file($virtual);


@@ -325,6 +337,14 @@ sub exec_endedit($$)
  my $content        = $data->{'cgi'}->param('filecontent');
  my $uselist        = $data->{'uselist'};
 
  my $content        = $data->{'cgi'}->param('filecontent');
  my $uselist        = $data->{'uselist'};
 

+ # We already unlock the file at the beginning of the
+ # subroutine, because if we have to abort this routine,
+ # the file keeps locked.
+ # Nobody else will access the file during this routine
+ # because of the concept of File::UseList.
+
+ file_unlock($uselist,$virtual);
+

  # Normalize newlines
 
  $content =~ s/\015\012|\012|\015/\n/g;
  # Normalize newlines
 
  $content =~ s/\015\012|\012|\015/\n/g;


@@ -336,7 +356,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
 


@@ -348,18 +368,14 @@ 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))
  {
   # Saving of the file was successful - so unlock it!
 
 
  if(file_save($physical,\$content))
  {
   # Saving of the file was successful - so unlock it!
 

-  file_unlock($uselist,$data->{'virtual'});
-  #                    ^^^^^^^^^^^^^^^^^^
-  # Maybe the user saved the file using another filename...
-  # But we have to unlock the original file!
-

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


@@ -470,7 +486,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');


@@ -522,7 +538,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)
  {


@@ -536,7 +553,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'))
    {


@@ -611,7 +628,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'))
    {


@@ -726,6 +743,87 @@ 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);
+    }
+
+    if($group)
+    {
+     return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => $group}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
+     system("chgrp",$group,$physical);
+    }
+
+    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
 # exec_unlock()
 #
 # Remove a file from the list of used files and


@@ -740,10 +838,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


@@ -809,22 +910,29 @@ sub exec_about($$)
 
  # Check if the functions getpwuid() and getgrgid() are available
 
 
  # 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
 
  {
   # Dev-Editor is running on a system which allows users and groups
   # So we display the user and the group of our process
 

+  my $uid = POSIX::getuid;
+  my $gid = POSIX::getgid;
+

   $tpl->parse_if_block("users",1);
 
   # ID's of user and group
 
   $tpl->parse_if_block("users",1);
 
   # ID's of user and group
 

-  $tpl->fillin("UID",$<);
-  $tpl->fillin("GID",$();
+  $tpl->fillin("UID",$uid);
+  $tpl->fillin("GID",$gid);

 
   # Names of user and group
 
 
   # Names of user and group
 

-  $tpl->fillin("USER",getpwuid($<));
-  $tpl->fillin("GROUP",getgrgid($());
+  $tpl->fillin("USER",getpwuid($uid));
+  $tpl->fillin("GROUP",getgrgid($gid));
+
+  # Process umask
+
+  $tpl->fillin("UMASK",sprintf("%04o",umask));

  }
  else
  {
  }
  else
  {