X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/1574cddbc1107a6119116328e9696a65108f867b..62cbcbc479d1266f6a6a0e06ef82dd74b00c9fad:/modules/Command.pm?ds=inline

diff --git a/modules/Command.pm b/modules/Command.pm
index 1479e2a..eb68421 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-10-22
+# Last modified: 2004-11-10
 #
 
 use strict;
@@ -97,8 +97,10 @@ sub exec_show($$)
  {
   # Create directory listing
 
+  return error($config->{'errors'}->{'no_dir_access'},upper_path($virtual)) unless(-r $physical && -x $physical);
+
   my $direntries = dir_read($physical);
-  return error($config->{'dir_read_failed'},upper_path($virtual),{DIR => '$virtual'}) unless($direntries);
+  return error($config->{'dir_read_fail'},upper_path($virtual),{DIR => $virtual}) unless($direntries);
 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
@@ -125,9 +127,11 @@ sub exec_show($$)
 
   foreach my $dir(@$dirs)
   {
-   my @stat      = stat($physical."/".$dir);
+   my $phys_path = $physical."/".$dir;
    my $virt_path = encode_entities($virtual.$dir."/");
 
+   my @stat      = stat($phys_path);
+
    my $dtpl = new Template;
    $dtpl->read_file($config->{'templates'}->{'dirlist_dir'});
 
@@ -136,7 +140,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);
+   $dtpl->parse_if_block("readable",-r $phys_path && -x $phys_path);
+   $dtpl->parse_if_block("users",$users && -o $phys_path);
 
    $dirlist .= $dtpl->get_template;
   }
@@ -222,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("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->fillin("CONTENT",encode_entities($$content));
    }
   }
  }
@@ -270,7 +276,7 @@ sub exec_beginedit($$)
    return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
   }
   else
-   {
+  {
    # Text file
 
    $uselist->add_file($virtual);
@@ -771,7 +777,11 @@ sub exec_chprop($$)
      chmod($oct_mode,$physical);
     }
 
-    chgrp($group,$physical) if($group);
+    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});
    }
@@ -905,17 +915,24 @@ sub exec_about($$)
   # 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->fillin("UID",$<);
-  $tpl->fillin("GID",$();
+  $tpl->fillin("UID",$uid);
+  $tpl->fillin("GID",$gid);
 
   # 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
  {