X-Git-Url: https://git.p6c8.net/devedit.git/blobdiff_plain/9bae356846814e3bf8d7b49da70f2876ee2f099d..7aac7cf6b85925b2ae4085eaeeb0f448f7f38baa:/modules/Command.pm diff --git a/modules/Command.pm b/modules/Command.pm index d14fec1..117d39c 100644 --- a/modules/Command.pm +++ b/modules/Command.pm @@ -6,7 +6,7 @@ package Command; # Execute Dev-Editor's commands # # Author: Patrick Canterino -# Last modified: 2004-10-23 +# Last modified: 2004-10-31 # use strict; @@ -223,7 +223,7 @@ sub exec_show($$) $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual)); $tpl->fillin("SCRIPT",$script); - $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)); } @@ -772,7 +772,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}); } @@ -906,17 +910,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 {