In directory listing, when a file cannot be viewed or edited, a tool tip on the ...

[devedit.git] / modules / Command.pm

diff --git a/modules/Command.pm b/modules/Command.pm
index 4e64a3651f777033a85298b83f30cc1acdccb6f9..0a368e95db7777ef68bad27dbe2330a3f8c62029 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: 2003-10-27
+# Last modified: 2003-11-10

 #
 
 use strict;
 #
 
 use strict;


@@ -60,7 +60,7 @@ sub exec_show($$$)
   # Create directory listing
 
   my $direntries = dir_read($physical);
   # Create directory listing
 
   my $direntries = dir_read($physical);

-  return error("Reading of directory $virtual failed") unless($direntries);
+  return error("Reading of directory $virtual failed.",upper_path($virtual)) unless($direntries);

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


@@ -120,19 +120,47 @@ sub exec_show($$$)
    $output .= $stat[7];
    $output .= "  ";
    $output .= strftime($config->{'timeformat'},localtime($stat[9]));
    $output .= $stat[7];
    $output .= "  ";
    $output .= strftime($config->{'timeformat'},localtime($stat[9]));

-   $output .= ($in_use) ? " (IN USE) " : (not -T $phys_path) ? " (BINARY) " : " " x 10;
+   $output .= " " x 10;

    $output .= encode_entities($file);
    $output .= " " x ($max_name_len - length($file))."\t  (";
 
    $output .= encode_entities($file);
    $output .= " " x ($max_name_len - length($file))."\t  (";
 

-   $output .= (-r $phys_path && -T $phys_path)
-              ? "<a href=\"$script?command=show&file=$virt_path\">View</a>"
-              : '<span style="color:#C0C0C0">View</span>';
+   # Link "View"
+
+   if(-r $phys_path && -T $phys_path)
+   {
+    $output .= "<a href=\"$script?command=show&file=$virt_path\">View</a>";
+   }
+   else
+   {
+    $output .= '<span style="color:#C0C0C0" title="';
+
+    $output .= (not -r $phys_path) ? "Not readable" :
+               (-B     $phys_path) ? "Binary file"  : "";
+
+    $output .= '">View</span>';
+   }

 
    $output .= " | ";
 
 
    $output .= " | ";
 

-   $output .= (-w $phys_path && -r $phys_path && -T $phys_path && not $in_use)
-              ? "<a href=\"$script?command=beginedit&file=$virt_path\">Edit</a>"
-              : '<span style="color:#C0C0C0">Edit</span>';
+   # Link "Edit"
+
+   if(-w $phys_path && -r $phys_path && -T $phys_path && not $in_use)
+   {
+    $output .= "<a href=\"$script?command=beginedit&file=$virt_path\">Edit</a>";
+   }
+   else
+   {
+    $output .= '<span style="color:#C0C0C0" title="';
+
+    $output .= (not -r $phys_path) ? "Not readable" :
+               (not -w $phys_path) ? "Read only"    :
+               (-B     $phys_path) ? "Binary file"  :
+               ($in_use)           ? "In use"       : "";
+
+    $output .= '">Edit</span>';
+   }
+
+   # Link "Do other stuff"

 
    $output .= " | <a href=\"$script?command=workwithfile&file=$virt_path\">Do other stuff</a>)\n";
   }
 
    $output .= " | <a href=\"$script?command=workwithfile&file=$virt_path\">Do other stuff</a>)\n";
   }


@@ -170,7 +198,7 @@ END
  {
   # View a file
 
  {
   # View a file
 

-  return error("You have not enough permissions to view this file.") unless(-r $physical);
+  return error("You have not enough permissions to view this file.",upper_path($virtual)) unless(-r $physical);

 
   # Check on binary files
   # We have to do it in this way, or empty files
 
   # Check on binary files
   # We have to do it in this way, or empty files


@@ -180,7 +208,7 @@ END
   {
    # Binary file
 
   {
    # Binary file
 

-   return error("This editor is not able to view/edit binary files.");
+   return error("This editor is not able to view/edit binary files.",upper_path($virtual));

   }
   else
   {
   }
   else
   {


@@ -218,9 +246,9 @@ sub exec_beginedit($$)
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 
  my $virtual        = $data->{'virtual'};
  my $uselist        = $data->{'uselist'};
 

- return error("You cannot edit directories.") if(-d $physical);
+ return error("You cannot edit directories.",upper_path($virtual)) if(-d $physical);

  return error_in_use($virtual) if($uselist->in_use($virtual));
  return error_in_use($virtual) if($uselist->in_use($virtual));

- return error("You have not enough permissions to edit this file.") unless(-r $physical && -w $physical);
+ return error("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical);

 
  # Check on binary files
 
 
  # Check on binary files
 


@@ -228,7 +256,7 @@ sub exec_beginedit($$)
  {
   # Binary file
 
  {
   # Binary file
 

-  return error("This editor is not able to view/edit binary files.");
+  return error("This editor is not able to view/edit binary files.",upper_path($virtual));

  }
  else
  {
  }
  else
  {


@@ -299,7 +327,7 @@ sub exec_endedit($$)
  my $content        = $data->{'cgi'}->param('filecontent');
 
  return error("You cannot edit directories.") if(-d $physical);
  my $content        = $data->{'cgi'}->param('filecontent');
 
  return error("You cannot edit directories.") if(-d $physical);

- return error("You have not enough permissions to edit this file.") unless(-r $physical && -w $physical);
+ return error("You have not enough permissions to edit this file.",upper_path($virtual)) unless(-r $physical && -w $physical);

 
  # Normalize newlines
 
 
  # Normalize newlines
 


@@ -551,7 +579,7 @@ sub exec_remove($$)
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 
  my $physical       = $data->{'physical'};
  my $virtual        = $data->{'virtual'};
 

- return error("Deleting directories is currently unsupported.") if(-d $physical);
+ return error("Deleting directories is currently unsupported.",upper_path($virtual)) if(-d $physical);

  return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
 
  unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'.",upper_path($virtual));
  return error_in_use($virtual) if($data->{'uselist'}->in_use($virtual));
 
  unlink($physical) or return error("Could not delete file '".encode_entities($virtual)."'.",upper_path($virtual));