Some small changes

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 26bc5c826b3aca9cbfdad89611cdc1f6a7d9c2f1..f2b1a04f4b9031c038129b674f2580ccb1d65d1c 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>
-# Last modified: 2004-11-23
+# Last modified: 2004-11-25
 #
 
 use strict;
@@ -89,6 +89,7 @@ sub exec_show($$)
  my ($data,$config) = @_;
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
+ my $upper_path     = upper_path($virtual);
  my $uselist        = $data->{'uselist'};
 
  my $tpl = new Template;
@@ -97,10 +98,10 @@ sub exec_show($$)
  {
   # Create directory listing
 
-  return error($config->{'errors'}->{'no_dir_access'},upper_path($virtual)) unless(-r $physical && -x $physical);
+  return error($config->{'errors'}->{'no_dir_access'},$upper_path) unless(-r $physical && -x $physical);
 
   my $direntries = dir_read($physical);
-  return error($config->{'dir_read_fail'},upper_path($virtual),{DIR => $virtual}) unless($direntries);
+  return error($config->{'dir_read_fail'},$upper_path,{DIR => $virtual}) unless($direntries);
 
   my $files = $direntries->{'files'};
   my $dirs  = $direntries->{'dirs'};
@@ -117,7 +118,7 @@ sub exec_show($$)
    my $udtpl = new Template;
    $udtpl->read_file($config->{'templates'}->{'dirlist_up'});
 
-   $udtpl->fillin("UPPER_DIR",encode_entities(upper_path($virtual)));
+   $udtpl->fillin("UPPER_DIR",encode_entities($upper_path));
    $udtpl->fillin("DATE",encode_entities(strftime($config->{'timeformat'},localtime($stat[9]))));
 
    $dirlist .= $udtpl->get_template;
@@ -170,7 +171,6 @@ sub exec_show($$)
    $ftpl->parse_if_block("readonly",not -w $phys_path);
 
    $ftpl->parse_if_block("viewable",-r $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}));
-
    $ftpl->parse_if_block("editable",-r $phys_path && -w $phys_path && -T $phys_path && not ($config->{'max_file_size'} && $stat[7] > $config->{'max_file_size'}) && not $in_use);
 
    $ftpl->parse_if_block("in_use",$in_use);
@@ -194,7 +194,7 @@ sub exec_show($$)
  {
   # View a file
 
-  return error($config->{'errors'}->{'noview'},upper_path($virtual)) unless(-r $physical);
+  return error($config->{'errors'}->{'noview'},$upper_path) unless(-r $physical);
 
   # Check on binary files
   # We have to do it in this way, or empty files
@@ -204,17 +204,15 @@ sub exec_show($$)
   {
    # Binary file
 
-   return error($config->{'errors'}->{'binary'},upper_path($virtual));
+   return error($config->{'errors'}->{'binary'},$upper_path);
   }
   else
   {
    # Text file
 
-   my $size = (stat($physical))[7];
-
-   if($config->{'max_file_size'} && $size > $config->{'max_file_size'})
+   if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
    {
-    return error($config->{'errors'}->{'file_too_large'},upper_path($virtual),{SIZE => $config->{'max_file_size'}})
+    return error($config->{'errors'}->{'file_too_large'},$upper_path,{SIZE => $config->{'max_file_size'}})
    }
    else
    {
@@ -224,11 +222,11 @@ sub exec_show($$)
     $tpl->read_file($config->{'templates'}->{'viewfile'});
 
     $tpl->fillin("FILE",$virtual);
-    $tpl->fillin("DIR",upper_path($virtual));
+    $tpl->fillin("DIR",$upper_path);
     $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",-w $physical && $uselist->unused($virtual));
 
     $tpl->fillin("CONTENT",encode_entities($$content));
    }
@@ -272,7 +270,7 @@ sub exec_beginedit($$)
  }
  else
  {
-  if($config->{'max_file_size'} && (-s $physical) > $config->{'max_file_size'})
+  if($config->{'max_file_size'} && -s $physical > $config->{'max_file_size'})
   {
    return error($config->{'errors'}->{'file_too_large'},$dir,{SIZE => $config->{'max_file_size'}})
   }
@@ -480,13 +478,15 @@ sub exec_upload($$)
  my $virtual        = $data->{'virtual'};
  my $cgi            = $data->{'cgi'};
 
+ return error($config->{'errors'}->{'no_directory'},upper_path($virtual),{FILE => $virtual}) unless(-d $physical);
+
  if(my $uploaded_file = $cgi->param('uploaded_file'))
  {
   # Process file upload
 
   my $filename  = file_name($uploaded_file);
   my $file_phys = $physical."/".$filename;
-  my $file_virt = $virtual."".$filename;
+  my $file_virt = $virtual.$filename;
 
   return error($config->{'errors'}->{'file_exists'},$virtual,{FILE => $file_virt}) if(-e $file_phys && not $cgi->param('overwrite'));
 
@@ -495,7 +495,7 @@ sub exec_upload($$)
 
   local *FILE;
 
-  open(FILE,">$file_phys") or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
+  open(FILE,">".$file_phys) or return error($config->{'errors'}->{'mkfile_failed'},$virtual,{FILE => $file_virt});
   binmode(FILE) unless($ascii);
 
   # Read transferred file and write it to disk
@@ -540,8 +540,8 @@ sub exec_copy($$)
  my $virtual        = encode_entities($data->{'virtual'});
  my $new_physical   = $data->{'new_physical'};
 
- return error($config->{'errors'}->{'dircopy'}) if(-d $physical);
- return error($config->{'errors'}->{'nocopy'})  unless(-r $physical);
+ return error($config->{'errors'}->{'dircopy'},upper_path($virtual)) if(-d $physical);
+ return error($config->{'errors'}->{'nocopy'},upper_path($virtual))  unless(-r $physical);
 
  if($new_physical)
  {
@@ -766,12 +766,18 @@ sub exec_chprop($$)
 
  if($users)
  {
+  # System supports user and groups
+
   if(-o $physical)
   {
+   # We own this file
+
    if($mode || $group)
    {
     if($mode)
     {
+     # Change the mode
+
      my $oct_mode = $mode;
      $oct_mode    = "0".$oct_mode if(length($oct_mode) == 3);
      $oct_mode    = oct($oct_mode);
@@ -781,6 +787,8 @@ sub exec_chprop($$)
 
     if($group)
     {
+     # Change the group using the `chgrp` system command
+
      return error($config->{'errors'}->{'invalid_group'},$dir,{GROUP => encode_entities($group)}) unless($group =~ /^[a-z0-9_]+[a-z0-9_-]*$/i);
      system("chgrp",$group,$physical);
     }