- There is no need to load the POSIX module twice

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index d14fec105323e589227e1480b3bbf2be3a9928c0..117d39cafd69d47506aa9399d7e1c1e8243c81ce 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-10-23
+# Last modified: 2004-10-31

 #
 
 use strict;
 #
 
 use strict;


@@ -223,7 +223,7 @@ sub exec_show($$)
     $tpl->fillin("URL",equal_url($config->{'httproot'},$virtual));
     $tpl->fillin("SCRIPT",$script);
 
     $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));
    }
 
     $tpl->fillin("CONTENT",encode_entities($$content));
    }


@@ -772,7 +772,11 @@ sub exec_chprop($$)
      chmod($oct_mode,$physical);
     }
 
      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});
    }
 
     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
 
   # 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
  {